summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2019-05-31 14:38:34 +0100
committerMichael Meeks <michael.meeks@collabora.com>2019-08-02 11:41:47 -0400
commita85b62cb8cbbbd25316f77b49055c1fb817c60e3 (patch)
tree17f7cc216b79db32426769dc4664d7f37f107c27
parent57edeebb72a69d4cee1dc2cc2e5a93b8f0410624 (diff)
Avoid odd crash where OLE object can't generate an image preview.
Change-Id: Ib77eca6907aa09383a96f3c9de6f7a7c4799c3bc
-rw-r--r--sw/source/filter/html/htmlplug.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index 222ca88667c0..89f061eb3973 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -1506,6 +1506,12 @@ Writer& OutHTML_FrameFormatOLENodeGrf( Writer& rWrt, const SwFrameFormat& rFrame
return rWrt;
}
+ if ( !pOLENd->GetGraphic() )
+ {
+ SAL_WARN("sw.html", "Unexpected missing OLE fallback graphic");
+ return rWrt;
+ }
+
Graphic aGraphic( *pOLENd->GetGraphic() );
SwDocShell* pDocSh = rHTMLWrt.m_pDoc->GetDocShell();