diff options
author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-03-04 09:34:37 +0100 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-03-04 18:43:38 +0100 |
commit | f566585f0882e65778c424640b9312cb19b007b9 (patch) | |
tree | 4d04704fd40ab4178de529d8ab7795ce227f5b8a /oox/source/ppt | |
parent | f1659922a6e152f6a38ab13d7cb308b5728db16c (diff) |
remove the inheritance to std::map in PropertyMap
Change-Id: Iaaf5b7ab47ffa151cd7c8ea376763d02c883f377
Diffstat (limited to 'oox/source/ppt')
-rw-r--r-- | oox/source/ppt/pptshapecontext.cxx | 2 | ||||
-rw-r--r-- | oox/source/ppt/pptshapepropertiescontext.cxx | 2 | ||||
-rw-r--r-- | oox/source/ppt/slidefragmenthandler.cxx | 2 | ||||
-rw-r--r-- | oox/source/ppt/slidetransition.cxx | 14 | ||||
-rw-r--r-- | oox/source/ppt/soundactioncontext.cxx | 4 |
5 files changed, 12 insertions, 12 deletions
diff --git a/oox/source/ppt/pptshapecontext.cxx b/oox/source/ppt/pptshapecontext.cxx index f5a1e903a1af..2741e748679e 100644 --- a/oox/source/ppt/pptshapecontext.cxx +++ b/oox/source/ppt/pptshapecontext.cxx @@ -214,7 +214,7 @@ ContextHandlerRef PPTShapeContext::onCreateContext( sal_Int32 aElementToken, con case PPT_TOKEN( txBody ): { oox::drawingml::TextBodyPtr xTextBody( new oox::drawingml::TextBody( mpShapePtr->getTextBody() ) ); - xTextBody->getTextProperties().maPropertyMap[ PROP_FontIndependentLineSpacing ] <<= static_cast< sal_Bool >( sal_True ); + xTextBody->getTextProperties().maPropertyMap.setProperty( PROP_FontIndependentLineSpacing, static_cast< sal_Bool >( sal_True )); mpShapePtr->setTextBody( xTextBody ); return new oox::drawingml::TextBodyContext( *this, *xTextBody ); } diff --git a/oox/source/ppt/pptshapepropertiescontext.cxx b/oox/source/ppt/pptshapepropertiescontext.cxx index 1dcbda895111..77ba83c32f7c 100644 --- a/oox/source/ppt/pptshapepropertiescontext.cxx +++ b/oox/source/ppt/pptshapepropertiescontext.cxx @@ -54,7 +54,7 @@ ContextHandlerRef PPTShapePropertiesContext::onCreateContext( sal_Int32 aElement switch( aElementToken ) { case A_TOKEN( xfrm ): - mrShape.getShapeProperties()[ PROP_IsPlaceholderDependent ] <<= sal_False; + mrShape.getShapeProperties().setProperty( PROP_IsPlaceholderDependent, sal_False); return ShapePropertiesContext::onCreateContext( aElementToken, rAttribs ); default: diff --git a/oox/source/ppt/slidefragmenthandler.cxx b/oox/source/ppt/slidefragmenthandler.cxx index b2da1472bc51..d001422f2143 100644 --- a/oox/source/ppt/slidefragmenthandler.cxx +++ b/oox/source/ppt/slidefragmenthandler.cxx @@ -78,7 +78,7 @@ SlideFragmentHandler::~SlideFragmentHandler() throw() PropertyMap aPropMap; PropertySet aSlideProp( xSlide ); - aPropMap[ PROP_Visible ] = Any( rAttribs.getBool( XML_show, true ) ); + aPropMap.setProperty( PROP_Visible, rAttribs.getBool( XML_show, true )); aSlideProp.setProperties( aPropMap ); return this; diff --git a/oox/source/ppt/slidetransition.cxx b/oox/source/ppt/slidetransition.cxx index 7f060c02ede7..6033c6118f34 100644 --- a/oox/source/ppt/slidetransition.cxx +++ b/oox/source/ppt/slidetransition.cxx @@ -75,14 +75,14 @@ namespace oox { namespace ppt { { try { - aProps[ PROP_TransitionType ] <<= mnTransitionType; - aProps[ PROP_TransitionSubtype ] <<= mnTransitionSubType; - aProps[ PROP_TransitionDirection ] <<= mbTransitionDirectionNormal; - aProps[ PROP_Speed ] <<= mnAnimationSpeed; - aProps[ PROP_TransitionFadeColor ] <<= mnFadeColor; + aProps.setProperty( PROP_TransitionType, mnTransitionType); + aProps.setProperty( PROP_TransitionSubtype, mnTransitionSubType); + aProps.setProperty( PROP_TransitionDirection, mbTransitionDirectionNormal); + aProps.setProperty( PROP_Speed, mnAnimationSpeed); + aProps.setProperty( PROP_TransitionFadeColor, mnFadeColor); if( mnAdvanceTime != -1 ) { - aProps[ PROP_Duration ] <<= mnAdvanceTime/1000; - aProps[ PROP_Change ] <<= static_cast<sal_Int32>(1); + aProps.setProperty( PROP_Duration, mnAdvanceTime/1000); + aProps.setProperty( PROP_Change, static_cast<sal_Int32>(1)); } } catch( Exception& ) diff --git a/oox/source/ppt/soundactioncontext.cxx b/oox/source/ppt/soundactioncontext.cxx index 9ab2999f3519..a3104e15dfc4 100644 --- a/oox/source/ppt/soundactioncontext.cxx +++ b/oox/source/ppt/soundactioncontext.cxx @@ -64,8 +64,8 @@ namespace oox { namespace ppt { } if ( !url.isEmpty() ) { - maSlideProperties[ PROP_Sound ] <<= url; - maSlideProperties[ PROP_SoundOn ] <<= sal_True; + maSlideProperties.setProperty( PROP_Sound, url); + maSlideProperties.setProperty( PROP_SoundOn, sal_True); } } } |