diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-07-24 13:11:33 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-08-25 19:39:01 +0200 |
| commit | c53e78209414619e456ab8e985b8e9fffdb44a1e (patch) | |
| tree | e11883425818ba7f294b7b9a05cb50551b617479 /canvas | |
| parent | 7deade09127367cc0345033062f689db92b08d19 (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/40368
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
(cherry picked from commit 72b66ad4505803caaf154cd224fb00e27b6b0156)
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 7ace9c75229b..678deb7369f2 100644 --- a/canvas/source/cairo/cairo_textlayout.cxx +++ b/canvas/source/cairo/cairo_textlayout.cxx @@ -168,7 +168,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 d179ba33a63d..e19a95fe10d4 100644 --- a/canvas/source/vcl/textlayout.cxx +++ b/canvas/source/vcl/textlayout.cxx @@ -246,7 +246,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() ) |