rpms/openoffice.org/devel openoffice.org-2.2.1.oooXXXXX.xmloff.outofrange.patch, NONE, 1.1 openoffice.org.spec, 1.1209, 1.1210

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14130

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.2.1.oooXXXXX.xmloff.outofrange.patch 
Log Message:
Resolves: rhbz#242692 openoffice.org-2.2.1.oooXXXXX.xmloff.outofrange.patch

openoffice.org-2.2.1.oooXXXXX.xmloff.outofrange.patch:

--- NEW FILE openoffice.org-2.2.1.oooXXXXX.xmloff.outofrange.patch ---
Index: source/draw/ximpshap.cxx
===================================================================
RCS file: /cvs/xml/xmloff/source/draw/ximpshap.cxx,v
retrieving revision 1.117.8.1
diff -u -r1.117.8.1 ximpshap.cxx
--- openoffice.org.orig/xmloff/source/draw/ximpshap.cxx	12 Apr 2007 17:17:24 -0000	1.117.8.1
+++ openoffice.org/xmloff/source/draw/ximpshap.cxx	15 Jun 2007 09:43:30 -0000
@@ -615,6 +615,10 @@
 		{
 			::basegfx::B2DHomMatrix aTransformation;
 
+                	DBG_ASSERT(maSize.Height < SAL_MAX_INT32/2 && maSize.Width < SAL_MAX_INT32/2, "unlikely shape size");
+			if (maSize.Height > SAL_MAX_INT32/2 || maSize.Width > SAL_MAX_INT32/2)
+				maSize.Width = maSize.Height = 1;
+
 			if(maSize.Width != 1 || maSize.Height != 1)
 			{
 				// take care there are no zeros used by error
Index: source/sdr/contact/viewobjectcontact.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/sdr/contact/viewobjectcontact.cxx,v
retrieving revision 1.13
diff -u -r1.13 viewobjectcontact.cxx
--- openoffice.org.orig/svx/source/sdr/contact/viewobjectcontact.cxx	14 Nov 2006 13:32:04 -0000	1.13
+++ openoffice.org/svx/source/sdr/contact/viewobjectcontact.cxx	15 Jun 2007 09:43:46 -0000
@@ -376,13 +376,20 @@
 			// handle paint of ViewObjectContact
 			if(GetViewContact().ShouldPaintObject(rDisplayInfo, *this) && rDisplayInfo.DoContinuePaint())
 			{
-				if(pRedirector)
+				try
 				{
-					pRedirector->PaintObject(*this, rDisplayInfo);
+  					if(pRedirector)
+					{ 
+						pRedirector->PaintObject(*this, rDisplayInfo);
+					}
+					else
+					{
+						PaintObject(rDisplayInfo);
+					}
 				}
-				else
+				catch ( ... )
 				{
-					PaintObject(rDisplayInfo);
+                	DBG_ASSERT(0, "failed to paint object");
 				}
 			}
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1209
retrieving revision 1.1210
diff -u -r1.1209 -r1.1210
--- openoffice.org.spec	15 Jun 2007 08:07:00 -0000	1.1209
+++ openoffice.org.spec	15 Jun 2007 10:00:06 -0000	1.1210
@@ -145,6 +145,7 @@
 Patch79: openoffice.org-2.2.1.ooo78198.sixtyfour.svx.patch
 Patch80: openoffice.org-2.2.1.ooo78383.vcl.printxerror.patch
 Patch81: openoffice.org-2.2.1.ooo78392.sixtyfour.tools.patch
+Patch82: openoffice.org-2.2.1.oooXXXXX.xmloff.outofrange.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1086,6 +1087,7 @@
 %patch79 -p1 -b .ooo78198.sixtyfour.svx.patch
 %patch80 -p1 -b .ooo78383.vcl.printxerror.patch
 %patch81 -p1 -b .ooo78392.sixtyfour.tools.patch
+%patch82 -p1 -b .oooXXXXX.xmloff.outofrange.patch
 
 cp %{SOURCE1} extras/source/database/evolocal.odb
 
@@ -2685,6 +2687,7 @@
 * Tue Jun 05 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.1-18.2
 - Resolves: rhbz#241875 get script detection right for range vs point
   in drawing objects ooo#72349
+- Resolves: rhbz#242692 openoffice.org-2.2.1.oooXXXXX.xmloff.outofrange.patch
 - extend selinux patch for ppc64 and sparc
 - update stocmerge patch
 - Resolves: rhbz#243305 missing xdg file for quickstart restart