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

[Herbert Dürr]

 filter/source/msfilter/escherex.cxx |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 06064c69f9e7fc2cbc9da98134ac0e44399d482d
Author: Herbert Dürr <hdu at apache.org>
Date:   Mon Jun 11 13:22:05 2012 +0000

    Resolves: #i119555# fix FontWork font size when saving to *.doc file
    
    Patch by: Zuojun Chen
    Found by: Lou Qingle
    Review by: hdu
    (cherry picked from commit fc17d3e1c60f18916786ddb4547a1c24d95ae51a)
    
    Conflicts:
    	filter/source/msfilter/escherex.cxx
    
    Change-Id: I7e77cd33cdc679d9671814e6ca52da50f32aecb0

diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 92e2fe3..e68b87e 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -3022,11 +3022,20 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
                                     }
                                 }
                             }
+                            if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, OUString( "CharHeight" ), sal_True ) )
+                            {
+                                float fCharHeight = 0.0;
+                                if ( aAny >>= fCharHeight )
+                                {
+                                    sal_Int32 nTextSize = static_cast< sal_Int32 > ( fCharHeight * 65536 );
+                                    AddOpt(ESCHER_Prop_gtextSize, nTextSize);
+                                }
+                            }
                             if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, OUString( "CharKerning" ), sal_True ) )
                             {
                                 sal_Int16 nCharKerning = sal_Int16();
                                 if ( aAny >>= nCharKerning )
-                            {
+                                {
                                     nTextPathFlags |= 0x10000000;
                                     if ( nCharKerning )
                                         nTextPathFlags |= 0x1000;