summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
Diffstat (limited to 'filter')
-rw-r--r--filter/source/svg/svgexport.cxx20
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 );
}
}