vcl/generic/glyphs/gcach_ftyp.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 5e2d59e4b910631c802d5c7c42b7411e5a8b8db6
Author: Khaled Hosny <khaledho...@eglug.org>
Date: Sat May 25 13:14:59 2013 +0200
Fix fdo#64972 - strikethrough displays too high
I was calculating the leading before setting the ascent and descent,
oops.
Change-Id: Ic58ecb1a65cb33715ea06f5e3214c4acbcff1e40
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx
b/vcl/generic/glyphs/gcach_ftyp.cxx
index 162ba11..e34b38d 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
