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

[Chris Sherlock]

 vcl/inc/salglyphid.hxx             |    4 ++++
 vcl/unx/generic/print/text_gfx.cxx |    4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit c43fdd74097cb12f69f86fd1217dd2f41ccae101
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Tue Jan 26 10:38:22 2016 +1100

    vcl: GF_VERT is *only* for Windows implementations
    
    Change-Id: I4f0a6264a6c6c2533a32de358216601495c959f2

diff --git a/vcl/inc/salglyphid.hxx b/vcl/inc/salglyphid.hxx
index 055bd73..4c26b15 100644
--- a/vcl/inc/salglyphid.hxx
+++ b/vcl/inc/salglyphid.hxx
@@ -28,11 +28,15 @@ typedef sal_uInt32 sal_GlyphId;
 #define GF_IDXMASK  ~GF_FLAGMASK
 #define GF_ISCHAR   0x00800000
 #define GF_ROTL     0x01000000
+
+#ifdef WINNT
 // 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_ROTR     0x03000000
 #define GF_ROTMASK  0x03000000
 #define GF_UNHINTED 0x04000000
diff --git a/vcl/unx/generic/print/text_gfx.cxx b/vcl/unx/generic/print/text_gfx.cxx
index d7a5995..1c90fda 100644
--- a/vcl/unx/generic/print/text_gfx.cxx
+++ b/vcl/unx/generic/print/text_gfx.cxx
@@ -243,10 +243,6 @@ void PrinterGfx::DrawGlyphs(
                         nRotAngle = 2700;
                         aRotPoint = Point( -nAscend*nTextWidth/nTextHeight, -nDescend*nTextWidth/nTextHeight - nOffset );
                         break;
-                    case GF_VERT:
-                        nRotAngle = 1800;
-                        aRotPoint = Point( -nOffset, (nAscend+nDescend) );
-                        break;
                     case GF_ROTL:
                         nRotAngle = 900;
                         aRotPoint = Point( -nDescend*nTextWidth/nTextHeight, nOffset + nAscend*nTextWidth/nTextHeight );