summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorLászló Németh <nemeth@numbertext.org>2013-05-22 09:11:13 +0200
committerAndras Timar <andras.timar@collabora.com>2013-11-05 10:48:45 +0100
commitba25754bfbfe6ca60469266532b8e4d9375cdef2 (patch)
treec45c94259e544814183d1530c3ddbb22d4670ffd /vcl
parent9f93d2a9451d4d816b14dd5899f04e1752b5ad59 (diff)
fdo#52540 fix hyphenation of Graphite ligatures
Change-Id: I3c6aef6d845a7494d54b3c902654b21f3939e8cf Reviewed-on: https://gerrit.libreoffice.org/3999 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/glyphs/graphite_layout.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx
index 7b663bd87ee1..8a99bb49127c 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -596,6 +596,7 @@ 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);
+ if (rArgs.mnMinCharPos + numchars > limit) numchars = limit - rArgs.mnMinCharPos; // fdo#52540
if (mpFeatures)
pSegment = gr_make_seg(mpFont, mpFace, 0, mpFeatures->values(), gr_utf16,
rArgs.mpStr + mnSegCharOffset, numchars, bRtl);