rpms/openoffice.org/F-11 openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.patch, NONE, 1.1 openoffice.org.spec, 1.1912, 1.1913
Caolan McNamara
caolanm at fedoraproject.org
Tue Jun 9 10:34:24 UTC 2009
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30839/F-11
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/F-11/openoffice.org.spec,v
retrieving revision 1.1912
retrieving revision 1.1913
diff -u -p -r1.1912 -r1.1913
--- openoffice.org.spec 28 May 2009 10:02:19 -0000 1.1912
+++ openoffice.org.spec 9 Jun 2009 10:33:53 -0000 1.1913
@@ -141,6 +141,7 @@ Patch65: openoffice.org-3.1.0.ooo101439.
Patch66: openoffice.org-3.1.0.ooo100469.sal.ia64_arm.patch
Patch67: openoffice.org-3.1.0.ooo101566.svtools.nodefaultwmfwidth.patch
Patch68: openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch
+Patch69: 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}
@@ -1640,6 +1641,7 @@ cat %{PATCH11} >> svtools/source/dialogs
%patch66 -p0 -b .ooo100469.sal.ia64_arm.patch
%patch67 -p0 -b .ooo101566.svtools.nodefaultwmfwidth.patch
%patch68 -p0 -b .ooo101567.i18npool.mailocaledata.patch
+%patch69 -p0 -b .ooo102566.sc.less.frenetic.progress.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4142,8 +4144,9 @@ fi
unopkg list --shared > /dev/null 2>&1 || :
%changelog
-* Thu May 28 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-11.4.UNRELEASED
+* Tue Jun 09 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-11.4.UNRELEASED
- Resolves: rhbz#503003 silence warnings on updates
+- Resolves: rhbz#504419 openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.patch
* Mon May 25 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-11.3
- add in the ia64 and arm fixes for the secondary arch people
More information about the scm-commits
mailing list