summaryrefslogtreecommitdiff
path: root/filter/source
diff options
context:
space:
mode:
authorGülşah Köse <gulsah.kose@collabora.com>2019-01-31 16:48:22 +0300
committerAron Budea <aron.budea@collabora.com>2019-02-22 21:24:54 +0100
commitef8bf090bfef2d26699acbfb3443430a83194ba6 (patch)
tree2907f01c38168df29dadf208c8ba4e8138fb126b /filter/source
parent47ecfa0d8bd64ad946b5ec1238f43df5632b1960 (diff)
tdf#115549 Enable handling background object.
Signed-off-by: Gülşah Köse <gulsah.kose@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/67215 Reviewed-by: Marco Cecchetti <mrcekets@gmail.com> Tested-by: Marco Cecchetti <mrcekets@gmail.com> (cherry picked from commit 6d7d1fe6cf205d34cc8889e503c727b19c513c94) Change-Id: Ibb9c01d83572259b812981aa6229e9aa9b7c60f3
Diffstat (limited to 'filter/source')
-rw-r--r--filter/source/svg/svgexport.cxx8
1 files changed, 3 insertions, 5 deletions
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 );
}