summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-11-25 14:49:24 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-11-26 12:21:35 +0000
commit49fb1b398698db6faa56d340694ee38b1a867a8d (patch)
tree449aee2e792163fc982a61c97036597a513c2cae /writerfilter
parentff592b85f02a1e16aa1668c874e733331e4e242b (diff)
crashtesting: failure on File_1404.docx
Change-Id: Id984cc1f5954be38fbe3a1a15bfe811d7cdfe99d (cherry picked from commit d05ae550316e3dc5afe799c7d6cf83f02e37d69b) Reviewed-on: https://gerrit.libreoffice.org/20175 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/source/dmapper/OLEHandler.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/OLEHandler.cxx b/writerfilter/source/dmapper/OLEHandler.cxx
index 6208750d0bd3..d282c7b5bfde 100644
--- a/writerfilter/source/dmapper/OLEHandler.cxx
+++ b/writerfilter/source/dmapper/OLEHandler.cxx
@@ -236,6 +236,8 @@ void OLEHandler::importStream(uno::Reference<uno::XComponentContext> xComponentC
uno::Reference<document::XImporter> xImporter(xInterface, uno::UNO_QUERY);
uno::Reference<document::XEmbeddedObjectSupplier> xSupplier(xOLE, uno::UNO_QUERY);
uno::Reference<lang::XComponent> xEmbeddedObject(xSupplier->getEmbeddedObject(), uno::UNO_QUERY);
+ if (!xEmbeddedObject.is())
+ return;
xImporter->setTargetDocument( xEmbeddedObject );
// Import the input stream.