Kaydet (Commit) aaeafc32 authored tarafından Xisco Fauli's avatar Xisco Fauli

Fix again n719988, n734733

Bullet should have same color as following text by default
Regression from bb3540a7

Change-Id: I007088db5bcb71e8d90d287b21762dca0dda9573
üst aac0ada9
...@@ -110,13 +110,14 @@ void TextParagraph::insertAt( ...@@ -110,13 +110,14 @@ void TextParagraph::insertAt(
TextParagraphProperties aParaProp; TextParagraphProperties aParaProp;
aParaProp.apply( *pTextParagraphStyle ); aParaProp.apply( *pTextParagraphStyle );
aParaProp.apply( maProperties ); aParaProp.apply( maProperties );
aParaProp.pushToPropSet( &rFilterBase, xProps, aioBulletList, &pTextParagraphStyle->getBulletList(), sal_True, fCharacterSize, true );
fCharacterSize = pTextParagraphStyle->getCharHeightPoints( fCharacterSize ); fCharacterSize = pTextParagraphStyle->getCharHeightPoints( fCharacterSize );
// bullets have same color as following texts by default // bullets have same color as following texts by default
if( !aioBulletList.hasProperty( PROP_BulletColor ) && maRuns.size() > 0 if( !aioBulletList.hasProperty( PROP_BulletColor ) && maRuns.size() > 0
&& (*maRuns.begin())->getTextCharacterProperties().maCharColor.isUsed() ) && (*maRuns.begin())->getTextCharacterProperties().maCharColor.isUsed() )
aioBulletList[ PROP_BulletColor ] <<= (*maRuns.begin())->getTextCharacterProperties().maCharColor.getColor( rFilterBase.getGraphicHelper() ); 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 // empty paragraphs do not have bullets in ppt
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment