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>

9 files changed, 10 insertions, 10 deletions

diff --git a/dbaccess/qa/extras/dialog-save.cxx b/dbaccess/qa/extras/dialog-save.cxx
index 542691989774..38344dfcb569 100644
--- a/dbaccess/qa/extras/dialog-save.cxx
+++ b/dbaccess/qa/extras/dialog-save.cxx
@@ -46,7 +46,7 @@ public:
 
     CPPUNIT_TEST_SUITE(DialogSaveTest);
 // Should we disable this test on MOX and WNT?
-// #if !defined(MACOSX) && !defined(WNT)
+// #if !defined(MACOSX) && !defined(_WIN32)
     CPPUNIT_TEST(test);
 // #endif
     CPPUNIT_TEST_SUITE_END();
diff --git a/dbaccess/qa/extras/empty-stdlib-save.cxx b/dbaccess/qa/extras/empty-stdlib-save.cxx
index 3f84d53b30d2..d8e355c058ee 100644
--- a/dbaccess/qa/extras/empty-stdlib-save.cxx
+++ b/dbaccess/qa/extras/empty-stdlib-save.cxx
@@ -46,7 +46,7 @@ public:
 
     CPPUNIT_TEST_SUITE(DialogSaveTest);
 // Should we disable this test on MOX and WNT?
-// #if !defined(MACOSX) && !defined(WNT)
+// #if !defined(MACOSX) && !defined(_WIN32)
     CPPUNIT_TEST(test);
 // #endif
     CPPUNIT_TEST_SUITE_END();
diff --git a/dbaccess/qa/extras/macros-test.cxx b/dbaccess/qa/extras/macros-test.cxx
index 76007205542e..d6c7e6b49ac5 100644
--- a/dbaccess/qa/extras/macros-test.cxx
+++ b/dbaccess/qa/extras/macros-test.cxx
@@ -23,7 +23,7 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
-#if !defined(MACOSX) && !defined(WNT)
+#if !defined(MACOSX) && !defined(_WIN32)
 
 class DBAccessTest : public UnoApiTest
 {
diff --git a/dbaccess/qa/extras/nolib-save.cxx b/dbaccess/qa/extras/nolib-save.cxx
index 3f1ca91a235f..c41dc2617948 100644
--- a/dbaccess/qa/extras/nolib-save.cxx
+++ b/dbaccess/qa/extras/nolib-save.cxx
@@ -46,7 +46,7 @@ public:
 
     CPPUNIT_TEST_SUITE(DialogSaveTest);
 // Should we disable this test on MOX and WNT?
-// #if !defined(MACOSX) && !defined(WNT)
+// #if !defined(MACOSX) && !defined(_WIN32)
     CPPUNIT_TEST(test);
 // #endif
     CPPUNIT_TEST_SUITE_END();
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index e1eec6b5f397..7fd4ff4ae31f 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -60,7 +60,7 @@
 #include <tools/diagnose_ex.h>
 #include <sfx2/docfilt.hxx>
 
-#if defined(WNT)
+#if defined(_WIN32)
 #define _ADO_DATALINK_BROWSE_
 #endif
 
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index ddd01be56f88..7eb9d3cc0466 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -59,7 +59,7 @@
 #include <connectivity/CommonTools.hxx>
 #include <sfx2/docfilt.hxx>
 #include "dsnItem.hxx"
-#if defined(WNT)
+#if defined(_WIN32)
 #define _ADO_DATALINK_BROWSE_
 #endif
 
diff --git a/dbaccess/source/ui/dlg/adodatalinks.cxx b/dbaccess/source/ui/dlg/adodatalinks.cxx
index 5ce581ba1e3a..37a3bc30f108 100644
--- a/dbaccess/source/ui/dlg/adodatalinks.cxx
+++ b/dbaccess/source/ui/dlg/adodatalinks.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#if defined(WNT)
+#if defined(_WIN32)
 #if defined _MSC_VER
 #pragma warning(push, 1)
 #pragma warning(disable: 4917)
diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx
index 25e53dbdc149..b4c482d698c1 100644
--- a/dbaccess/source/ui/dlg/odbcconfig.cxx
+++ b/dbaccess/source/ui/dlg/odbcconfig.cxx
@@ -31,7 +31,7 @@
 
 #ifdef HAVE_ODBC_SUPPORT
 
-#if defined WNT
+#if defined(_WIN32)
 #define ODBC_LIBRARY    "ODBC32.DLL"
 #endif
 #ifdef UNX
diff --git a/dbaccess/source/ui/dlg/odbcconfig.hxx b/dbaccess/source/ui/dlg/odbcconfig.hxx
index 4d69bf1b5976..5d0fcae75c5e 100644
--- a/dbaccess/source/ui/dlg/odbcconfig.hxx
+++ b/dbaccess/source/ui/dlg/odbcconfig.hxx
@@ -22,11 +22,11 @@
 
 #include "commontypes.hxx"
 
-#if defined(WNT) || (defined (UNX) && !defined(ANDROID) && !defined(IOS))
+#if defined(_WIN32) || (defined (UNX) && !defined(ANDROID) && !defined(IOS))
 #define HAVE_ODBC_SUPPORT
 #endif
 
-#if defined(WNT) && defined(HAVE_ODBC_SUPPORT)
+#if defined(_WIN32) && defined(HAVE_ODBC_SUPPORT)
 #define HAVE_ODBC_ADMINISTRATION
 #endif