Skip to content

C
core
Kaydet (Commit) 9fac61d2 authored tarafından Felix Zhang's avatar Felix Zhang Kaydeden (comit) Jan Holesovsky
Dosyalara gözat
Seçenekler

bnc#593612: font size: override para prop with run prop 

Change-Id: I4d0899c8f722150176cb3479bdb3b4a81c1b3eb8
üst 58541047
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
oox/source/drawingml/textparagraph.cxx
Dosyayı görüntüle @ 9fac61d2
...@@ -103,19 +103,18 @@ void TextParagraph::insertAt( ...@@ -103,19 +103,18 @@ void TextParagraph::insertAt(
PropertyMap aioBulletList; PropertyMap aioBulletList;
Reference< XPropertySet > xProps( xAt, UNO_QUERY); Reference< XPropertySet > xProps( xAt, UNO_QUERY);
float fCharacterSize = nCharHeight > 0 ? GetFontHeight( nCharHeight ) : 18;
if ( pTextParagraphStyle.get() ) if ( pTextParagraphStyle.get() )
{ {
TextParagraphProperties aParaProp; TextParagraphProperties aParaProp;
aParaProp.apply( *pTextParagraphStyle ); aParaProp.apply( *pTextParagraphStyle );
aParaProp.apply( maProperties ); aParaProp.apply( maProperties );
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() );
float fCharacterSize = nCharHeight > 0 ? GetFontHeight ( nCharHeight ) : pTextParagraphStyle->getCharHeightPoints( 18 );
aParaProp.pushToPropSet( &rFilterBase, xProps, aioBulletList, &pTextParagraphStyle->getBulletList(), sal_True, fCharacterSize, true ); aParaProp.pushToPropSet( &rFilterBase, xProps, aioBulletList, &pTextParagraphStyle->getBulletList(), sal_True, fCharacterSize, true );
} }
......
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