[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - canvas/source

[Caolán McNamara]

 canvas/source/cairo/cairo_textlayout.cxx |    2 +-
 canvas/source/vcl/textlayout.cxx         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d1a9eff06245d40934b404eb36d6f0c5d3a57b8a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jul 24 13:11:33 2017 +0100

    cairo_canvas: shape clipping box doesn't match where its text is rendered
    
    since (I believe)
    
    commit 34d7602954d4483b3bc9db700e7df2c15348947a
    Date:   Wed Nov 9 15:22:43 2016 +0200
    
        tdf#55469 Consistent line spacing across platforms
    
    the point of that was to have the same line spacing on all platforms
    to fix the cairo text layout bounds to use the same algorithm as
    the generic text layout
    
    Change-Id: I26d3dec8354a9eac1423557f7d52a08f37c8843c
    Reviewed-on: https://gerrit.libreoffice.org/40365
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx
index 3b6356c6cd51..1c3a44ffe632 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -162,7 +162,7 @@ namespace cairocanvas
 
         setupLayoutMode( *pVDev.get(), mnTextDirection );
 
-        const sal_Int32 nAboveBaseline( -aMetric.GetInternalLeading() - aMetric.GetAscent() );
+        const sal_Int32 nAboveBaseline( -aMetric.GetAscent() );
         const sal_Int32 nBelowBaseline( aMetric.GetDescent() );
 
         if( maLogicalAdvancements.getLength() )
diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx
index 03f2fbaebd24..c5f3a9b0feb8 100644
--- a/canvas/source/vcl/textlayout.cxx
+++ b/canvas/source/vcl/textlayout.cxx
@@ -242,7 +242,7 @@ namespace vclcanvas
 
         setupLayoutMode( *pVDev.get(), mnTextDirection );
 
-        const sal_Int32 nAboveBaseline( /*-aMetric.GetIntLeading()*/ - aMetric.GetAscent() );
+        const sal_Int32 nAboveBaseline( -aMetric.GetAscent() );
         const sal_Int32 nBelowBaseline( aMetric.GetDescent() );
 
         if( maLogicalAdvancements.getLength() )