diff options
| author | Muthu Subramanian <sumuthu@suse.com> | 2012-01-24 13:03:11 +0530 |
|---|---|---|
| committer | Muthu Subramanian <sumuthu@suse.com> | 2012-01-24 13:03:11 +0530 |
| commit | 5fb4b78559a44133673a49a028c691fa474aee75 (patch) | |
| tree | 15953d291d66842838cae070efe6e3cbbc78d14d /oox/source/drawingml/textparagraphproperties.cxx | |
| parent | a21c7f835bd7034614fa8ac606fd60a0cbeef1ec (diff) | |
n719734: Overridding properties from master/layout.
When there are conflicting properties in masterslide->layout->slide
most recent (i.e. e.g. slide has higher priority than layout)
should be used.
Diffstat (limited to 'oox/source/drawingml/textparagraphproperties.cxx')
| -rw-r--r-- | oox/source/drawingml/textparagraphproperties.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx index eeb8409b8e43..ff6e972dfa1f 100644 --- a/oox/source/drawingml/textparagraphproperties.cxx +++ b/oox/source/drawingml/textparagraphproperties.cxx @@ -376,7 +376,7 @@ TextParagraphProperties::~TextParagraphProperties() void TextParagraphProperties::apply( const TextParagraphProperties& rSourceProps ) { - maTextParagraphPropertyMap.insert( rSourceProps.maTextParagraphPropertyMap.begin(), rSourceProps.maTextParagraphPropertyMap.end() ); + maTextParagraphPropertyMap.assignAll( rSourceProps.maTextParagraphPropertyMap ); maBulletList.apply( rSourceProps.maBulletList ); maTextCharacterProperties.assignUsed( rSourceProps.maTextCharacterProperties ); if ( rSourceProps.maParaTopMargin.bHasValue ) |