rpms/openoffice.org/devel openoffice.org-2.2.1.ooo78921.sw.embedded.patch, NONE, 1.1 openoffice.org.spec, 1.1219, 1.1220

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13174

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.2.1.ooo78921.sw.embedded.patch 
Log Message:
Resolves: rhbz#245729 openoffice.org-2.2.1.ooo78921.sw.embedded.patch

openoffice.org-2.2.1.ooo78921.sw.embedded.patch:

--- NEW FILE openoffice.org-2.2.1.ooo78921.sw.embedded.patch ---
Index: source/core/text/txtfrm.cxx
===================================================================
RCS file: /cvs/sw/sw/source/core/text/txtfrm.cxx,v
retrieving revision 1.94.6.1
diff -u -r1.94.6.1 txtfrm.cxx
--- openoffice.org.orig/sw/source/core/text/txtfrm.cxx	29 Jan 2007 16:52:13 -0000	1.94.6.1
+++ openoffice.org/sw/source/core/text/txtfrm.cxx	26 Jun 2007 16:30:38 -0000
@@ -2239,8 +2239,9 @@
     const SwTwips mnOldHeightOfLastLine( mnHeightOfLastLine );
     // <--
     // determine output device
-    ViewShell* pVsh = (ViewShell*)GetShell();
+    ViewShell* pVsh = GetShell();
     ASSERT( pVsh, "<SwTxtFrm::_GetHeightOfLastLineForPropLineSpacing()> - no ViewShell -> crash" );
+    if (!pVsh) return;
     OutputDevice* pOut = pVsh->GetOut();
     const IDocumentSettingAccess* pIDSA = GetTxtNode()->getIDocumentSettingAccess();
     if ( !pIDSA->get(IDocumentSettingAccess::BROWSE_MODE) ||
@@ -2249,6 +2250,7 @@
         pOut = GetTxtNode()->getIDocumentDeviceAccess()->getReferenceDevice( true );
     }
     ASSERT( pOut, "<SwTxtFrm::_GetHeightOfLastLineForPropLineSpacing()> - no OutputDevice -> crash" );
+    if (!pOut) return;
 
     // determine height of last line
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1219
retrieving revision 1.1220
diff -u -r1.1219 -r1.1220
--- openoffice.org.spec	26 Jun 2007 14:47:35 -0000	1.1219
+++ openoffice.org.spec	27 Jun 2007 08:22:51 -0000	1.1220
@@ -146,6 +146,7 @@
 Patch81: openoffice.org-2.2.1.ooo78392.sixtyfour.tools.patch
 Patch82: openoffice.org-2.2.1.oooXXXXX.xmloff.outofrange.patch
 Patch83: openoffice.org-2.2.1.ooo78895.sw.overlappingpdf.patch
+Patch84: openoffice.org-2.2.1.ooo78921.sw.embedded.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1084,6 +1085,7 @@
 %patch81 -p1 -b .ooo78392.sixtyfour.tools.patch
 %patch82 -p1 -b .oooXXXXX.xmloff.outofrange.patch
 %patch83 -p1 -b .ooo78895.sw.overlappingpdf.patch
+%patch84 -p1 -b .ooo78921.sw.embedded.patch
 
 cp %{SOURCE1} extras/source/database/evolocal.odb
 
@@ -2682,6 +2684,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Wed Jun 27 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.1-18.5
+- Resolves: rhbz#245729 openoffice.org-2.2.1.ooo78921.sw.embedded.patch
+
 * Tue Jun 26 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.1-18.4
 - require new hunspell-ar for arabic langpack
 - Resolves: rhbz#244656 overlapping glyphs in pdf export