vcl/source/glyphs/graphite_layout.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit bb09c7c14bb1caf7b08b39944bda61382b158c64
Author: László Németh <nem...@numbertext.org>
Date: Fri Sep 6 11:08:02 2013 +0200
fdo#68313 fix combining diacritics problem with Graphite fonts
Change-Id: Ied29f864dc5fc21fc55aaa5ddd40b02b53a564f8
diff --git a/vcl/source/glyphs/graphite_layout.cxx
b/vcl/source/glyphs/graphite_layout.cxx
index 034842a..a9cb7cc 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -589,9 +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 (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
