helpcontent2 | 2 +-
vcl/source/glyphs/graphite_layout.cxx | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit ac8df424f1ef09d78ae76f98fdbbf58c0dae24bd
Author: László Németh <nem...@numbertext.org>
Date: Fri Sep 6 11:20:09 2013 +0200
fdo#68313 fix combining diacritics problem with Graphite fonts
Change-Id: I042a32cc9c025efcd25ccf95427bee5d6d4024fb
diff --git a/helpcontent2 b/helpcontent2
index e15ec69..0d8b37c 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e15ec6915ca8837f68fc1b1133d6380f087f81c0
+Subproject commit 0d8b37cd9e0b89d1136b09a81671c88fc91fee3e
diff --git a/vcl/source/glyphs/graphite_layout.cxx
b/vcl/source/glyphs/graphite_layout.cxx
index 1190408..bbd7cc5 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -594,9 +594,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 (rArgs.mnMinCharPos + numchars > limit) numchars = limit -
rArgs.mnMinCharPos; // fdo#52540
+// 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);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
