summaryrefslogtreecommitdiff
path: root/vcl/source/glyphs/graphite_layout.cxx
diff options
context:
space:
mode:
authorLászló Németh <nemeth@numbertext.org>2013-05-22 09:11:13 +0200
committerFridrich Strba <fridrich@documentfoundation.org>2013-05-22 08:03:39 +0000
commit4233b2d5c13887f4b8e68fb59a54aa2b09c9a66b (patch)
treec5ffaff161954575340bd668c2ab64cdb2a8f02b /vcl/source/glyphs/graphite_layout.cxx
parentda3c2dc8cb1e9d0bce1cc773dda5e1baba08e00d (diff)
fdo#52540 fix hyphenation of Graphite ligatures
Change-Id: I3c6aef6d845a7494d54b3c902654b21f3939e8cf Reviewed-on: https://gerrit.libreoffice.org/4000 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'vcl/source/glyphs/graphite_layout.cxx')
-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 8b19c31eeec7..72e48c96fc34 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -591,6 +591,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);