filter/source/svg/svgexport.cxx | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
New commits:
commit 740748d4470ce3f1db3fcbef729a5dc98c0b9569
Author: Gülşah Köse <gulsah.k...@collabora.com>
AuthorDate: Thu Feb 28 12:40:50 2019 +0300
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Thu Feb 28 14:09:41 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/68493
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Tested-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index b872b842b36e..6f1c759a103d 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -2025,16 +2025,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 );
+ }
}
}
implCreateObjectsFromShapes( xDrawPage, xDrawPage );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
