Kaydet (Commit) 1ef21a7b authored tarafından Caolán McNamara's avatar Caolán McNamara Kaydeden (comit) Andras Timar

there may be no storage available in older formats

Change-Id: I23cbaf7fc1320168eb75ca33fd6d704125508785
(cherry picked from commit 666fb214)
Reviewed-on: https://gerrit.libreoffice.org/17982Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
Tested-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
üst ccba41f1
This diff was suppressed by a .gitattributes entry.
...@@ -337,8 +337,11 @@ bool SwWW8ImplReader::ImportOleWMF(tools::SvRef<SotStorage> xSrc1,GDIMetaFile &r ...@@ -337,8 +337,11 @@ bool SwWW8ImplReader::ImportOleWMF(tools::SvRef<SotStorage> xSrc1,GDIMetaFile &r
SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph, SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph,
const Graphic* pGrf, const SfxItemSet* pFlySet, const Rectangle& aVisArea ) const Graphic* pGrf, const SfxItemSet* pFlySet, const Rectangle& aVisArea )
{ {
SdrObject* pRet = 0; if (!m_pStg)
OSL_ENSURE( m_pStg, "ohne storage geht hier fast gar nichts!" ); {
SAL_WARN("sw.ww8", "no storage for ole objects");
return nullptr;
}
::SetProgressState( m_nProgress, m_rDoc.GetDocShell() ); // Update ::SetProgressState( m_nProgress, m_rDoc.GetDocShell() ); // Update
...@@ -390,6 +393,8 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph, ...@@ -390,6 +393,8 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph,
} }
} }
SdrObject* pRet = 0;
if (!(m_bIsHeader || m_bIsFooter)) if (!(m_bIsHeader || m_bIsFooter))
{ {
//Can't put them in headers/footers :-( //Can't put them in headers/footers :-(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment