rpms/openoffice.org/devel openoffice.org-2.2.1.ooo78971.xmloff.outofrange.patch, NONE, 1.1
Jan Navrátil (jnavrati)
fedora-extras-commits at redhat.com
Wed Aug 1 14:46:04 UTC 2007
Author: jnavrati
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23716
Added Files:
openoffice.org-2.2.1.ooo78971.xmloff.outofrange.patch
Log Message:
set upstream id
openoffice.org-2.2.1.ooo78971.xmloff.outofrange.patch:
--- NEW FILE openoffice.org-2.2.1.ooo78971.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");
}
}
More information about the fedora-extras-commits
mailing list