[Libreoffice-commits] core.git: vcl/unx

[Akash Jain]

 vcl/unx/generic/glyphs/gcach_layout.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ac47f00f57ceee1d759393321b87477fa094b111
Author: Akash Jain <akash96j at gmail.com>
Date:   Sat May 14 19:15:38 2016 +0530

    set aChar using iterateCodePoints
    
    aChar was being set using the operator [] which didn't return the
    whole character codepoint. This is a issue when the character is
    represented by a combination of more than one code unit
    
    Change-Id: Ie5174b955c5a9ca8f37058f84fd43a317b40c666
    Reviewed-on: https://gerrit.libreoffice.org/24992
    Reviewed-by: Khaled Hosny <khaledhosny at eglug.org>
    Tested-by: Khaled Hosny <khaledhosny at eglug.org>

diff --git a/vcl/unx/generic/glyphs/gcach_layout.cxx b/vcl/unx/generic/glyphs/gcach_layout.cxx
index f2afa9a..a80eb31 100644
--- a/vcl/unx/generic/glyphs/gcach_layout.cxx
+++ b/vcl/unx/generic/glyphs/gcach_layout.cxx
@@ -534,7 +534,7 @@ bool HbLayoutEngine::Layout(ServerFontLayout& rLayout, ImplLayoutArgs& rArgs)
                 // apply vertical flags and glyph substitution
                 // XXX: Use HB_DIRECTION_TTB above and apply whatever flags magic
                 // FixupGlyphIndex() is doing, minus the GSUB part.
-                sal_UCS4 aChar = rArgs.mrStr[nCharPos];
+                sal_UCS4 aChar = rArgs.mrStr.iterateCodePoints(&nCharPos, 0);
                 nGlyphIndex = rFont.FixupGlyphIndex(nGlyphIndex, aChar);
 
                 bool bInCluster = false;