vcl/source/glyphs/graphite_layout.cxx | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 4a8cf5221f425118a7ec79e0cbf9cb0fb47bf823
Author: László Németh <nem...@numbertext.org>
Date: Wed Apr 9 12:10:15 2014 +0200
fdo#70666 avoid only bad Graphite ligature replacement
Change-Id: Ibd42c70edbd8a5ca5eba34bcb92e801c8dc97ba0
diff --git a/vcl/source/glyphs/graphite_layout.cxx
b/vcl/source/glyphs/graphite_layout.cxx
index 7983ae3..26c2ee0 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -593,12 +593,14 @@ gr_segment *
GraphiteLayout::CreateSegment(ImplLayoutArgs& rArgs)
}
}
+ size_t numchars = gr_count_unicode_characters(gr_utf16, rArgs.mpStr +
mnSegCharOffset,
+ rArgs.mpStr + (rArgs.mnLength > limit + 64 ? limit + 64 :
rArgs.mnLength), NULL);
static com::sun::star::uno::Reference<
com::sun::star::i18n::XCharacterClassification > xCharClass;
if ( !xCharClass.is() )
xCharClass = vcl::unohelper::CreateCharacterClassification();
- int numchars = rArgs.mnEndCharPos - mnSegCharOffset; // fdo#52540,
fdo#68313, fdo#70666 avoid bad ligature replacement
- if (xCharClass->getType(rArgs.mpStr, numchars + 1) !=
::com::sun::star::i18n::UnicodeType::LOWERCASE_LETTER)
- numchars += 64;
+ int 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)
+ numchars = numchars2;
if (mpFeatures)
pSegment = gr_make_seg(mpFont, mpFace, 0, mpFeatures->values(),
gr_utf16,
rArgs.mpStr + mnSegCharOffset,
numchars, bRtl);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
