rpms/openoffice.org/devel openoffice.org-3.2.0.ooo111886.sw.layout.workaround.patch, NONE, 1.1 openoffice.org.spec, 1.2226, 1.2227

[Caolan McNamara]

Author: caolanm

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

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/devel/openoffice.org.spec,v
retrieving revision 1.2226
retrieving revision 1.2227
diff -u -p -r1.2226 -r1.2227
--- openoffice.org.spec	26 May 2010 19:52:20 -0000	1.2226
+++ openoffice.org.spec	27 May 2010 19:49:02 -0000	1.2227
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 19
-%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}
@@ -139,6 +139,7 @@ Patch68: openoffice.org-3.3.0.ooo111699.
 Patch69: openoffice.org-3.3.0.ooo111758.sd.xerror.patch
 Patch70: workspace.extras330.patch
 Patch71: openoffice.org-3.2.0.ooo111741.extras.malformed-xml-file.patch
+Patch72: 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}
@@ -1691,6 +1692,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch69 -p0 -b .ooo111758.sd.xerror.patch
 %patch70 -p1 -b .workspace.extras330.patch
 %patch71 -p1 -b .ooo111741.extras.malformed-xml-file.patch
+%patch72 -p0 -b .ooo111886.sw.layout.workaround.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4175,6 +4177,9 @@ fi
 %endif
 
 %changelog
+* Thu May 27 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.1-19.2
+- Resolves: rhbz#596807 openoffice.org-3.2.0.ooo111886.sw.layout.workaround.patch
+
 * Wed May 26 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.1-19.1
 - release candidate