vcl/source/gdi/outdev3.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5f00be141d86e3eadddd554cd9d18ebe47d4d59b
Author: David Tardon <dtar...@redhat.com>
Date: Thu Jun 20 13:15:25 2013 +0200
Revert "fdo#65132 compute font height correctly"
Commit 22d23d52b0f65636df3a1cb8fada9bf7de77eb78 is the real fix.
This reverts commit 3a6513047409b8e8f6295152b33385ad8ef93681.
Change-Id: I36ac1f64000c3a805289141c2c6dca0de78454d3
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index ec55ff1..8338d9f 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -7082,7 +7082,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() );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
