rpms/openoffice.org/F-13 openoffice.org-3.3.0.ooo112384.sw.export.doc.styledoesntexist.patch, NONE, 1.1 openoffice.org.spec, 1.2197, 1.2198

[Caolan McNamara]

Author: caolanm

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

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/F-13/openoffice.org.spec,v
retrieving revision 1.2197
retrieving revision 1.2198
diff -u -p -r1.2197 -r1.2198
--- openoffice.org.spec	14 Jun 2010 08:07:00 -0000	1.2197
+++ openoffice.org.spec	14 Jun 2010 13:38:06 -0000	1.2198
@@ -159,6 +159,7 @@ Patch88: workspace.os140.patch
 Patch89: workspace.vcl112.patch
 Patch90: openoffice.org-3.2.1.pyuno.patch
 Patch91: workspace.ooo321gsl05.patch
+Patch92: 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}
@@ -1748,6 +1749,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch89 -p1 -b .workspace.vcl112.patch
 %patch90 -p0 -b .pyuno.patch
 %patch91 -p1 -b .workspace.ooo321gsl05.patch
+%patch92 -p0 -b .ooo112384.sw.export.doc.styledoesntexist.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4236,6 +4238,7 @@ fi
 * Mon Jun 14 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.25-UNRELEASED
 - Resolves: rhbz#602631 dual head fixes add workspace.ooo321gsl05.patch
 - Resolves: rhbz#603298 crash in ImplFontCharMap::GetGlyphIndex
+- Resolves: rhbz#601890/ooo#112384 avoid crash on export to .doc
 
 * Sat Jun 05 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.24
 - Resolves: CVE-2010-0395 openoffice.org-3.2.1.pyuno.patch