rpms/openoffice.org/F-13 openoffice.org-3.2.0.ooo111886.sw.layout.workaround.patch, NONE, 1.1 openoffice.org.spec, 1.2186, 1.2187

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11552/F-13

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.2.0.ooo111886.sw.layout.workaround.patch 
Log Message:
Resolves: rhbz#596807 openoffice.org-3.2.0.ooo111886.sw.layout.workaround.patch

openoffice.org-3.2.0.ooo111886.sw.layout.workaround.patch:
 tabfrm.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE openoffice.org-3.2.0.ooo111886.sw.layout.workaround.patch ---
--- sw/source/core/layout/tabfrm.cxx	2010-05-27 20:35:30.000000000 +0100
+++ sw/source/core/layout/tabfrm.cxx	2010-05-27 20:37:04.000000000 +0100
@@ -1625,7 +1625,8 @@
 #endif
                 }
             }
-            pCnt->GetUpper()->Calc();
+            if (const SwFrm* pUpper = pCnt->GetUpper())
+                pUpper->Calc();
         }
         // <--
         if( ! bAll && (*fnRect->fnYDiff)((pCnt->Frm().*fnRect->fnGetTop)(), nBottom) > 0 )


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-13/openoffice.org.spec,v
retrieving revision 1.2186
retrieving revision 1.2187
diff -u -p -r1.2186 -r1.2187
--- openoffice.org.spec	21 May 2010 15:21:30 -0000	1.2186
+++ openoffice.org.spec	27 May 2010 19:49:01 -0000	1.2187
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 12
-%define rh_rpm_release 23
+%define rh_rpm_release 24
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -149,6 +149,7 @@ Patch78: openoffice.org-3.3.0.ooo111446.
 Patch79: workspace.vcl111.patch
 Patch80: openoffice.org-3.3.0.ooo111699.svx.nullfield.patch
 Patch81: openoffice.org-3.3.0.ooo111758.sd.xerror.patch
+Patch82: openoffice.org-3.2.0.ooo111886.sw.layout.workaround.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1728,6 +1729,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch79 -p1 -b .workspace.vcl111.patch
 %patch80 -p0 -b .ooo111699.svx.nullfield.patch
 %patch81 -p0 -b .ooo111758.sd.xerror.patch
+%patch82 -p0 -b .ooo111886.sw.layout.workaround.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4213,6 +4215,9 @@ fi
 %endif
 
 %changelog
+* Thu May 27 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.24.UNRELEASED
+- Resolves: rhbz#596807 openoffice.org-3.2.0.ooo111886.sw.layout.workaround.patch
+
 * Fri May 21 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.23
 - Resolves: rhbz#594035 openoffice.org-3.3.0.ooo111758.sd.xerror.patch