diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-12-09 09:51:09 +0000 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-12-09 10:18:11 +0000 |
| commit | 70765cd63e02b57b1b3508e4a740982b7387ff23 (patch) | |
| tree | 843e284ab0509e4cecca46a6400c0dd51ffd3dea | |
| parent | fc95fb6eb235331b2564b78f2c026364263db6e1 (diff) | |
Resolves: fdo#87108 crash on saving fodg
Change-Id: Ib88f0e9b0a3ba229c9e9f6cf20831c16051e3e29
(cherry picked from commit bfd63516c9fd4ec366576f9a0e3c456bc3d530a3)
(cherry picked from commit 2b257feba285840dee91e3c3e7ddc112eb8f684e)
Reviewed-on: https://gerrit.libreoffice.org/13390
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
| -rw-r--r-- | xmloff/source/draw/sdxmlexp.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 4eacdcf585ea..f230b2afa149 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -2548,10 +2548,13 @@ void SdXMLExport::GetConfigurationSettings(uno::Sequence<beans::PropertyValue>& Reference< beans::XPropertySet > xProps( xFac->createInstance("com.sun.star.document.Settings"), UNO_QUERY ); if( xProps.is() ) SvXMLUnitConverter::convertPropertySet( rProps, xProps ); - DocumentSettingsSerializer *pFilter; - pFilter = dynamic_cast<DocumentSettingsSerializer *>(xProps.get()); - if( pFilter ) - rProps = pFilter->filterStreamsToStorage( GetTargetStorage(), rProps ); + DocumentSettingsSerializer *pFilter(dynamic_cast<DocumentSettingsSerializer *>(xProps.get())); + if (!pFilter) + return; + const uno::Reference< embed::XStorage > xStorage(GetTargetStorage()); + if (!xStorage.is()) + return; + rProps = pFilter->filterStreamsToStorage(xStorage, rProps); } } |