[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/generic

[Petr Mladek]

 vcl/generic/glyphs/gcach_ftyp.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 1d34b905fad48b7aee7ccf39e33d952846f00fea
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Jun 4 12:09:55 2013 +0200

    Revert "Fix fdo#64972 - strikethrough displays too high"
    
    It made Impress almost unusable. See the comment #6 in the bug fdo#65132.
    
    This reverts commit 5e2d59e4b910631c802d5c7c42b7411e5a8b8db6.

diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index e34b38d..162ba11 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -940,6 +940,7 @@ 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:
@@ -993,8 +994,6 @@ 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