rpms/openoffice.org/F-12 openoffice.org-3.1.1.oooXXXXX.sw.ww8exportcrash.patch, NONE, 1.1 openoffice.org.spec, 1.2087, 1.2088

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.1.oooXXXXX.sw.ww8exportcrash.patch 
Log Message:
Resolves: rhbz#589883 openoffice.org-3.1.1.oooXXXXX.sw.ww8exportcrash.patch

openoffice.org-3.1.1.oooXXXXX.sw.ww8exportcrash.patch:
 wrtw8nds.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openoffice.org-3.1.1.oooXXXXX.sw.ww8exportcrash.patch ---
--- sw.orig/source/filter/ww8/wrtw8nds.cxx	2010-05-07 14:13:23.000000000 +0100
+++ sw/source/filter/ww8/wrtw8nds.cxx	2010-05-07 14:18:10.000000000 +0100
@@ -1479,7 +1479,7 @@
     {
         // ignore TOX header section
         const SwSectionNode* pSectNd = rNode.FindSectionNode();
-        if( TOX_CONTENT_SECTION == pSectNd->GetSection().GetType() )
+        if( pSectNd && TOX_CONTENT_SECTION == pSectNd->GetSection().GetType() )
         {
             rWW8Wrt.StartTOX( pSectNd->GetSection() );
             rWW8Wrt.push_charpropstart(0);


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-12/openoffice.org.spec,v
retrieving revision 1.2087
retrieving revision 1.2088
diff -u -p -r1.2087 -r1.2088
--- openoffice.org.spec	27 Apr 2010 15:56:27 -0000	1.2087
+++ openoffice.org.spec	7 May 2010 13:21:05 -0000	1.2088
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 19
-%define rh_rpm_release 29
+%define rh_rpm_release 30
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -206,6 +206,7 @@ Patch127: openoffice.org-3.2.0.ooo110142
 Patch128: workspace.dr67.patch
 Patch129: workspace.os127.patch
 Patch130: workspace.hb32bugs02.patch
+Patch131: openoffice.org-3.1.1.oooXXXXX.sw.ww8exportcrash.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1805,6 +1806,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch128 -p0 -b .workspace.dr67.patch
 %patch129 -p0 -b .workspace.os127.patch
 %patch130 -p0 -b .workspace.hb32bugs02.patch
+%patch131 -p0 -b .oooXXXXX.sw.ww8exportcrash.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4350,6 +4352,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Fri May 07 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.30
+- Resolves: rhbz#589883 openoffice.org-3.1.1.oooXXXXX.sw.ww8exportcrash.patch
+
 * Tue Apr 27 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.29
 - Resolves: rhbz#574542 [abrt] crash in
   slideshow::internal::EventMultiplexerImpl::forEachView<> (dtardon)