From 9fac61d21c886c3793b14628eb1de59d88bf45f8 Mon Sep 17 00:00:00 2001
From: Felix Zhang <fezhang@suse.com>
Date: Fri, 21 Jun 2013 09:55:07 +0200
Subject: bnc#593612: font size: override para prop with run prop

Change-Id: I4d0899c8f722150176cb3479bdb3b4a81c1b3eb8
---
 oox/source/drawingml/textparagraph.cxx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'oox/source/drawingml')

diff --git a/oox/source/drawingml/textparagraph.cxx b/oox/source/drawingml/textparagraph.cxx
index c4e82b31ff04..7bb719a1adf4 100644
--- a/oox/source/drawingml/textparagraph.cxx
+++ b/oox/source/drawingml/textparagraph.cxx
@@ -103,19 +103,18 @@ void TextParagraph::insertAt(
 
         PropertyMap aioBulletList;
         Reference< XPropertySet > xProps( xAt, UNO_QUERY);
-        float fCharacterSize = nCharHeight > 0 ? GetFontHeight( nCharHeight ) :  18;
         if ( pTextParagraphStyle.get() )
         {
             TextParagraphProperties aParaProp;
             aParaProp.apply( *pTextParagraphStyle );
             aParaProp.apply( maProperties );
-            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() );
 
+            float fCharacterSize = nCharHeight > 0 ? GetFontHeight ( nCharHeight ) : pTextParagraphStyle->getCharHeightPoints( 18 );
             aParaProp.pushToPropSet( &rFilterBase, xProps, aioBulletList, &pTextParagraphStyle->getBulletList(), sal_True, fCharacterSize, true );
         }
 
-- 
cgit