[Libreoffice-commits] .: sw/source

[Miklos Vajna]

 sw/source/filter/ww8/wrtww8.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 88091ae83ef1bb2e710bbb76efa351cc92276857
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Mon Aug 1 19:55:42 2011 +0200

    MSWordExportBase::ExportDocument: check if we have a DocShell
    
    This fixes a crash during RTF export invoked by copy&paste, as the
    called constructor would unconditionally dereference the DocShell's
    pointer since commit 183c9723dce0296baa0a38220199a1aa0e9f52ca.

diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index edad4b1..cf07bc8 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2925,7 +2925,7 @@ void MSWordExportBase::ExportDocument( bool bWriteAll )
     if ( !pOleMap)
         pOleMap = new WW8OleMaps;
 
-    if ( !pOCXExp )
+    if ( !pOCXExp && pDoc->GetDocShell() )
         pOCXExp = new SwMSConvertControls( pDoc->GetDocShell(), pCurPam );
 
     // #i81405# - Collect anchored objects before changing the redline mode.