[Libreoffice-commits] core.git: sw/source

[Caolán McNamara (via logerrit)]

 sw/source/filter/xml/xmlexp.cxx |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 6e111548d9de8eacff79d614e4400719df792228
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Sep 28 10:23:29 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Sep 28 13:02:39 2021 +0200

    flatten this in advance of additional changes
    
    Change-Id: I2169a235be83558edb1c5146e3fc8848449f55c6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122762
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index 437a1a9c76f6..7ddf32da76cb 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -385,12 +385,14 @@ void SwXMLExport::GetViewSettings(Sequence<PropertyValue>& aProps)
 void SwXMLExport::GetConfigurationSettings( Sequence < PropertyValue >& rProps)
 {
     Reference< XMultiServiceFactory > xFac( GetModel(), UNO_QUERY );
-    if( xFac.is() )
-    {
-        Reference< XPropertySet > xProps( xFac->createInstance("com.sun.star.document.Settings"), UNO_QUERY );
-        if( xProps.is() )
-            SvXMLUnitConverter::convertPropertySet( rProps, xProps );
-    }
+    if (!xFac.is())
+        return;
+
+    Reference< XPropertySet > xProps( xFac->createInstance("com.sun.star.document.Settings"), UNO_QUERY );
+    if (!xProps.is())
+        return;
+
+    SvXMLUnitConverter::convertPropertySet( rProps, xProps );
 }
 
 sal_Int32 SwXMLExport::GetDocumentSpecificSettings( std::vector< SettingsGroup >& _out_rSettings )