[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/qa sw/source

[Caolán McNamara]

 sw/qa/core/data/ww5/pass/crash-2.doc |binary
 sw/source/filter/ww8/ww8par4.cxx     |    9 +++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit f6790861e289a9c7c1d6b49757a8e405b2f65b17
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Aug 25 08:55:09 2015 +0100

    there may be no storage available in older formats
    
    (cherry picked from commit 666fb214e93d542dd80e48b9e008727129b5764f)
    
    Change-Id: I23cbaf7fc1320168eb75ca33fd6d704125508785
    Reviewed-on: https://gerrit.libreoffice.org/17987
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/sw/qa/core/data/ww5/pass/crash-2.doc b/sw/qa/core/data/ww5/pass/crash-2.doc
new file mode 100644
index 0000000..23a1897
Binary files /dev/null and b/sw/qa/core/data/ww5/pass/crash-2.doc differ
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index b09fec6..c215283 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -337,8 +337,11 @@ bool SwWW8ImplReader::ImportOleWMF(SvStorageRef xSrc1,GDIMetaFile &rWMF,
 SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph,
     const Graphic* pGrf, const SfxItemSet* pFlySet, const Rectangle& aVisArea )
 {
-    SdrObject* pRet = 0;
-    OSL_ENSURE( pStg, "ohne storage geht hier fast gar nichts!" );
+    if (!pStg)
+    {
+        SAL_WARN("sw.ww8", "no storage for ole objects");
+        return nullptr;
+    }
 
     ::SetProgressState( nProgress, rDoc.GetDocShell() );     // Update
 
@@ -390,6 +393,8 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph,
         }
     }
 
+    SdrObject* pRet = 0;
+
     if (!(bIsHeader || bIsFooter))
     {
         //Can't put them in headers/footers :-(