summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLászló Németh <laszlo.nemeth@collabora.com>2015-01-27 10:15:05 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-02-03 09:53:59 +0000
commitb4d399b8165b6307584860e97c503f3a8a621f06 (patch)
treed5ad098913f9ac230270b4e7497089d8d3515fb9
parent3b09ae20a3ed526cd80fe27be785e8bc9ff2ce5e (diff)
tdf#88051 fix Graphite layout at Linux Libertine G ligature followed by tab
Change-Id: Iecedb87f6329c1cddcaa4cd939b349924e58d256 Reviewed-on: https://gerrit.libreoffice.org/14200 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--vcl/source/glyphs/graphite_layout.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx
index 6f7cbb252ab0..f77ca7aee34f 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -591,7 +591,7 @@ gr_segment * GraphiteLayout::CreateSegment(ImplLayoutArgs& rArgs)
if ( !xCharClass.is() )
xCharClass = vcl::unohelper::CreateCharacterClassification();
size_t numchars2 = rArgs.mnEndCharPos - mnSegCharOffset; // fdo#52540, fdo#68313, fdo#70666 avoid bad ligature replacement
- if (numchars > numchars2 && xCharClass->getType(rArgs.mpStr, numchars2 + 1) == ::com::sun::star::i18n::UnicodeType::LOWERCASE_LETTER)
+ if (numchars > numchars2 && (rArgs.mpStr[numchars2] == '\t' || xCharClass->getType(rArgs.mpStr, numchars2 + 1) == ::com::sun::star::i18n::UnicodeType::LOWERCASE_LETTER))
numchars = numchars2;
if (mpFeatures)
pSegment = gr_make_seg(mpFont, mpFace, 0, mpFeatures->values(), gr_utf16,