mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#68313 fix combining diacritics problem with Graphite fonts

Browse Source 
Change-Id: Ied29f864dc5fc21fc55aaa5ddd40b02b53a564f8
This commit is contained in:
László Németh
2013-09-06 11:08:02 +02:00
parent 1bc2ecf3b8
commit 8fae91c67d
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
helpcontent2

Submodule helpcontent2 updated: 32c171278a...0d8b37cd9e

11
vcl/source/glyphs/graphite_layout.cxx
View File

@@ -591,7 +591,16 @@ gr_segment * GraphiteLayout::CreateSegment(ImplLayoutArgs& rArgs)
}
int numchars = gr_count_unicode_characters(gr_utf16, rArgs.mpStr + mnSegCharOffset,
rArgs.mpStr + (rArgs.mnLength > limit + 64 ? limit + 64 : rArgs.mnLength), NULL);
if (rArgs.mnMinCharPos + numchars > limit) numchars = limit - rArgs.mnMinCharPos; // fdo#52540
if (mnSegCharOffset + numchars > limit)
{
int combining_char = 0;
for (int i = mnSegCharOffset; i < numchars; i++) {
int ch = rArgs.mpStr[i];
if ((ch >= 0x300 && ch <= 0x36F) || (ch >= 0x1DC0 && ch <= 0x1DFF) ||
(ch >= 0x20D0 && ch <= 0x20F0) || (ch >= 0xFE20 && ch <= 0xFE26)) combining_char++;
}
numchars = limit - mnSegCharOffset + combining_char; // fdo#52540, fdo#68313
}
if (mpFeatures)
pSegment = gr_make_seg(mpFont, mpFace, 0, mpFeatures->values(), gr_utf16,
rArgs.mpStr + mnSegCharOffset, numchars, bRtl);