rpms/openoffice.org/devel openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch, 1.4, 1.5 openoffice.org.spec, 1.1913, 1.1914

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch 
	openoffice.org.spec 
Log Message:
Resolves: ooo#102194 crash export on .doc with unused style in .toc

openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch:

Index: openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch	12 Mar 2009 13:17:27 -0000	1.4
+++ openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch	25 May 2009 12:29:11 -0000	1.5
@@ -325,7 +325,7 @@ diff -u -r1.113.44.3 ww8atr.cxx
 -                                        sTOption += ';';
 -                                    ( sTOption += sStyle ) += sLvl;
 +                                    SwTxtFmtColl* pColl = pDoc->FindTxtFmtCollByName(sStyle);
-+                                    if (!pColl->IsAssignedToListLevelOfOutlineStyle() || pColl->GetAssignedOutlineStyleLevel() < nTOXLvl)
++                                    if (!pColl || !pColl->IsAssignedToListLevelOfOutlineStyle() || pColl->GetAssignedOutlineStyleLevel() < nTOXLvl)
 +                                    {
 +                                        if( sTOption.Len() )
 +                                            sTOption += ',';


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1913
retrieving revision 1.1914
diff -u -p -r1.1913 -r1.1914
--- openoffice.org.spec	23 May 2009 20:24:40 -0000	1.1913
+++ openoffice.org.spec	25 May 2009 12:29:11 -0000	1.1914
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 11
-%define rh_rpm_release 3
+%define rh_rpm_release 4
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -4143,6 +4143,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Mon May 25 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-11.4
+- Resolves: ooo#102194 crash export on .doc with unused style in .toc
+
 * Thu May 07 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-11.3
 - add in the ia64 and arm fixes for the secondary arch people
 - Resolves(partially): rhbz#495901 No default font-width for wmf export