diff options
| author | Xisco Fauli <anistenis@gmail.com> | 2013-04-08 23:37:32 +0200 |
|---|---|---|
| committer | Xisco Fauli <anistenis@gmail.com> | 2013-04-08 23:37:32 +0200 |
| commit | aaeafc323ef77995950dd7337ee35886dd45e543 (patch) | |
| tree | b16de3669a051f145c69fa83c2628526fa522bba /oox | |
| parent | aac0ada9914c87c8c1c017744548602374f80320 (diff) | |
Fix again n719988, n734733
Bullet should have same color as following text by default
Regression from bb3540a7cb6866a7b6c36cd71ea4bb9b0609d1e8
Change-Id: I007088db5bcb71e8d90d287b21762dca0dda9573
Diffstat (limited to 'oox')
| -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 bab0ecdac5ec..4679858f0bc4 100644 --- a/oox/source/drawingml/textparagraph.cxx +++ b/oox/source/drawingml/textparagraph.cxx @@ -110,13 +110,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 |