summaryrefslogtreecommitdiff
path: root/oox/source/drawingml/textparagraph.cxx
diff options
context:
space:
mode:
authorRadek Doulik <rodo@novell.com>2011-08-17 13:12:52 +0200
committerRadek Doulik <rodo@novell.com>2011-08-17 13:14:54 +0200
commit83a0796604dedc039a3e65c02453b7de1429316d (patch)
tree6a9add54535f4f2ab2d766d3b2c731fa1d41309b /oox/source/drawingml/textparagraph.cxx
parentdee4142489bb287bb8d506d3549957dea46a72c0 (diff)
fix how table style is applied
- make sure it doesn't replace character properties of textbody inside cells - fixes bnc#705991
Diffstat (limited to 'oox/source/drawingml/textparagraph.cxx')
-rw-r--r--oox/source/drawingml/textparagraph.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/oox/source/drawingml/textparagraph.cxx b/oox/source/drawingml/textparagraph.cxx
index 1f198b7c711b..964932fd9c58 100644
--- a/oox/source/drawingml/textparagraph.cxx
+++ b/oox/source/drawingml/textparagraph.cxx
@@ -73,9 +73,10 @@ void TextParagraph::insertAt(
if ( rListStyle.size() )
pTextParagraphStyle = rListStyle[ nLevel ];
- TextCharacterProperties aTextCharacterStyle( rTextStyleProperties );
+ TextCharacterProperties aTextCharacterStyle;
if ( pTextParagraphStyle.get() )
aTextCharacterStyle.assignUsed( pTextParagraphStyle->getTextCharacterProperties() );
+ aTextCharacterStyle.assignUsed( rTextStyleProperties );
aTextCharacterStyle.assignUsed( maProperties.getTextCharacterProperties() );
if( !bFirst )