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>

25 files changed, 36 insertions, 36 deletions

diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index f164fcf09841..53caa2568c3b 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -229,7 +229,7 @@ public:
     Reader* StartConvertFrom(SfxMedium& rMedium, SwReader** ppRdr,
                             SwCursorShell* pCursorSh = nullptr, SwPaM* pPaM = nullptr);
 
-#if defined WNT
+#if defined(_WIN32)
     virtual bool DdeGetData( const OUString& rItem, const OUString& rMimeType,
                              css::uno::Any & rValue ) override;
     virtual bool DdeSetData( const OUString& rItem, const OUString& rMimeType,
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx
index 2086779ff9fa..5fd4efe99fca 100644
--- a/sw/inc/view.hxx
+++ b/sw/inc/view.hxx
@@ -411,7 +411,7 @@ public:
     inline       SwEditWin &GetEditWin()        { return *m_pEditWin; }
     inline const SwEditWin &GetEditWin () const { return *m_pEditWin; }
 
-#if defined WNT || defined UNX
+#if defined(_WIN32) || defined UNX
     void ScannerEventHdl( const css::lang::EventObject& rEventObject );
 #endif
 
diff --git a/sw/qa/core/layout-test.cxx b/sw/qa/core/layout-test.cxx
index db04d518976e..2b2e3dcd32e4 100644
--- a/sw/qa/core/layout-test.cxx
+++ b/sw/qa/core/layout-test.cxx
@@ -43,7 +43,7 @@ public:
     void test();
 
     CPPUNIT_TEST_SUITE(SwLayoutTest);
-#if !defined(MACOSX) && !defined(WNT)
+#if !defined(MACOSX) && !defined(_WIN32)
     CPPUNIT_TEST(test);
 #endif
     CPPUNIT_TEST_SUITE_END();
diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
index 6787d4f707bc..8d408c3ba68b 100644
--- a/sw/qa/core/macros-test.cxx
+++ b/sw/qa/core/macros-test.cxx
@@ -75,7 +75,7 @@ public:
     virtual void tearDown() override;
 
     //void testStarBasic();
-#if !defined MACOSX && !defined WNT
+#if !defined(MACOSX) && !defined(_WIN32)
     void testVba();
 #endif
     void testBookmarkDeleteAndJoin();
@@ -87,7 +87,7 @@ public:
     void testFdo68983();
     void testFindReplace();
     CPPUNIT_TEST_SUITE(SwMacrosTest);
-#if !defined(MACOSX) && !defined(WNT)
+#if !defined(MACOSX) && !defined(_WIN32)
     //enable this test if you want to play with star basic macros in unit tests
     //works but does nothing useful yet
     //CPPUNIT_TEST(testStarBasic);
@@ -147,7 +147,7 @@ void SwMacrosTest::testStarBasic()
 
 #endif
 
-#if !defined MACOSX && !defined WNT
+#if !defined(MACOSX) && !defined(_WIN32)
 void SwMacrosTest::testVba()
 {
     TestMacroInfo testInfo[] = {
diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx b/sw/qa/extras/globalfilter/globalfilter.cxx
index c68ddf7b8a4f..54f2c1518ae8 100644
--- a/sw/qa/extras/globalfilter/globalfilter.cxx
+++ b/sw/qa/extras/globalfilter/globalfilter.cxx
@@ -34,7 +34,7 @@ public:
     void testCharHighlightBody();
     void testMSCharBackgroundEditing();
     void testCharBackgroundToHighlighting();
-#if !defined(WNT)
+#if !defined(_WIN32)
     void testSkipImages();
 #endif
 
@@ -47,7 +47,7 @@ public:
     CPPUNIT_TEST(testCharHighlightODF);
     CPPUNIT_TEST(testMSCharBackgroundEditing);
     CPPUNIT_TEST(testCharBackgroundToHighlighting);
-#if !defined(WNT)
+#if !defined(_WIN32)
     CPPUNIT_TEST(testSkipImages);
 #endif
     CPPUNIT_TEST_SUITE_END();
@@ -739,7 +739,7 @@ void Test::testCharBackgroundToHighlighting()
     }
 }
 
-#if !defined(WNT)
+#if !defined(_WIN32)
 void Test::testSkipImages()
 {
     // Check how LO skips image loading (but not texts of textboxes and custom shapes)
diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx
index c26a45d6d81f..2feab11a6dbc 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -498,7 +498,7 @@ DECLARE_ODFIMPORT_TEST(testFdo37606, "fdo37606.odt")
         CPPUNIT_ASSERT(!pContentNode->FindTableNode());
     }
 }
-#if !defined(WNT)
+#if !defined(_WIN32)
 DECLARE_ODFIMPORT_TEST(testFdo37606Copy, "fdo37606.odt")
 {
     SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
index f3cb5bc55df8..dd41313e25ea 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
@@ -94,7 +94,7 @@ protected:
     }
 };
 
-#if !defined(WNT)
+#if !defined(_WIN32)
 
 DECLARE_OOXMLEXPORT_TEST(testPageGraphicBackground, "page-graphic-background.odt")
 {
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
index db771bd782c9..71518c34b82e 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
@@ -73,7 +73,7 @@ protected:
     }
 };
 
-#if !defined(WNT)
+#if !defined(_WIN32)
 
 DECLARE_OOXMLEXPORT_TEST(testFdo68418, "fdo68418.docx")
 {
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
index c01a4e3c4d64..df6f945e747a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
@@ -9,7 +9,7 @@
 
 #include <swmodeltestbase.hxx>
 
-#if !defined(WNT)
+#if !defined(_WIN32)
 
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp>
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
index 6463c8096184..cd91d59c836b 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
@@ -9,7 +9,7 @@
 
 #include <swmodeltestbase.hxx>
 
-#if !defined(WNT)
+#if !defined(_WIN32)
 
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp>
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 5ede1d50f416..5a5405f3ad06 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -159,7 +159,7 @@ public:
     }
 };
 
-#if !defined(WNT)
+#if !defined(_WIN32)
 
 DECLARE_SW_IMPORT_TEST(testMathMalformedXml, "math-malformed_xml.docx", FailTest)
 {
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index a67d83cbb53a..d34d8666793f 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -118,7 +118,7 @@ protected:
     AllSettings m_aSavedSettings;
 };
 
-#if !defined(WNT)
+#if !defined(_WIN32)
 
 DECLARE_RTFIMPORT_TEST(testFdo45553, "fdo45553.rtf")
 {
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 0022f2fe35ae..a314aefff2f9 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -625,7 +625,7 @@ static void lcl_FormatPostIt(
 
     pIDCO->SplitNode( *aPam.GetPoint(), false );
     aStr = pField->GetPar2();
-#if defined( WNT )
+#if defined(_WIN32)
     // Throw out all CR in Windows
     aStr = comphelper::string::remove(aStr, '\r');
 #endif
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index e49cfe152763..9dee24ac89a0 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -490,7 +490,7 @@ void SwFntObj::CreateScrFont( const SwViewShell& rSh, const OutputDevice& rOut )
 }
 
 void SwFntObj::GuessLeading( const SwViewShell&
-#if defined(WNT)
+#if defined(_WIN32)
                              rSh
 #endif
                              , const FontMetric& rMet )
@@ -503,7 +503,7 @@ void SwFntObj::GuessLeading( const SwViewShell&
         return;
     }
 
-#if defined(WNT)
+#if defined(_WIN32)
     OutputDevice *pWin = rSh.GetWin() ?
                          rSh.GetWin() :
                          GetpApp()->GetDefaultDevice();
diff --git a/sw/source/ui/vba/vbasystem.cxx b/sw/source/ui/vba/vbasystem.cxx
index 22080650ec63..97f244f205e3 100644
--- a/sw/source/ui/vba/vbasystem.cxx
+++ b/sw/source/ui/vba/vbasystem.cxx
@@ -24,7 +24,7 @@
 #include <osl/file.hxx>
 #include <tools/urlobj.hxx>
 
-#ifdef WNT
+#ifdef _WIN32
 #if defined _MSC_VER
 #pragma warning (push, 1)
 #pragma warning (disable: 4005)
@@ -49,7 +49,7 @@ void PrivateProfileStringListener::Initialize( const OUString& rFileName, const
     maGroupName = rGroupName;
     maKey = rKey;
 }
-#ifdef WNT
+#ifdef _WIN32
 void lcl_getRegKeyInfo( const OString& sKeyInfo, HKEY& hBaseKey, OString& sSubKey )
 {
     sal_Int32 nBaseKeyIndex = sKeyInfo.indexOf('\\');
@@ -95,7 +95,7 @@ uno::Any PrivateProfileStringListener::getValueEvent()
     else
     {
         // get key/value from windows register
-#ifdef WNT
+#ifdef _WIN32
         HKEY hBaseKey = NULL;
         OString sSubKey;
         lcl_getRegKeyInfo( maGroupName, hBaseKey, sSubKey );
@@ -140,7 +140,7 @@ void PrivateProfileStringListener::setValueEvent( const css::uno::Any& value )
     else
     {
         //set value into windows register
-#ifdef WNT
+#ifdef _WIN32
         HKEY hBaseKey = NULL;
         OString sSubKey;
         lcl_getRegKeyInfo( maGroupName, hBaseKey, sSubKey );
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index 811deb4b029d..b5f631faa623 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -1145,7 +1145,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
     }
 }
 
-#if defined WNT
+#if defined(_WIN32)
 bool SwDocShell::DdeGetData( const OUString& rItem, const OUString& rMimeType,
                              uno::Any & rValue )
 {
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 0aea9c99a21d..b583923e836c 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -2627,7 +2627,7 @@ OUString SwDBManager::LoadAndRegisterDataSource(SwDocShell* pDocShell)
     OUString sFilterXLS(SW_RES(STR_FILTER_XLS));
     OUString sFilterTXT(SW_RES(STR_FILTER_TXT));
     OUString sFilterCSV(SW_RES(STR_FILTER_CSV));
-#ifdef WNT
+#ifdef _WIN32
     OUString sFilterMDB(SW_RES(STR_FILTER_MDB));
     OUString sFilterACCDB(SW_RES(STR_FILTER_ACCDB));
 #endif
@@ -2640,7 +2640,7 @@ OUString SwDBManager::LoadAndRegisterDataSource(SwDocShell* pDocShell)
     xFltMgr->appendFilter( sFilterXLS, "*.xls" );
     xFltMgr->appendFilter( sFilterTXT, "*.txt" );
     xFltMgr->appendFilter( sFilterCSV, "*.csv" );
-#ifdef WNT
+#ifdef _WIN32
     xFltMgr->appendFilter( sFilterMDB, "*.mdb" );
     xFltMgr->appendFilter( sFilterACCDB, "*.accdb" );
 #endif
@@ -2704,7 +2704,7 @@ SwDBManager::DBConnURITypes SwDBManager::GetDBunoURI(const OUString &rURI, uno::
         aURLAny <<= sDBURL;
         type = DBCONN_FLAT;
     }
-#ifdef WNT
+#ifdef _WIN32
     else if(sExt.equalsIgnoreAsciiCase("mdb"))
     {
         OUString sDBURL("sdbc:ado:access:PROVIDER=Microsoft.Jet.OLEDB.4.0;DATA SOURCE=");
diff --git a/sw/source/uibase/docvw/romenu.cxx b/sw/source/uibase/docvw/romenu.cxx
index c7de73d2651b..9b863d5c8a2e 100644
--- a/sw/source/uibase/docvw/romenu.cxx
+++ b/sw/source/uibase/docvw/romenu.cxx
@@ -190,7 +190,7 @@ SwReadOnlyPopup::SwReadOnlyPopup( const Point &rDPos, SwView &rV ) :
     Check( MN_READONLY_SOURCEVIEW,      SID_SOURCEVIEW,     rDis );
     Check( MN_READONLY_BROWSE_BACKWARD, SID_BROWSE_BACKWARD,rDis );
     Check( MN_READONLY_BROWSE_FORWARD,  SID_BROWSE_FORWARD, rDis );
-#ifdef WNT
+#ifdef _WIN32
     Check( MN_READONLY_PLUGINOFF,       SID_PLUGINS_ACTIVE, rDis );
 #endif
     Check( MN_READONLY_OPENURL,         SID_OPENDOC,        rDis );
@@ -314,7 +314,7 @@ void SwReadOnlyPopup::Execute( vcl::Window* pWin, sal_uInt16 nId )
                 break;
             }
         case MN_READONLY_GRAPHICOFF:        nExecId = FN_VIEW_GRAPHIC;    break;
-#ifdef WNT
+#ifdef _WIN32
         case MN_READONLY_PLUGINOFF:         nExecId = SID_PLUGINS_ACTIVE; break;
 #endif
         case MN_READONLY_TOGALLERYLINK:
diff --git a/sw/source/uibase/envelp/envimg.cxx b/sw/source/uibase/envelp/envimg.cxx
index 99a2ef4b0027..b7591850e20f 100644
--- a/sw/source/uibase/envelp/envimg.cxx
+++ b/sw/source/uibase/envelp/envimg.cxx
@@ -34,7 +34,7 @@
 
 #include <unomid.h>
 
-#ifdef WNT
+#ifdef _WIN32
 #define NEXTLINE  "\r\n"
 #else
 #define NEXTLINE  "\n"
diff --git a/sw/source/uibase/uiview/uivwimp.cxx b/sw/source/uibase/uiview/uivwimp.cxx
index 49d3a96de2a9..830e32d8e85f 100644
--- a/sw/source/uibase/uiview/uivwimp.cxx
+++ b/sw/source/uibase/uiview/uivwimp.cxx
@@ -262,7 +262,7 @@ SwScannerEventListener::~SwScannerEventListener()
 
 void SAL_CALL SwScannerEventListener::disposing( const EventObject& rEventObject) throw(uno::RuntimeException, std::exception)
 {
-#if defined WNT || defined UNX
+#if defined(_WIN32) || defined UNX
     SolarMutexGuard aGuard;
     if( pView )
         pView->ScannerEventHdl( rEventObject );
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index 78531dc19805..81ce9822eb14 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -1641,7 +1641,7 @@ void SwView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
         SfxViewShell::Notify(rBC, rHint);
 }
 
-#if defined WNT || defined UNX
+#if defined(_WIN32) || defined UNX
 
 void SwView::ScannerEventHdl( const EventObject& /*rEventObject*/ )
 {
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index a8c83ce524ce..92f87f4a6079 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -991,7 +991,7 @@ void SwView::Execute(SfxRequest &rReq)
             m_pShell->ExecuteSlot(rReq);
         }
         break;
-#if defined WNT || defined UNX
+#if defined(_WIN32) || defined UNX
         case SID_TWAIN_SELECT:
         case SID_TWAIN_TRANSFER:
             GetViewImpl()->ExecuteScan( rReq );
diff --git a/sw/source/uibase/uiview/viewstat.cxx b/sw/source/uibase/uiview/viewstat.cxx
index 7c01196b5d2e..77dfe152560b 100644
--- a/sw/source/uibase/uiview/viewstat.cxx
+++ b/sw/source/uibase/uiview/viewstat.cxx
@@ -214,7 +214,7 @@ void SwView::GetState(SfxItemSet &rSet)
             break;
             case SID_TWAIN_SELECT:
             case SID_TWAIN_TRANSFER:
-#if defined WNT || defined UNX
+#if defined(_WIN32) || defined UNX
             {
                 if(!SW_MOD()->GetScannerManager().is())
                     rSet.DisableItem(nWhich);
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index 383f6ee3ccf5..565af8c894a7 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -3453,7 +3453,7 @@ void SAL_CALL SwXTextDocument::paintTile( const ::css::uno::Any& Parent, ::sal_I
 {
     SystemGraphicsData aData;
     aData.nSize = sizeof(SystemGraphicsData);
-    #if defined WNT
+    #if defined(_WIN32)
     sal_Int64 nWindowHandle;
     Parent >>= nWindowHandle;
     aData.hWnd = (HWND) nWindowHandle;
diff --git a/sw/source/uibase/utlui/initui.cxx b/sw/source/uibase/utlui/initui.cxx
index 8f23fee615fc..e6fa0642ccd2 100644
--- a/sw/source/uibase/utlui/initui.cxx
+++ b/sw/source/uibase/utlui/initui.cxx
@@ -291,7 +291,7 @@ ImpAutoFormatNameListLoader::ImpAutoFormatNameListLoader( std::vector<OUString>&
         OUString p(ResId(n + 1, *pSwResMgr));
         if(STR_AUTOFMTREDL_TYPO == n)
         {
-#ifdef WNT
+#ifdef _WIN32
             // For Windows, a special treatment is necessary because MS has
             // forgotten some characters in the dialog font here.
             p = p.replaceFirst("%1", ",,");