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

[Khaled Hosny]

 vcl/inc/salglyphid.hxx       |    5 -----
 vcl/source/gdi/sallayout.cxx |    6 ++++++
 2 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit ae0a317c20110ade8b9eaef3ecbd2c5781303649
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Sat Jan 21 03:00:19 2017 +0200

    Move these defines to the only file using them
    
    Change-Id: Ic3a32f6b420c3822ba96f57292f67f0327b16581

diff --git a/vcl/inc/salglyphid.hxx b/vcl/inc/salglyphid.hxx
index 8047d50..6f9550e 100644
--- a/vcl/inc/salglyphid.hxx
+++ b/vcl/inc/salglyphid.hxx
@@ -21,11 +21,6 @@
 
 typedef sal_uInt32 sal_GlyphId;
 
-// Glyph Flags
-#define GF_FONTMASK 0xF0000000
-#define GF_FONTSHIFT 28
-
-#define GF_DROPPED  0xFFFFFFFF
 
 #endif // INCLUDED_VCL_INC_SALGLYPHID_HXX
 
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 3f77bbc..a3b54e2 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -51,6 +51,12 @@
 #include <algorithm>
 #include <memory>
 
+// Glyph Flags
+#define GF_FONTMASK  0xF0000000
+#define GF_FONTSHIFT 28
+#define GF_DROPPED   0xFFFFFFFF
+
+
 std::ostream &operator <<(std::ostream& s, ImplLayoutArgs &rArgs)
 {
 #ifndef SAL_LOG_INFO