diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2017-02-12 11:08:59 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-03-14 14:50:12 +0000 |
| commit | ded07624096183ed310187f29d4692bb39b7d24a (patch) | |
| tree | 97cd5a53d45253defc9b3e45716b85014253c281 /vcl/source/outdev/text.cxx | |
| parent | d3b9b4e41e31ce276d2d7354602a586b300adee9 (diff) | |
tdf#105454: Stop ignoring font kerning setting
Make sure the default is for kerning to be enable, and honor the setting
to disable it.
This also updates the expectations for chart2_xshape tests for file that
had kerning disabled and was previously ignored.
Change-Id: Icf6bb75e71cae43868fba323ca3c61e4a3e81523
Reviewed-on: https://gerrit.libreoffice.org/34169
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'vcl/source/outdev/text.cxx')
| -rw-r--r-- | vcl/source/outdev/text.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index 7aa669f5ad37..ba946d3914fa 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -1179,8 +1179,8 @@ ImplLayoutArgs OutputDevice::ImplPrepareLayoutArgs( OUString& rStr, nLayoutFlags |= SalLayoutFlags::BiDiStrong; } - if( mbKerning ) - nLayoutFlags |= SalLayoutFlags::KerningPairs; + if( !maFont.IsKerning() ) + nLayoutFlags |= SalLayoutFlags::DisableKerning; if( maFont.GetKerning() & FontKerning::Asian ) nLayoutFlags |= SalLayoutFlags::KerningAsian; if( maFont.IsVertical() ) |