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

[Khaled Hosny]

 vcl/source/gdi/CommonSalLayout.cxx |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 281b3458940e06f9cb5f679537adc19532a0a80d
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Wed Nov 9 16:19:08 2016 +0200

    Allow the Kashida here
    
    Change-Id: Ibb408af7f989bf35faf13aa871917e7f4cb2aa6f

diff --git a/vcl/source/gdi/CommonSalLayout.cxx b/vcl/source/gdi/CommonSalLayout.cxx
index c6de183..b7e5578 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -751,14 +751,18 @@ bool CommonSalLayout::IsKashidaPosValid(int nCharPos) const
     {
         if (pIter->mnCharPos == nCharPos)
         {
+            // The position is the first glyphs, this would happen if we
+            // changed the text styling in the middle of a word. Since we don’t
+            // do ligatures accross layout engine instances, thid can’t be a
+            // ligature so it should be fine.
+            if (pIter == m_GlyphItems.begin())
+                return true;
+
             // If the character was not supported by this layout, return false
             // so that fallback layouts would be checked for it.
             if (pIter->maGlyphId == 0)
                 break;
 
-            if (pIter == m_GlyphItems.begin())
-                continue;
-
             // Search backwards for previous glyph belonging to a different
             // character. We are looking backwards because we are dealing with
             // RTL glyphs, which will be in visual order.