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 a8e6d2f70a8207f24f31f670dac373cc71a31cad Author: Caolán McNamara <caol...@redhat.com> Date: Tue Aug 25 08:55:09 2015 +0100 there may be no storage available in older formats Change-Id: I23cbaf7fc1320168eb75ca33fd6d704125508785 (cherry picked from commit 666fb214e93d542dd80e48b9e008727129b5764f) Reviewed-on: https://gerrit.libreoffice.org/17982 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Michael Meeks <michael.me...@collabora.com> Tested-by: Michael Meeks <michael.me...@collabora.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 03b0278..ce5d300b 100644 --- a/sw/source/filter/ww8/ww8par4.cxx +++ b/sw/source/filter/ww8/ww8par4.cxx @@ -337,8 +337,11 @@ bool SwWW8ImplReader::ImportOleWMF(tools::SvRef<SotStorage> xSrc1,GDIMetaFile &r SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph, const Graphic* pGrf, const SfxItemSet* pFlySet, const Rectangle& aVisArea ) { - SdrObject* pRet = 0; - OSL_ENSURE( m_pStg, "ohne storage geht hier fast gar nichts!" ); + if (!m_pStg) + { + SAL_WARN("sw.ww8", "no storage for ole objects"); + return nullptr; + } ::SetProgressState( m_nProgress, m_rDoc.GetDocShell() ); // Update @@ -390,6 +393,8 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph, } } + SdrObject* pRet = 0; + if (!(m_bIsHeader || m_bIsFooter)) { //Can't put them in headers/footers :-(
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits