rpms/openoffice.org/devel openoffice.org-2.0.4.ooo69325.cairocanvas.slowfills.patch, NONE, 1.1 openoffice.org.spec, 1.868, 1.869 openoffice.org-2.0.3.rh192588.officecfg.defaultcairooff.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5159

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.4.ooo69325.cairocanvas.slowfills.patch 
Removed Files:
	openoffice.org-2.0.3.rh192588.officecfg.defaultcairooff.patch 
Log Message:
carl points out why it was slow, excellent

openoffice.org-2.0.4.ooo69325.cairocanvas.slowfills.patch:
 canvas/source/cairo/cairo_canvashelper.cxx |    6 +++---
 source/cairo/cairo_canvashelper.cxx        |    0 
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE openoffice.org-2.0.4.ooo69325.cairocanvas.slowfills.patch ---
Index: source/cairo/cairo_canvashelper.cxx
===================================================================
RCS file: /cvs/gsl/canvas/source/cairo/cairo_canvashelper.cxx,v
retrieving revision 1.3
diff -u -r1.3 cairo_canvashelper.cxx
--- openoffice.org.orig/canvas/source/cairo/cairo_canvashelper.cxx	22 Mar 2006 10:59:35 -0000	1.3
+++ openoffice.org/canvas/source/cairo/cairo_canvashelper.cxx	6 Sep 2006 11:44:04 -0000
@@ -745,7 +745,7 @@
 		    nY = round( nY );
 		}
 
-		if( aOperation != Clip ) {
+		if( aOperation != Clip && aOperation != Fill) {
 		    nX += 0.5;
 		    nY += 0.5;
 		}
@@ -770,7 +770,7 @@
 			nY = round( nY );
 		    }
 
-		    if( aOperation != Clip ) {
+		    if( aOperation != Clip && aOperation != Fill ) {
 			nX += 0.5;
 			nY += 0.5;
 		    }
@@ -781,7 +781,7 @@
 			nBX = aB.getX();
 			nBY = aB.getY();
 
-			if( aOperation != Clip ) {
+			if( aOperation != Clip && aOperation != Fill ) {
 			    nAX += 0.5;
 			    nAY += 0.5;
 			    nBX += 0.5;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.868
retrieving revision 1.869
diff -u -r1.868 -r1.869
--- openoffice.org.spec	5 Sep 2006 12:53:40 -0000	1.868
+++ openoffice.org.spec	6 Sep 2006 11:54:41 -0000	1.869
@@ -94,7 +94,7 @@
 Patch26: workspace.fpicker6.patch
 Patch27: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
 Patch28: openoffice.org-2.0.2.ooo59127.vcl.honourcairofont.patch
-Patch29: openoffice.org-2.0.3.rh192588.officecfg.defaultcairooff.patch
+Patch29: openoffice.org-2.0.4.ooo69325.cairocanvas.slowfills.patch
 Patch30: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
 Patch31: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
 Patch32: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
@@ -956,7 +956,7 @@
 %patch26 -p1 -b .workspace.fpicker6.patch
 %patch27 -p1 -b .oooXXXXX.selinux.bridges.patch
 %patch28 -p1 -b .ooo59127.vcl.honourcairofont.patch
-%patch29 -p1 -b .rh192588.officecfg.defaultcairooff.patch
+%patch29 -p1 -b .cairocanvas.slowfills.patch
 %patch30 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
 %patch31 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
 %patch32 -p1 -b .rh187919.gtkunderkde.patch


--- openoffice.org-2.0.3.rh192588.officecfg.defaultcairooff.patch DELETED ---