Skip to content

C
core
Kaydet (Commit) 4a8cf522 authored tarafından László Németh's avatar László Németh
Dosyalara gözat
Seçenekler

fdo#70666 avoid only bad Graphite ligature replacement 

Change-Id: Ibd42c70edbd8a5ca5eba34bcb92e801c8dc97ba0
üst b43ffeb8
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
vcl/source/glyphs/graphite_layout.cxx
Dosyayı görüntüle @ 4a8cf522
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment