diff options
| author | László Németh <laszlo.nemeth@collabora.com> | 2015-03-16 00:18:51 +0100 |
|---|---|---|
| committer | László Németh <laszlo.nemeth@collabora.com> | 2015-03-16 11:42:43 +0100 |
| commit | 5a48a0b52ec0d54a707753a80196f4d62923f0c5 (patch) | |
| tree | 9ec67e79206bc497ee1d7cf93b802c4ba5fc6810 /vcl | |
| parent | 90e12e00da614311620b36973aca5d5f4c78516e (diff) | |
fdo#52540, fdo#88051: fix Graphite layout
The previous fixes were incomplete solutions (see the new test
cases of the bug reports).
Change-Id: I928f09d94edf68d268de9046c16582e6f016d561
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/glyphs/graphite_layout.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx index d840e73530e6..43e34f1bcb7e 100644 --- a/vcl/source/glyphs/graphite_layout.cxx +++ b/vcl/source/glyphs/graphite_layout.cxx @@ -598,9 +598,12 @@ gr_segment * GraphiteLayout::CreateSegment(ImplLayoutArgs& rArgs) static com::sun::star::uno::Reference< com::sun::star::i18n::XCharacterClassification > xCharClass; 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 && (rArgs.mpStr[numchars2] == '\t' || xCharClass->getType(rArgs.mpStr, numchars2 + 1) == ::com::sun::star::i18n::UnicodeType::LOWERCASE_LETTER)) + size_t numchars2 = rArgs.mnEndCharPos - mnSegCharOffset; // fdo#52540, fdo#68313, fdo#70666 avoid bad ligature replacement, fdo#88051 layout problem + if (numchars > numchars2 && (rArgs.mpStr[mnSegCharOffset + numchars2] == '\t' || + xCharClass->getType(rArgs.mpStr + mnSegCharOffset, 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); |