[openoffice.org/f14/master] Resolves: rhbz#620574 Presentation for coccinelle: Start slide is a complete mess

[David Tardon]

commit 9434fe00d4109606e5aece36054930fc7486027b
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Aug 10 07:25:03 2010 +0200

    Resolves: rhbz#620574 Presentation for coccinelle: Start slide is a complete mess

 openoffice.org.spec        |    8 +++++++-
 workspace.impress197.patch |   18 ++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 20cf2ba..65d4565 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -1,6 +1,6 @@
 %define oootag OOO330
 %define ooomilestone 3
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -113,6 +113,7 @@ Patch36: workspace.vcl114.patch
 Patch37: openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch
 Patch38: openoffice.org-gccXXXXX.idlc.patch
 Patch39: openoffice.org-3.3.0.ooo106591.sal.tradcopy.patch
+Patch40: workspace.impress197.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1640,6 +1641,7 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
 %patch37 -p0 -b .ooo113273.desktop.resolvelinks.patch
 %patch38 -p1 -b .gccXXXXX.idlc.patch
 %patch39 -p0 -b .ooo106591.sal.tradcopy.patch
+%patch40 -p1 -b .workspace.impress197.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3781,6 +3783,10 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
 %endif
 
 %changelog
+* Tue Aug 10 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.3.0-3.3
+- Resolves: rhbz#620574 Presentation for coccinelle: Start slide is a
+  complete mess (dtardon)
+
 * Mon Aug 09 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.3.0-3.2
 - Resolves: rhbz#601621 avoid using mmap for copying files
 
diff --git a/workspace.impress197.patch b/workspace.impress197.patch
new file mode 100644
index 0000000..226d008
--- /dev/null
+++ b/workspace.impress197.patch
@@ -0,0 +1,18 @@
+changeset:   271161:892165edd2a7
+user:        Christian Lippka <christian.lippka at sun.com>
+date:        Wed Aug 04 10:48:35 2010 +0200
+summary:     #i113603# only change layout shape size on init or of user call is set
+
+diff -r adad3ddc53f1 -r 892165edd2a7 sd/source/core/sdpage.cxx
+--- a/sd/source/core/sdpage.cxx	Tue Jul 27 13:55:29 2010 +0200
++++ b/sd/source/core/sdpage.cxx	Wed Aug 04 10:48:35 2010 +0200
+@@ -2355,7 +2355,7 @@
+ 		}
+ 	}
+ 
+-	if ( pObj && ( pObj->IsEmptyPresObj() || !pObj->ISA(SdrGrafObj) ) )
++	if ( pObj && (pObj->GetUserCall() || bInit) && ( pObj->IsEmptyPresObj() || !pObj->ISA(SdrGrafObj) ) )
+ 		pObj->AdjustToMaxRect( aRect );
+ 
+ 	return pObj;
+