diff options
| author | Herbert Dürr <hdu@apache.org> | 2012-06-11 13:22:05 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-04-04 16:29:56 +0100 |
| commit | 06064c69f9e7fc2cbc9da98134ac0e44399d482d (patch) | |
| tree | 7c2d655c5a0494210e8fd0f9f7f86272f0a1e770 /filter | |
| parent | 348a5f8e80cba72d6a6aa13f001a16d9a62b70aa (diff) | |
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
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/escherex.cxx | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 92e2fe3ba8f4..e68b87e37a86 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; |