From 967ec79447aad739a2b861bb1bf784bf55b22d9d Mon Sep 17 00:00:00 2001 From: Xisco Fauli Date: Mon, 8 Apr 2013 23:37:32 +0200 Subject: Fix again n719988, n734733 Bullet should have same color as following text by default Regression from bb3540a7cb6866a7b6c36cd71ea4bb9b0609d1e8 Change-Id: I007088db5bcb71e8d90d287b21762dca0dda9573 --- oox/source/drawingml/textparagraph.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'oox') 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 -- cgit