[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - vcl/source

[László Németh]

 vcl/source/glyphs/graphite_layout.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e3e3a8e3f13d79814f6b0e8b6e4efc14b65971c9
Author: László Németh <laszlo.nemeth at collabora.com>
Date:   Tue Jan 27 10:15:05 2015 +0100

    tdf#88051 fix Graphite layout at Linux Libertine G ligature followed by tab
    
    Change-Id: Iecedb87f6329c1cddcaa4cd939b349924e58d256

diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx
index 230583b..50e2a2d 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -600,7 +600,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,