diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-08-25 08:55:09 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-09-19 21:31:07 +0200 |
| commit | 23080ab7fd3cd8370e388d1433cf3ea7fe88f782 (patch) | |
| tree | 70bfbbce93c7f0ed82b4720afe49bf326dd92024 /sw | |
| parent | a25fb38eb2a269384fc4ffe3c484673edc53d78d (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/core/data/ww5/pass/crash-2.doc | bin | 0 -> 4203 bytes | |||
| -rw-r--r-- | sw/source/filter/ww8/ww8par4.cxx | 9 |
2 files changed, 7 insertions, 2 deletions
diff --git a/sw/qa/core/data/ww5/pass/crash-2.doc b/sw/qa/core/data/ww5/pass/crash-2.doc Binary files differnew file mode 100644 index 000000000000..23a189712d8c --- /dev/null +++ b/sw/qa/core/data/ww5/pass/crash-2.doc diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx index 03b0278f4a8c..ce5d300be31d 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 :-( |