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

Revert "fdo#65132 compute font height correctly"

Browse Source 
Commit 22d23d52b0 is the real fix.

This reverts commit 3a65130474.

Change-Id: I36ac1f64000c3a805289141c2c6dca0de78454d3
This commit is contained in:
David Tardon
2013-06-20 13:15:25 +02:00
parent 647ad63f9f
commit 5f00be141d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vcl/source/gdi/outdev3.cxx
View File

@@ -7082,7 +7082,7 @@ FontMetric OutputDevice::GetFontMetric() const
// set aMetric with info from font // set aMetric with info from font
aMetric.SetName( maFont.GetName() ); aMetric.SetName( maFont.GetName() );
aMetric.SetStyleName( pMetric->GetStyleName() ); aMetric.SetStyleName( pMetric->GetStyleName() );
aMetric.SetSize( PixelToLogic( Size( pMetric->mnWidth, pMetric->mnAscent+pMetric->mnDescent ) ) ); aMetric.SetSize( PixelToLogic( Size( pMetric->mnWidth, pMetric->mnAscent+pMetric->mnDescent-pMetric->mnIntLeading ) ) );
aMetric.SetCharSet( pMetric->IsSymbolFont() ? RTL_TEXTENCODING_SYMBOL : RTL_TEXTENCODING_UNICODE ); aMetric.SetCharSet( pMetric->IsSymbolFont() ? RTL_TEXTENCODING_SYMBOL : RTL_TEXTENCODING_UNICODE );
aMetric.SetFamily( pMetric->GetFamilyType() ); aMetric.SetFamily( pMetric->GetFamilyType() );
aMetric.SetPitch( pMetric->GetPitch() ); aMetric.SetPitch( pMetric->GetPitch() );