You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
30 lines
1.3 KiB
30 lines
1.3 KiB
From ed31769088acc76eeed0f83b53227a429a5bf3a8 Mon Sep 17 00:00:00 2001
|
|
From: David Tardon <dtardon@redhat.com>
|
|
Date: Wed, 12 Jun 2013 11:33:41 +0200
|
|
Subject: [PATCH 1/2] fdo#65132 compute font height correctly
|
|
|
|
Change-Id: I8da66b102a554c9d5d275ff46e40dd707199d4f4
|
|
(cherry picked from commit 3a6513047409b8e8f6295152b33385ad8ef93681)
|
|
|
|
Signed-off-by: David Tardon <dtardon@redhat.com>
|
|
---
|
|
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 d5d019a..cf37e01 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() );
|
|
--
|
|
1.8.2.1
|
|
|