mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I4d0899c8f722150176cb3479bdb3b4a81c1b3eb8
This commit is contained in:
Felix Zhang 2013-06-21 09:55:07 +02:00 committed by Jan Holesovsky
parent 585410476f
commit 9fac61d21c
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
oox/source/drawingml/textparagraph.cxx
View File

@ -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 );
} }