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

[Khaled Hosny]

 vcl/coretext/ctfonts.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit dba2eef1b364c11a52d4bcec6c60e4c21ab26854
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Sun Jun 30 02:33:01 2013 +0200

    fdo#66385: bad line spacing under Core Text
    
    We should be setting mnExtLeading not mnIntLeading, at least this is
    what ATSUI code was doing.
    
    Change-Id: Ibe69da4ea60630a31593b538f55fd2cd95642bf9
    Reviewed-on: https://gerrit.libreoffice.org/4638
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/vcl/coretext/ctfonts.cxx b/vcl/coretext/ctfonts.cxx
index 68f33f6..5d8c0e7 100644
--- a/vcl/coretext/ctfonts.cxx
+++ b/vcl/coretext/ctfonts.cxx
@@ -120,8 +120,8 @@ void CTTextStyle::GetFontMetric( float fPixelSize, ImplFontMetricData& rMetric )
 
     rMetric.mnAscent       = lrint( CTFontGetAscent( aCTFontRef ) * fPixelSize);
     rMetric.mnDescent      = lrint( CTFontGetDescent( aCTFontRef ) * fPixelSize);
-    rMetric.mnIntLeading   = lrint( CTFontGetLeading( aCTFontRef ) * fPixelSize);
-    rMetric.mnExtLeading   = 0;
+    rMetric.mnExtLeading   = lrint( CTFontGetLeading( aCTFontRef ) * fPixelSize);
+    rMetric.mnIntLeading   = 0;
     // since ImplFontMetricData::mnWidth is only used for stretching/squeezing fonts
     // setting this width to the pixel height of the fontsize is good enough
     // it also makes the calculation of the stretch factor simple