rpms/openoffice.org/devel openoffice.org-3.2.0.ooo107763.transcrash.patch, NONE, 1.1 openoffice.org.spec, 1.2133, 1.2134

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.2.0.ooo107763.transcrash.patch 
Log Message:
Resolves: ooo#107763 transparent object crash in impress

openoffice.org-3.2.0.ooo107763.transcrash.patch:
 outdev6.cxx |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE openoffice.org-3.2.0.ooo107763.transcrash.patch ---
diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx
index cf20a29..db34542 100644
--- a/vcl/source/gdi/outdev6.cxx
+++ b/vcl/source/gdi/outdev6.cxx
@@ -269,6 +269,7 @@ void OutputDevice::DrawTransparent( const PolyPolygon& rPolyPoly,
     // try hard to draw it directly, because the emulation layers are slower
     if( !pDisableNative
         && mpGraphics->supportsOperation( OutDevSupport_B2DDraw ) 
+        && GetBitCount() > 8
 #ifdef WIN32
         // workaround bad dithering on remote displaying when using GDI+ with toolbar buttoin hilighting
         && !rPolyPoly.IsRect()


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2133
retrieving revision 1.2134
diff -u -p -r1.2133 -r1.2134
--- openoffice.org.spec	25 Jan 2010 13:46:03 -0000	1.2133
+++ openoffice.org.spec	29 Jan 2010 09:33:44 -0000	1.2134
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 11
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -133,6 +133,7 @@ Patch57: openoffice.org-3.2.0.ooo96362.f
 Patch58: workspace.cmcfixes70.patch
 Patch59: workspace.s390xport02.patch
 Patch60: openoffice.org-3.3.0.ooo108637.sfx2.uisavedir.patch
+Patch61: openoffice.org-3.2.0.ooo107763.transcrash.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1693,6 +1694,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch58 -p1 -b .workspace.cmcfixes70.patch
 %patch59 -p1 -b .workspace.s390xport02.patch
 %patch60 -p1 -b .ooo108637.sfx2.uisavedir.patch
+%patch61 -p1 -b .ooo107763.transcrash.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4175,6 +4177,9 @@ fi
 %endif
 
 %changelog
+* Fri Jan 29 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-11.2
+- Resolves: ooo#107763 transparent object crash in impress
+
 * Mon Jan 25 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-11.1
 - latest milestone
 - Resolves: ooo#108637/rhbz#558253 sfx2 uisavedir