rpms/openoffice.org/devel openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch, NONE, 1.1 openoffice.org.spec, 1.785, 1.786

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch 
Log Message:
some sort of gcc bug

openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch:
 basegfx/source/polygon/b2dpolypolygoncutter.cxx |   26 ++++++++++++------------
 source/polygon/b2dpolypolygoncutter.cxx         |    0 
 2 files changed, 14 insertions(+), 12 deletions(-)

--- NEW FILE openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch ---
Index: source/polygon/b2dpolypolygoncutter.cxx
===================================================================
RCS file: /cvs/graphics/basegfx/source/polygon/b2dpolypolygoncutter.cxx,v
retrieving revision 1.11
diff -u -r1.11 b2dpolypolygoncutter.cxx
--- openoffice.org.orig/basegfx/source/polygon/b2dpolypolygoncutter.cxx	26 Jan 2006 17:17:33 -0000	1.11
+++ openoffice.org/basegfx/source/polygon/b2dpolypolygoncutter.cxx	24 Jul 2006 10:43:46 -0000
@@ -112,25 +112,27 @@
 			sal_uInt32								mnIndex;
 
 			// sort operator to be able to sort on coordinates to later see common points
-			bool operator<(const impSortNode& rComp) const
+			bool operator<(const impSortNode& rComp) const;
+		};
+
+		bool impSortNode::operator<(const impSortNode& rComp) const
+		{
+			if(fTools::equal(maPoint.getX(), rComp.maPoint.getX()))
 			{
-				if(fTools::equal(maPoint.getX(), rComp.maPoint.getX()))
+				if(fTools::equal(maPoint.getY(), rComp.maPoint.getY()))
 				{
-					if(fTools::equal(maPoint.getY(), rComp.maPoint.getY()))
-					{
-						return (mnIndex < rComp.mnIndex);
-					}
-					else
-					{
-						return fTools::less(maPoint.getY(), rComp.maPoint.getY());
-					}
+					return (mnIndex < rComp.mnIndex);
 				}
 				else
 				{
-					return fTools::less(maPoint.getX(), rComp.maPoint.getX());
+					return fTools::less(maPoint.getY(), rComp.maPoint.getY());
 				}
 			}
-		};
+			else
+			{
+				return fTools::less(maPoint.getX(), rComp.maPoint.getX());
+			}
+		}
 
 		//////////////////////////////////////////////////////////////////////////////
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.785
retrieving revision 1.786
diff -u -r1.785 -r1.786
--- openoffice.org.spec	24 Jul 2006 09:19:56 -0000	1.785
+++ openoffice.org.spec	24 Jul 2006 10:44:24 -0000	1.786
@@ -120,6 +120,7 @@
 Patch54: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
 Patch55: openoffice.org-2.0.3.ooo67716.svx.overflow.patch
 Patch56: openoffice.org.2.0.3-gcc28409.anonymousexternc.patch
+Patch57: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -867,6 +868,7 @@
 %patch54 -p1 -b .ooo67658.sfx2.reloadcrash.patch
 %patch55 -p1 -b .ooo67716.svx.overflow.patch
 %patch56 -p1 -b .gcc28409.anonymousexternc.patch
+%patch57 -p1 -b .gccXXXXX.basegfx.crash.patch
 
 tar xzf %{SOURCE1}
 
@@ -3351,6 +3353,7 @@
 - rh#199659# add openoffice.org-2.0.3.ooo67656.vcl.tabdialogsminimize.patch
 - rh#199665# openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
 - rh#199894# add openoffice.org-2.0.3.ooo67716.svx.overflow.patch
+- rh#199870# add openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
 - add openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch to preempt new libjvm for gcj
 
 * Wed Jul 17 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.5