[Libreoffice-commits] core.git: oox/source

[Muthu Subramanian]

 oox/source/drawingml/shape.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 1a4cba3fc9c991cceb88028c562d99be22caf407
Author: Muthu Subramanian <sumuthu at suse.com>
Date:   Thu Aug 15 17:41:26 2013 +0530

    n#831457: Placeholders text size is not correct.
    
    Placeholders (or shapes without text imported from
    the files) have wrong font size. This is because the
    size (and probably other text attributes) aren't applied from
    the mastertextlist to the shape itself.

diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 64a7ab5..2e65b27 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -545,6 +545,9 @@ Reference< XShape > Shape::createAndInsert(
         {
             mpTextBody->getTextProperties().pushRotationAdjustments( mnRotation );
             aShapeProps.assignUsed( mpTextBody->getTextProperties().maPropertyMap );
+            // Push char properties as well - specifically useful when this is a placeholder
+            if( mpMasterTextListStyle &&  mpMasterTextListStyle->getListStyle()[0]->getTextCharacterProperties().moHeight.has() )
+                aShapeProps[ PROP_CharHeight ] <<= GetFontHeight( mpMasterTextListStyle->getListStyle()[0]->getTextCharacterProperties().moHeight.get() );
         }
 
         // applying properties