[Libreoffice-commits] core.git: helpcontent2 vcl/source

[László Németh]

 helpcontent2                          |    2 +-
 vcl/source/glyphs/graphite_layout.cxx |   15 +++------------
 2 files changed, 4 insertions(+), 13 deletions(-)

New commits:
commit 58e1112a6a974b96bb8595e3ee9d08e915d4fd14
Author: László Németh <nemeth at numbertext.org>
Date:   Fri Sep 6 15:46:58 2013 +0200

    fdo#52540 fix Graphite hyphenation (ligat. + combining diac.)
    
    Change-Id: Idc3d9c40793f6f1c1b7883ca47f04ced36cabc48

diff --git a/helpcontent2 b/helpcontent2
index dddb2f3..0d8b37c 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit dddb2f331c390253ae76d0be4f621d50c3f3db67
+Subproject commit 0d8b37cd9e0b89d1136b09a81671c88fc91fee3e
diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx
index e61da7c..348c4e3 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -589,18 +589,9 @@ gr_segment * GraphiteLayout::CreateSegment(ImplLayoutArgs& rArgs)
                     nSegCharLimit - rArgs.mnEndCharPos, bRtl);
             }
         }
-        int numchars = gr_count_unicode_characters(gr_utf16, rArgs.mpStr + mnSegCharOffset,
-                rArgs.mpStr + (rArgs.mnLength > limit + 64 ? limit + 64 : rArgs.mnLength), NULL);
-        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
-        }
+//        int numchars = gr_count_unicode_characters(gr_utf16, rArgs.mpStr + mnSegCharOffset,
+//                rArgs.mpStr + (rArgs.mnLength > limit + 64 ? limit + 64 : rArgs.mnLength), NULL);
+          int numchars = rArgs.mnEndCharPos - mnSegCharOffset; // fdo#52540, fdo#68313, FIXME
         if (mpFeatures)
             pSegment = gr_make_seg(mpFont, mpFace, 0, mpFeatures->values(), gr_utf16,
                                         rArgs.mpStr + mnSegCharOffset, numchars, bRtl);