[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - xmloff/source

[Caolán McNamara]

 xmloff/source/draw/sdxmlexp.cxx |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 70765cd63e02b57b1b3508e4a740982b7387ff23
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Dec 9 09:51:09 2014 +0000

    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 at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 4eacdcf..f230b2a 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);
     }
 }