diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-07-24 13:11:33 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-08-10 16:06:40 +0200 |
| commit | d1a9eff06245d40934b404eb36d6f0c5d3a57b8a (patch) | |
| tree | d72a197c174b261203d3d449adef538e7d3c82bd /canvas | |
| parent | 93887dc0ecd805754b106a8e2e6fa90d315d2491 (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/40365
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
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 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() ) |