use consistent #define checks for the Windows platform

stage 2 of replacing usage of various checks for the windows platform
with the compiler-defined '_WIN32' macro

In this stage we focus on replacing usage of the WIN macro

Change-Id: Ie8a4a63198a6de96bd158ecd707dadafb9c8ea84
Reviewed-on: https://gerrit.libreoffice.org/22393
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

6 files changed, 7 insertions, 7 deletions

diff --git a/vcl/inc/fontselect.hxx b/vcl/inc/fontselect.hxx
index e8b19b408f53..57f1815c3ee2 100644
--- a/vcl/inc/fontselect.hxx
+++ b/vcl/inc/fontselect.hxx
@@ -37,7 +37,7 @@ class FontSelectPatternAttributes : public FontAttributes
 public:
                     FontSelectPatternAttributes( const vcl::Font&, const OUString& rSearchName,
                                                  const Size&, float fExactHeight );
-#ifdef WNT
+#ifdef _WIN32
                     FontSelectPatternAttributes( const PhysicalFontFace&, const Size&,
                                                  float fExactHeight, int nOrientation, bool bVertical );
 #endif
@@ -70,7 +70,7 @@ class FontSelectPattern : public FontSelectPatternAttributes
 public:
                     FontSelectPattern( const vcl::Font&, const OUString& rSearchName,
                                        const Size&, float fExactHeight );
-#ifdef WNT
+#ifdef _WIN32
 // ifdeffed to prevent it going into unusedcode.easy
                     FontSelectPattern( const PhysicalFontFace&, const Size&,
                                        float fExactHeight, int nOrientation, bool bVertical );
diff --git a/vcl/inc/graphite_layout.hxx b/vcl/inc/graphite_layout.hxx
index ff258bff3a1d..a3076f4c8b9b 100644
--- a/vcl/inc/graphite_layout.hxx
+++ b/vcl/inc/graphite_layout.hxx
@@ -135,7 +135,7 @@ public:
 
     virtual ~GraphiteLayout() throw();
     void SetFont(gr_font * pFont) { mpFont = pFont; }
-#ifdef WNT
+#ifdef _WIN32
     gr_font * GetFont() { return mpFont; }
     void SetFontScale(float s) { mfScaling = s; };
 #endif
diff --git a/vcl/inc/graphite_static.hxx b/vcl/inc/graphite_static.hxx
index f57bd85a9878..c13333150a56 100644
--- a/vcl/inc/graphite_static.hxx
+++ b/vcl/inc/graphite_static.hxx
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_VCL_INC_GRAPHITE_STATIC_HXX
 #define INCLUDED_VCL_INC_GRAPHITE_STATIC_HXX
 
-#ifdef WNT
+#ifdef _WIN32
 #  ifndef GRAPHITE2_STATIC
 #    define GRAPHITE2_STATIC 1
 #  endif
diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx
index c7f6630bb993..e4daced652ee 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.hxx
@@ -472,7 +472,7 @@ namespace vcl
  */
     int VCL_DLLPUBLIC MapString(TrueTypeFont *ttf, sal_uInt16 *str, int nchars, sal_uInt16 *glyphArray, bool bvertical);
 
-#if defined(WNT) || defined(MACOSX) || defined(IOS)
+#if defined(_WIN32) || defined(MACOSX) || defined(IOS)
 /**
  * Maps a Unicode (UCS-2) character to a glyph ID and returns it. Missing glyph has
  * a glyphID of 0 so this function can be used to test if a character is encoded in the font.
diff --git a/vcl/inc/svsys.h b/vcl/inc/svsys.h
index 9add1a92fc6e..738ae98af395 100644
--- a/vcl/inc/svsys.h
+++ b/vcl/inc/svsys.h
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_INC_SVSYS_H
 #define INCLUDED_VCL_INC_SVSYS_H
 
-#ifdef WNT
+#ifdef _WIN32
 #include "win/svsys.h"
 #elif defined MACOSX
 #include "osx/svsys.h"
diff --git a/vcl/inc/win/svsys.h b/vcl/inc/win/svsys.h
index 9753a8789025..44cae93cf741 100644
--- a/vcl/inc/win/svsys.h
+++ b/vcl/inc/win/svsys.h
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_INC_WIN_SVSYS_H
 #define INCLUDED_VCL_INC_WIN_SVSYS_H
 
-#ifdef WNT
+#ifdef _WIN32
 #ifndef INCLUDED_PRE_POST_WIN_H
 #define INCLUDED_PRE_POST_WIN_H
 #include <prewin.h>