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

Khaled Hosny khaledhosny at eglug.org
Mon Apr 23 18:41:16 UTC 2018


 vcl/source/gdi/CommonSalLayout.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 26e83244a31048af4ee8e3b5857ccf1c060a99cf
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Mon Apr 23 18:24:32 2018 +0200

    Fix thinko
    
    This should be the end of the run we are currently shaping, not not the
    end of the whole text.
    
    Change-Id: Ie9e5f009eadccc50dd04d81c5a6bffaf8ae14524
    Reviewed-on: https://gerrit.libreoffice.org/53338
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Khaled Hosny <khaledhosny at eglug.org>

diff --git a/vcl/source/gdi/CommonSalLayout.cxx b/vcl/source/gdi/CommonSalLayout.cxx
index 5f27b744779d..7404984f4620 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -717,7 +717,7 @@ bool CommonSalLayout::LayoutText(ImplLayoutArgs& rArgs)
                             nNextCharPos = pHbGlyphInfos[j++].cluster;
 
                         if (nNextCharPos == nCharPos)
-                            nNextCharPos = rArgs.mnEndCharPos;
+                            nNextCharPos = nEndRunPos;
                         nCharCount = nNextCharPos - nCharPos;
                     }
                 }
@@ -740,7 +740,7 @@ bool CommonSalLayout::LayoutText(ImplLayoutArgs& rArgs)
                             nNextCharPos = pHbGlyphInfos[j--].cluster;
 
                         if (nNextCharPos == nCharPos)
-                            nNextCharPos = rArgs.mnEndCharPos;
+                            nNextCharPos = nEndRunPos;
                         nCharCount = nNextCharPos - nCharPos;
                     }
                 }


More information about the Libreoffice-commits mailing list