summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2013-06-08 15:28:55 +0200
committerMiklos Vajna <vmiklos@suse.cz>2013-06-10 08:27:19 +0000
commitdcfefd6676d8cf8930424724a509cce0d3612962 (patch)
tree3774e7af42c827fed6b61116e99de5c25e4aa581
parentde3a561d6c927e849c1a7e46830310c272321d06 (diff)
Related fdo#33895 add some checks against NULL derefs
Change-Id: I9c62a063788a494125ce8dc27748ed66022f5c48 Reviewed-on: https://gerrit.libreoffice.org/4199 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
-rw-r--r--writerfilter/source/ooxml/OOXMLFastContextHandler.cxx7
1 files changed, 6 insertions, 1 deletions
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 205f82152dcf..fc6eb3e390c5 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -1161,8 +1161,13 @@ void OOXMLFastContextHandler::resolveFooter
// Add the data pointed to by the reference as another property.
void OOXMLFastContextHandler::resolveData(const OUString & rId)
{
+ OOXMLDocument * objDocument = getDocument();
+ SAL_WARN_IF(!objDocument, "writerfilter", "no document to resolveData");
+ if (!objDocument)
+ return;
+
uno::Reference<io::XInputStream> xInputStream
- (mpParserState->getDocument()->getInputStreamForId(rId));
+ (objDocument->getInputStreamForId(rId));
OOXMLValue::Pointer_t aValue(new OOXMLInputStreamValue(xInputStream));