rpms/openoffice.org/devel workspace.calc51.patch, NONE, 1.1 workspace.evoab2def.patch, NONE, 1.1 openoffice.org.spec, 1.1928, 1.1929 openoffice.org-3.1.0.ooo101439.connectivity.evodupl.patch, 1.1, NONE openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.patch, 1.1, NONE

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.calc51.patch workspace.evoab2def.patch 
Removed Files:
	openoffice.org-3.1.0.ooo101439.connectivity.evodupl.patch 
	openoffice.org-3.1.0.ooo102566.sc.less.frenetic.progress.patch 
Log Message:
keep track of what integrated workspace stuff was accepted into or not

workspace.calc51.patch:

--- NEW FILE workspace.calc51.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;
 		}
 	}

workspace.evoab2def.patch:

--- NEW FILE workspace.evoab2def.patch ---
--- connectivity.orig/source/drivers/evoab/makefile.mk	2008-12-30 15:32:01.000000000 +0100
+++ connectivity/source/drivers/evoab/makefile.mk	2009-04-29 20:51:57.000000000 +0200
@@ -36,6 +36,11 @@ TARGET=evoab
 
 VISIBILITY_HIDDEN=TRUE
 
+.IF "$(ENABLE_EVOAB2)"=="TRUE"
+dummy:
+	@echo "Evolution 1.x Addressbook build disabled in favour of Evolution 2.x Addressbook"
+.ELSE
+
 # --- Settings ----------------------------------
 .IF "$(DBGUTIL_OJ)"!=""
 ENVCFLAGS+=/FR$(SLO)$/
@@ -103,6 +108,7 @@ SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=	$(SHL1TARGET)
 
 .ENDIF
+.ENDIF
 # --- Targets ----------------------------------
 
 .INCLUDE : target.mk


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1928
retrieving revision 1.1929
diff -u -p -r1.1928 -r1.1929
--- openoffice.org.spec	10 Jun 2009 13:17:44 -0000	1.1928
+++ openoffice.org.spec	10 Jun 2009 20:28:44 -0000	1.1929
@@ -139,7 +139,7 @@ Patch61: openoffice.org-3.1.0.ooo101274.
 Patch62: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
 Patch63: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
 Patch64: openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch
-Patch65: openoffice.org-3.1.0.ooo101439.connectivity.evodupl.patch
+Patch65: workspace.evoab2def.patch
 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
@@ -148,7 +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
+Patch74: workspace.calc51.patch
 Patch75: openoffice.org-3.1.0.ooo97726.sc.misspelling.repeat.disallowed.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
@@ -1646,7 +1646,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch62 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
 %patch63 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
 %patch64 -p0 -b .ooo101379.vcl.qstart.SM.patch
-%patch65 -p0 -b .ooo101439.connectivity.evodupl.patch
+%patch65 -p0 -b .workspace.evoab2def.patch
 %patch66 -p0 -b .ooo100469.sal.ia64_arm.patch
 %patch67 -p0 -b .ooo101566.svtools.nodefaultwmfwidth.patch
 %patch68 -p0 -b .ooo101567.i18npool.mailocaledata.patch
@@ -1655,7 +1655,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
+%patch74 -p0 -b .workspace.calc51.patch
 %patch75 -p0 -b .ooo97726.sc.misspelling.repeat.disallowed.patch
 
 %build


--- openoffice.org-3.1.0.ooo101439.connectivity.evodupl.patch DELETED ---


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