[Libreoffice-commits] core.git: vcl/inc vcl/win

[Khaled Hosny]

 vcl/inc/salglyphid.hxx    |    8 --------
 vcl/win/gdi/winlayout.cxx |    2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

New commits:
commit a7b9af59ea331cbc5495d2eb0f89ce6e6105ab09
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Thu Dec 8 06:21:23 2016 +0200

    GF_VERT is only used once, move it
    
    Change-Id: I15289eecfbfb29ee549470a7f752e0c7fd9f811e
    Reviewed-on: https://gerrit.libreoffice.org/31820
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Khaled Hosny <khaledhosny at eglug.org>

diff --git a/vcl/inc/salglyphid.hxx b/vcl/inc/salglyphid.hxx
index 6d5480e..8047d50 100644
--- a/vcl/inc/salglyphid.hxx
+++ b/vcl/inc/salglyphid.hxx
@@ -22,14 +22,6 @@
 typedef sal_uInt32 sal_GlyphId;
 
 // Glyph Flags
-#ifdef _WIN32
-// caution !!!
-#define GF_VERT     0x02000000
-// GF_VERT is only for windows implementation
-// (win/gdi/salgdi3.cxx, win/gdi/winlayout.cxx)
-// don't use this elsewhere !!!
-#endif
-
 #define GF_FONTMASK 0xF0000000
 #define GF_FONTSHIFT 28
 
diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index 708c931..d0d9615 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -296,7 +296,7 @@ bool ExTextOutRenderer::operator ()(SalLayout const &rLayout, HDC hDC,
         bGlyphs = true;
         WORD glyphWStr[] = { pGlyph->maGlyphId };
         if (pGlyph->IsVertical())
-            glyphWStr[0] |= GF_VERT;
+            glyphWStr[0] |= 0x02000000; // A (undocumented?) GDI flag for vertical glyphs
         ExtTextOutW(hDC, pPos->X(), pPos->Y(), ETO_GLYPH_INDEX, nullptr, LPCWSTR(&glyphWStr), 1, nullptr);
     }