filter/source/svg/svgexport.cxx | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
New commits:
commit ef8bf090bfef2d26699acbfb3443430a83194ba6
Author: Gülşah Köse <gulsah.k...@collabora.com>
AuthorDate: Thu Jan 31 16:48:22 2019 +0300
Commit: Aron Budea <aron.bu...@collabora.com>
CommitDate: Fri Feb 22 21:24:54 2019 +0100
tdf#115549 Enable handling background object.
Signed-off-by: Gülşah Köse <gulsah.k...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/67215
Reviewed-by: Marco Cecchetti <mrcek...@gmail.com>
Tested-by: Marco Cecchetti <mrcek...@gmail.com>
(cherry picked from commit 6d7d1fe6cf205d34cc8889e503c727b19c513c94)
Change-Id: Ibb9c01d83572259b812981aa6229e9aa9b7c60f3
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 11ea0115f599..ea9e6964590f 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -2020,7 +2020,6 @@ bool SVGFilter::implCreateObjects()
if( xDrawPage.is() )
{
-#ifdef ENABLE_EXPORT_CUSTOM_SLIDE_BACKGROUND
// TODO complete the implementation for exporting custom
background for each slide
// implementation status:
// - hatch stroke color is set to 'none' so the hatch is not
visible, why?
@@ -2035,14 +2034,13 @@ bool SVGFilter::implCreateObjects()
if( xBackground.is() )
{
drawing::FillStyle aFillStyle;
- sal_Bool assigned = ( xBackground->getPropertyValue(
"FillStyle" ) >>= aFillStyle );
- if( assigned && aFillStyle != drawing::FillStyle_NONE )
+ bool assigned = ( xBackground->getPropertyValue( "FillStyle" )
>>= aFillStyle );
+ if( assigned && aFillStyle != drawing::FillStyle_NONE
+ && aFillStyle != drawing::FillStyle_BITMAP )
{
implCreateObjectsFromBackground( xDrawPage );
}
}
-#endif
-
if( xDrawPage.is() )
implCreateObjectsFromShapes( xDrawPage, xDrawPage );
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
