diff options
| author | Xisco Fauli <anistenis@gmail.com> | 2013-04-08 23:37:32 +0200 |
|---|---|---|
| committer | Xisco Fauli <anistenis@gmail.com> | 2013-04-10 00:24:46 +0200 |
| commit | 967ec79447aad739a2b861bb1bf784bf55b22d9d (patch) | |
| tree | 104d1284ac8b7de3a80e743b0d44a2f1bc50607e | |
| parent | d947b1f1ad3571c90991420d500eb81e7cd84fed (diff) | |
Fix again n719988, n734733
Bullet should have same color as following text by default
Regression from bb3540a7cb6866a7b6c36cd71ea4bb9b0609d1e8
Change-Id: I007088db5bcb71e8d90d287b21762dca0dda9573
| -rw-r--r-- | oox/source/drawingml/textparagraph.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/oox/source/drawingml/textparagraph.cxx b/oox/source/drawingml/textparagraph.cxx index 1119652fb155..3256f3b8c7f7 100644 --- a/oox/source/drawingml/textparagraph.cxx +++ b/oox/source/drawingml/textparagraph.cxx @@ -111,13 +111,14 @@ void TextParagraph::insertAt( TextParagraphProperties aParaProp; aParaProp.apply( *pTextParagraphStyle ); aParaProp.apply( maProperties ); - aParaProp.pushToPropSet( &rFilterBase, xProps, aioBulletList, &pTextParagraphStyle->getBulletList(), sal_True, fCharacterSize, true ); fCharacterSize = pTextParagraphStyle->getCharHeightPoints( fCharacterSize ); // bullets have same color as following texts by default if( !aioBulletList.hasProperty( PROP_BulletColor ) && maRuns.size() > 0 && (*maRuns.begin())->getTextCharacterProperties().maCharColor.isUsed() ) aioBulletList[ PROP_BulletColor ] <<= (*maRuns.begin())->getTextCharacterProperties().maCharColor.getColor( rFilterBase.getGraphicHelper() ); + + aParaProp.pushToPropSet( &rFilterBase, xProps, aioBulletList, &pTextParagraphStyle->getBulletList(), sal_True, fCharacterSize, true ); } // empty paragraphs do not have bullets in ppt |