From 0a66aac248d69d7fc47f669b5757a52e0f06e38d Mon Sep 17 00:00:00 2001 From: David Tardon Date: Thu, 20 Jun 2013 13:15:25 +0200 Subject: Revert "fdo#65132 compute font height correctly" Commit 22d23d52b0f65636df3a1cb8fada9bf7de77eb78 is the real fix. This reverts commit 3a6513047409b8e8f6295152b33385ad8ef93681. (cherry picked from commit 5f00be141d86e3eadddd554cd9d18ebe47d4d59b) Change-Id: I36ac1f64000c3a805289141c2c6dca0de78454d3 Signed-off-by: David Tardon Reviewed-on: https://gerrit.libreoffice.org/4395 Reviewed-by: Noel Power Tested-by: Noel Power --- vcl/source/gdi/outdev3.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index cf37e01b1e0c..d5d019a25606 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 ) ) ); + aMetric.SetSize( PixelToLogic( Size( pMetric->mnWidth, pMetric->mnAscent+pMetric->mnDescent-pMetric->mnIntLeading ) ) ); aMetric.SetCharSet( pMetric->IsSymbolFont() ? RTL_TEXTENCODING_SYMBOL : RTL_TEXTENCODING_UNICODE ); aMetric.SetFamily( pMetric->GetFamilyType() ); aMetric.SetPitch( pMetric->GetPitch() ); -- cgit v1.2.3