diff options
| author | Gülşah Köse <gulsah.kose@collabora.com> | 2019-01-31 16:48:22 +0300 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2019-09-18 12:35:41 +0200 |
| commit | 78d1f37b09eb94b8bb59bc5ccc6c237a440d4d69 (patch) | |
| tree | b331924289bf10e7bcd41a225a6d9b2b30adad1d /filter | |
| parent | 6d166595c370fb221a286d1ee98ebc3081127cf5 (diff) | |
tdf#115549 Enable handling background object.
Change-Id: Ibb9c01d83572259b812981aa6229e9aa9b7c60f3
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>
Reviewed-on: https://gerrit.libreoffice.org/78382
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/svg/svgexport.cxx | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 9f09e984733a..d27125a26ae4 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -2037,7 +2037,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? @@ -2047,18 +2046,21 @@ 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; - sal_Bool assigned = ( xBackground->getPropertyValue( "FillStyle" ) >>= aFillStyle ); - if( assigned && aFillStyle != drawing::FillStyle_NONE ) + 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 ); + } } } -#endif implCreateObjectsFromShapes( xDrawPage, xDrawPage ); } } |