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

Resolves: #i119555# fix FontWork font size when saving to *.doc file

Browse Source 
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
This commit is contained in:
Herbert Dürr
2012-06-11 13:22:05 +00:00
committed by Caolán McNamara
parent 348a5f8e80
commit 06064c69f9
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
filter/source/msfilter/escherex.cxx
View File

@@ -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 ) ) if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, OUString( "CharKerning" ), sal_True ) )
{ {
sal_Int16 nCharKerning = sal_Int16(); sal_Int16 nCharKerning = sal_Int16();
if ( aAny >>= nCharKerning ) if ( aAny >>= nCharKerning )
{ {
nTextPathFlags |= 0x10000000; nTextPathFlags |= 0x10000000;
if ( nCharKerning ) if ( nCharKerning )
nTextPathFlags |= 0x1000; nTextPathFlags |= 0x1000;