rpms/openoffice.org/devel openoffice.org-3.3.0.ooo112384.sw.export.doc.styledoesntexist.patch, NONE, 1.1 openoffice.org.spec, 1.2241, 1.2242

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.3.0.ooo112384.sw.export.doc.styledoesntexist.patch 
Log Message:
Resolves: rhbz#601890/ooo#112384 avoid crash on export to .doc

openoffice.org-3.3.0.ooo112384.sw.export.doc.styledoesntexist.patch:
 ww8atr.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openoffice.org-3.3.0.ooo112384.sw.export.doc.styledoesntexist.patch ---
--- sw/source/filter/ww8/ww8atr.cxx	2010-06-14 14:19:56.000000000 +0100
+++ sw/source/filter/ww8/ww8atr.cxx	2010-06-14 14:20:18.000000000 +0100
@@ -2298,7 +2298,7 @@
                                 if( sStyle.Len() )
                                 {
                                     SwTxtFmtColl* pColl = GetExport().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.2241
retrieving revision 1.2242
diff -u -p -r1.2241 -r1.2242
--- openoffice.org.spec	14 Jun 2010 09:39:29 -0000	1.2241
+++ openoffice.org.spec	14 Jun 2010 13:38:06 -0000	1.2242
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 19
-%define rh_rpm_release 12
+%define rh_rpm_release 13
 
 # 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.ooo107490.
 Patch79: openoffice.org-3.3.0.ooo100686.wizards.types.not.mediatypes.patch
 Patch80: openoffice.org-3.3.0.ooo112247.vcl.workaround.overlarge.replacements.patch
 Patch81: openoffice.org-3.3.0.ooo112363.accessibility.badindex.patch
+Patch82: openoffice.org-3.3.0.ooo112384.sw.export.doc.styledoesntexist.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1711,6 +1712,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch79 -p0 -b .ooo100686.wizards.types.not.mediatypes.patch
 %patch80 -p0 -b .ooo112247.vcl.workaround.overlarge.replacements.patch
 %patch81 -p0 -b .ooo112363.accessibility.badindex.patch
+%patch82 -p0 -b .ooo112384.sw.export.doc.styledoesntexist.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4201,6 +4203,9 @@ fi
 %endif
 
 %changelog
+* Mon Jun 14 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.1-19.13
+- Resolves: rhbz#601890/ooo#112384 avoid crash on export to .doc
+
 * Mon Jun 14 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.1-19.12
 - Resolves: rhbz#603013/ooo#112363 avoid a11y crash