From 6d7d1fe6cf205d34cc8889e503c727b19c513c94 Mon Sep 17 00:00:00 2001 From: Gülşah Köse Date: Thu, 31 Jan 2019 16:48:22 +0300 Subject: tdf#115549 Enable handling background object. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ibb9c01d83572259b812981aa6229e9aa9b7c60f3 Signed-off-by: Gülşah Köse Reviewed-on: https://gerrit.libreoffice.org/67215 Reviewed-by: Marco Cecchetti Tested-by: Marco Cecchetti --- filter/source/svg/svgexport.cxx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'filter') diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 2058ede1242f..2a1ed5169493 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -2016,7 +2016,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? @@ -2031,13 +2030,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 implCreateObjectsFromShapes( xDrawPage, xDrawPage ); } } -- cgit