[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - filter/source

[Libreoffice Gerrit user]

 filter/source/svg/svgexport.cxx |   19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

New commits:
commit 518234a83e357d6d60bcff4b5408adb12168fad6
Author:     Gülşah Köse <gulsah.kose at collabora.com>
AuthorDate: Thu Feb 28 12:40:50 2019 +0300
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Feb 28 10:56:44 2019 +0100

    tdf#115549 Check xPropset is exist.
    
    Checks xPropset is exist for chart handling on LibreOffice Online.
    
    Change-Id: I57947fd23e089ace4df011873613c2f886770b30
    Reviewed-on: https://gerrit.libreoffice.org/68495
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index ea9e6964590f..87fbbdee425d 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -2029,16 +2029,19 @@ bool SVGFilter::implCreateObjects()
             // - tiled bitmap: an image element is exported for each tile,
             //   this is really too expensive!
             Reference< XPropertySet > xPropSet( xDrawPage, UNO_QUERY );
-            Reference< XPropertySet > xBackground;
-            xPropSet->getPropertyValue( "Background" ) >>= xBackground;
-            if( xBackground.is() )
+            if( xPropSet.is() )
             {
-                drawing::FillStyle aFillStyle;
-                bool assigned = ( xBackground->getPropertyValue( "FillStyle" ) >>= aFillStyle );
-                if( assigned && aFillStyle != drawing::FillStyle_NONE
-                             && aFillStyle != drawing::FillStyle_BITMAP )
+                Reference< XPropertySet > xBackground;
+                xPropSet->getPropertyValue( "Background" ) >>= xBackground;
+                if( xBackground.is() )
                 {
-                    implCreateObjectsFromBackground( xDrawPage );
+                    drawing::FillStyle aFillStyle;
+                    bool assigned = ( xBackground->getPropertyValue( "FillStyle" ) >>= aFillStyle );
+                    if( assigned && aFillStyle != drawing::FillStyle_NONE
+                                 && aFillStyle != drawing::FillStyle_BITMAP )
+                    {
+                        implCreateObjectsFromBackground( xDrawPage );
+                    }
                 }
             }
             if( xDrawPage.is() )