diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-04-18 13:30:58 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-04-18 13:30:58 +0000 |
| commit | e4253459aa4f95eccba3b8855124faba0e14aaec (patch) | |
| tree | 4b50cbf486683c8b61e8f6811d2026e675272033 /oox/source | |
| parent | 82e119cef1a3811753717102b8d4bc3dac2afacc (diff) | |
INTEGRATION: CWS xmlfilter04 (1.2.12); FILE MERGED
2008/02/27 14:40:59 dr 1.2.12.2: add setters to Color class, add gamma to a:scrgbClr
2008/02/21 12:42:05 hbrinkm 1.2.12.1: joined changes from xmlfilter03
Diffstat (limited to 'oox/source')
| -rw-r--r-- | oox/source/ppt/slidepersist.cxx | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/oox/source/ppt/slidepersist.cxx b/oox/source/ppt/slidepersist.cxx index be19cb7eb1ea..f80f3a013f3f 100644 --- a/oox/source/ppt/slidepersist.cxx +++ b/oox/source/ppt/slidepersist.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: slidepersist.cxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.5 $ * * This file is part of OpenOffice.org. * @@ -28,7 +28,7 @@ * ************************************************************************/ -#include <boost/bind.hpp> +#include "oox/helper/propertyset.hxx" #include "oox/ppt/timenode.hxx" #include "oox/ppt/pptshape.hxx" #include "oox/ppt/slidepersist.hxx" @@ -193,18 +193,10 @@ void setTextStyle( Reference< beans::XPropertySet >& rxPropSet, // no properties. return return; } - PropertyMap& rParagraphProperties( pTextParagraphPropertiesPtr->getTextParagraphPropertyMap() ); - PropertyMap& rCharacterProperties( pTextCharacterPropertiesPtr->getTextCharacterPropertyMap() ); - int i; - Sequence< rtl::OUString > aNames; - Sequence< Any > aValues; - rParagraphProperties.makeSequence( aNames, aValues ); - for( i = 0; i < aNames.getLength(); i++ ) - rxPropSet->setPropertyValue( aNames[ i ], aValues[ i ] ); - rCharacterProperties.makeSequence( aNames, aValues ); - for( i = 0; i < aNames.getLength(); i++ ) - rxPropSet->setPropertyValue( aNames[ i ], aValues[ i ] ); + PropertySet aPropSet( rxPropSet ); + aPropSet.setProperties( pTextParagraphPropertiesPtr->getTextParagraphPropertyMap() ); + aPropSet.setProperties( pTextCharacterPropertiesPtr->getTextCharacterPropertyMap() ); } void SlidePersist::applyTextStyles( const oox::core::XmlFilterBase& rFilterBase ) |