[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - vcl/source

[László Németh]

 vcl/source/glyphs/graphite_layout.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7d1e6cb0564a1eb886fd8f95adbcc7d8b9aa028f
Author: László Németh <nemeth at numbertext.org>
Date:   Wed May 22 09:11:13 2013 +0200

    fdo#52540 fix hyphenation of Graphite ligatures
    
    Change-Id: I3c6aef6d845a7494d54b3c902654b21f3939e8cf
    Reviewed-on: https://gerrit.libreoffice.org/3999
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx
index 7b663bd..8a99bb4 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);