Attachment 157911 Details for Bug 245729 – patch to avoid crash

[patch] patch to avoid crash

crash.when.embedded.patch (text/plain), 1.12 KB, created by Caolan McNamara on 2007-06-26 16:31:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Caolan McNamara

Created: 2007-06-26 16:31:06 UTC

Size: 1.12 KB

patch

obsolete

>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
>--- source/core/text/txtfrm.cxx	29 Jan 2007 16:52:13 -0000	1.94.6.1
>+++ 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
>

Actions: View | Diff

Attachments on bug 245729: 157881 | 157910 | 157911 | 157985