rpms/openoffice.org/devel openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.patch, NONE, 1.1 openoffice.org.spec, 1.1925, 1.1926

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30839/devel

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.patch 
Log Message:
Resolves: rhbz#504419  openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.patch

openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.patch:

--- NEW FILE openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.patch ---
diff -ru sc.orig/inc/progress.hxx sc/inc/progress.hxx
--- sc.orig/inc/progress.hxx	2009-06-09 11:02:35.000000000 +0100
+++ sc/inc/progress.hxx	2009-06-09 11:03:37.000000000 +0100
@@ -36,6 +36,17 @@
 
 class ScDocument;
 
+/*
+ * #i102566
+ * Drawing a progress bar update is not cheap, so if we draw it on every
+ * percentage change of 200 calculations we get one progress draw per 2
+ * calculations which is slower than doing the calculations themselves. So as a
+ * rough guide only do an update per MIN_NO_CODES_PER_PROGRESS_UPDATE
+ * calculations
+ */
+#define MIN_NO_CODES_PER_PROGRESS_UPDATE 100
+
+
 class SC_DLLPUBLIC ScProgress
 {
 private:
diff -ru sc.orig/source/core/data/cell.cxx sc/source/core/data/cell.cxx
--- sc.orig/source/core/data/cell.cxx	2009-06-09 11:01:11.000000000 +0100
+++ sc/source/core/data/cell.cxx	2009-06-09 11:04:45.000000000 +0100
@@ -1701,7 +1701,7 @@
 
         // Reschedule verlangsamt das ganze erheblich, nur bei Prozentaenderung ausfuehren
         ScProgress::GetInterpretProgress()->SetStateCountDownOnPercent(
-            pDocument->GetFormulaCodeInTree() );
+            pDocument->GetFormulaCodeInTree()/MIN_NO_CODES_PER_PROGRESS_UPDATE );
     }
     else
     {
diff -ru sc.orig/source/core/tool/progress.cxx sc/source/core/tool/progress.cxx
--- sc.orig/source/core/tool/progress.cxx	2009-06-09 11:01:11.000000000 +0100
+++ sc/source/core/tool/progress.cxx	2009-06-09 11:04:14.000000000 +0100
@@ -162,7 +162,7 @@
             if ( !pGlobalProgress )
                 pInterpretProgress = new ScProgress( pDoc->GetDocumentShell(),
                     ScGlobal::GetRscString( STR_PROGRESS_CALCULATING ),
-                    pDoc->GetFormulaCodeInTree(), FALSE, bWait );
+                    pDoc->GetFormulaCodeInTree()/MIN_NO_CODES_PER_PROGRESS_UPDATE, FALSE, bWait );
 			pInterpretDoc = pDoc;
 		}
 	}


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1925
retrieving revision 1.1926
diff -u -p -r1.1925 -r1.1926
--- openoffice.org.spec	8 Jun 2009 11:09:14 -0000	1.1925
+++ openoffice.org.spec	9 Jun 2009 10:33:54 -0000	1.1926
@@ -148,6 +148,7 @@ Patch70: openoffice.org-3.1.0.ooo102473.
 Patch71: openoffice.org-3.1.0.ooo102490.sw.ww8.notab_before_nocontent.patch
 Patch72: openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
 Patch73: openoffice.org-3.1.0.ooo102142.sd.resleak.patch
+Patch74: openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1653,6 +1654,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch71 -p0 -b .ooo102490.sw.ww8.notab_before_nocontent.patch
 %patch72 -p0 -b .ooo102061.sc.cellanchoring.patch
 %patch73 -p0 -b .ooo102142.sd.resleak.patch
+%patch74 -p0 -b .ooo102566.sc.less.frenetic.progress.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4162,7 +4164,8 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Mon Jun 08 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-12.4
+* Tue Jun 09 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-12.4
+- Resolves: rhbz#504419  openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.patch
 - add openoffice.org-3.1.0.ooo102142.sd.resleak.patch
 
 * Sat Jun 06 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-12.3