summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2013-06-12 11:33:41 +0200
committerDavid Tardon <dtardon@redhat.com>2013-06-12 12:32:12 +0200
commited31769088acc76eeed0f83b53227a429a5bf3a8 (patch)
tree66c99b66c2193ecd1fc42043809579ab3d5b5f85
parentCairo canvas fixes (diff)
downloadcore-ed31769088acc76eeed0f83b53227a429a5bf3a8.tar.gz
core-ed31769088acc76eeed0f83b53227a429a5bf3a8.zip
fdo#65132 compute font height correctly
Change-Id: I8da66b102a554c9d5d275ff46e40dd707199d4f4 (cherry picked from commit 3a6513047409b8e8f6295152b33385ad8ef93681) Signed-off-by: David Tardon <dtardon@redhat.com>
-rw-r--r--vcl/source/gdi/outdev3.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index d5d019a25606..cf37e01b1e0c 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -7084,7 +7084,7 @@ FontMetric OutputDevice::GetFontMetric() const
// set aMetric with info from font
aMetric.SetName( maFont.GetName() );
aMetric.SetStyleName( pMetric->GetStyleName() );
- aMetric.SetSize( PixelToLogic( Size( pMetric->mnWidth, pMetric->mnAscent+pMetric->mnDescent-pMetric->mnIntLeading ) ) );
+ aMetric.SetSize( PixelToLogic( Size( pMetric->mnWidth, pMetric->mnAscent+pMetric->mnDescent ) ) );
aMetric.SetCharSet( pMetric->IsSymbolFont() ? RTL_TEXTENCODING_SYMBOL : RTL_TEXTENCODING_UNICODE );
aMetric.SetFamily( pMetric->GetFamilyType() );
aMetric.SetPitch( pMetric->GetPitch() );