Author: steve_y
Date: Fri Apr 25 08:19:47 2014
New Revision: 1589951
URL: http://svn.apache.org/r1589951
Log:
https://issues.apache.org/ooo/show_bug.cgi?id=116796
Added "IsBackgroundObjectsVisible" property support for sd OOXML importing
Modified:
openoffice/trunk/main/oox/source/ppt/slidefragmenthandler.cxx
openoffice/trunk/main/oox/source/token/properties.txt
Modified: openoffice/trunk/main/oox/source/ppt/slidefragmenthandler.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/oox/source/ppt/slidefragmenthandler.cxx?rev=1589951&r1=1589950&r2=1589951&view=diff
==============================================================================
--- openoffice/trunk/main/oox/source/ppt/slidefragmenthandler.cxx (original)
+++ openoffice/trunk/main/oox/source/ppt/slidefragmenthandler.cxx Fri Apr 25
08:19:47 2014
@@ -77,19 +77,32 @@ Reference< XFastContextHandler > SlideFr
switch( aElementToken )
{
- case PPT_TOKEN( sldMaster ): // CT_SlideMaster
- case PPT_TOKEN( handoutMaster ): // CT_HandoutMaster
- case PPT_TOKEN( sld ): // CT_CommonSlideData
+ case PPT_TOKEN( sld ): // CT_Slide
{
- AttributeList attribs( xAttribs );
-
- Reference< XDrawPage > xSlide( mpSlidePersistPtr->getPage() );
- PropertyMap aPropMap;
- PropertySet aSlideProp( xSlide );
+ OptValue< bool > aShowMasterSp = aAttribs.getBool(
XML_showMasterSp );
+ if( aShowMasterSp.has() && !aShowMasterSp.get() )
+ {
+ PropertyMap aPropMap;
+ aPropMap[ PROP_IsBackgroundObjectsVisible ] = Any(
false );
- aPropMap[ PROP_Visible ] = Any( attribs.getBool( XML_show, sal_True
) );
- aSlideProp.setProperties( aPropMap );
+ Reference< XDrawPage > xSlide(
mpSlidePersistPtr->getPage() );
+ PropertySet aSlideProp( xSlide );
+ aSlideProp.setProperties( aPropMap );
+ }
+ }
+ case PPT_TOKEN( sldMaster ): // CT_SlideMaster
+ case PPT_TOKEN( handoutMaster ): // CT_HandoutMaster
+ {
+ OptValue< bool > aShow = aAttribs.getBool( XML_show );
+ if( aShow.has() && !aShow.get() )
+ {
+ PropertyMap aPropMap;
+ aPropMap[ PROP_Visible ] = Any( false );
+ Reference< XDrawPage > xSlide(
mpSlidePersistPtr->getPage() );
+ PropertySet aSlideProp( xSlide );
+ aSlideProp.setProperties( aPropMap );
+ }
break;
}
case PPT_TOKEN( notes ): // CT_NotesSlide
Modified: openoffice/trunk/main/oox/source/token/properties.txt
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/oox/source/token/properties.txt?rev=1589951&r1=1589950&r2=1589951&view=diff
==============================================================================
--- openoffice/trunk/main/oox/source/token/properties.txt (original)
+++ openoffice/trunk/main/oox/source/token/properties.txt Fri Apr 25 08:19:47
2014
@@ -221,6 +221,7 @@ InputMessage
InputTitle
IsActive
IsAdjustHeightEnabled
+IsBackgroundObjectsVisible
IsCaseSensitive
IsCellBackgroundTransparent
IsChangeReadOnlyEnabled
