From 753f5721970805224e8bdfc5b9fdb2611ba9aa34 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Sat, 25 May 2013 13:14:59 +0200 Subject: Fix fdo#64972 - strikethrough displays too high I was calculating the leading before setting the ascent and descent, oops. Change-Id: Ic58ecb1a65cb33715ea06f5e3214c4acbcff1e40 --- vcl/generic/glyphs/gcach_ftyp.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'vcl/generic/glyphs/gcach_ftyp.cxx') diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index 162ba1108eea..e34b38d3a73a 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -940,7 +940,6 @@ void ServerFont::FetchFontMetric( ImplFontMetricData& rTo, long& rFactor ) const rTo.mnDescent = 0; rTo.mnExtLeading = 0; rTo.mnSlant = 0; - rTo.mnIntLeading = (rTo.mnAscent + rTo.mnDescent) - ((maFaceFT->units_per_EM + 32) >> 6); rTo.mnWidth = mnWidth; // Calculating ascender and descender: @@ -994,6 +993,8 @@ void ServerFont::FetchFontMetric( ImplFontMetricData& rTo, long& rFactor ) const } } + rTo.mnIntLeading = (rTo.mnAscent + rTo.mnDescent) - ((maFaceFT->units_per_EM + 32) >> 6); + if( pOS2 && (pOS2->version != 0xFFFF) ) { // map the panose info from the OS2 table to their VCL counterparts -- cgit