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

[Khaled Hosny]

 vcl/source/gdi/CommonSalLayout.cxx |   11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

New commits:
commit 4e59168ef004e7520ea7d78237a18208216a757c
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Fri Nov 4 23:39:38 2016 +0200

    tdf#103710: rotate all glyphs in vertical runs
    
    So that we base the rotation or not based on the resolved script,
    instead of using the outdated and hard-coded ranges in GetVerticalFlags.
    
    Change-Id: I52ee38c4151f30d98287e64f852b4d2df143c719

diff --git a/vcl/source/gdi/CommonSalLayout.cxx b/vcl/source/gdi/CommonSalLayout.cxx
index bcd8c78..a6cf739 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -545,16 +545,7 @@ bool CommonSalLayout::LayoutText(ImplLayoutArgs& rArgs)
                 DeviceCoordinate nAdvance, nXOffset, nYOffset;
                 if (bVertical)
                 {
-                    int nVertFlag;
-#if 0               /* XXX: does not work as expected for Common script */
-                    UErrorCode error = U_ZERO_ERROR;
-                    nVertFlag = GetVerticalFlagsForScript(uscript_getScript(aChar, &error));
-#else
-                    nVertFlag = GetVerticalFlags(aChar);
-                    if (nVertFlag == GF_ROTR)
-                        nVertFlag = GF_ROTL;
-#endif
-                    nGlyphIndex |= nVertFlag;
+                    nGlyphIndex |= GF_ROTL;
                     nAdvance = -pHbPositions[i].y_advance * nYScale;
                     nXOffset =  pHbPositions[i].y_offset * nYScale;
                     nYOffset = -pHbPositions[i].x_offset * nXScale;