[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - vcl/source

[Khaled Hosny (via logerrit)]

 vcl/source/gdi/CommonSalLayout.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 19825bfe38820b9abd5281c9f3ca60297693bae5
Author:     Khaled Hosny <kha...@libreoffice.org>
AuthorDate: Tue Jun 20 10:17:49 2023 +0300
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Jun 23 22:53:09 2023 +0200

    tdf#107718: Fix script itemization of vertical text
    
    Mixed script vertical text was not correctly splitting runs at script
    changes, resulting in Hangul text being mixed with Han text in the same
    run breaking the Hangul composition.
    
    Change-Id: I09c3f799bede6aa8a19684779d500504a9813af7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153313
    Tested-by: Jenkins
    Reviewed-by: خالد حسني <kha...@libreoffice.org>
    (cherry picked from commit 1afc13b0b84353109827d78807836c01f030ab66)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153335
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/vcl/source/gdi/CommonSalLayout.cxx 
b/vcl/source/gdi/CommonSalLayout.cxx
index 5cac0ebdb6b0..754b228f8ad3 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -391,7 +391,7 @@ bool 
GenericSalLayout::LayoutText(vcl::text::ImplLayoutArgs& rArgs, const SalLay
                             aDirection = bRightToLeft ? HB_DIRECTION_RTL : 
HB_DIRECTION_LTR;
                         }
 
-                        if (aSubRuns.empty() || aSubRuns.back().maDirection != 
aDirection)
+                        if (aSubRuns.empty() || aSubRuns.back().maDirection != 
aDirection || aSubRuns.back().maScript != aScript)
                             aSubRuns.push_back({ nPrevIdx, nIdx, aScript, 
aDirection });
                         else
                             aSubRuns.back().mnEnd = nIdx;