diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-07-24 13:11:33 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-07-24 15:32:05 +0200 |
| commit | 96773c0f3cb3104ae92e50c69be0361f02880bf7 (patch) | |
| tree | 1a1655313f0e07061c065b940d1bab93b088433d /canvas | |
| parent | 68d7faae7d748b6adcf8ba71a5b7ec9d80031c1b (diff) | |
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/40364
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/cairo/cairo_textlayout.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/vcl/textlayout.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx index e0e91053ac25..bb6b38d98765 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 b6fcd5ffd5ad..3b8621989421 100644 --- a/canvas/source/vcl/textlayout.cxx +++ b/canvas/source/vcl/textlayout.cxx @@ -239,7 +239,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() ) |