From ff186c24766361a531e59e7c759a5efd4ccc90be Mon Sep 17 00:00:00 2001
From: Malte Timmermann <Malte.Timmermann@sun.com>
Date: Fri, 25 Jun 2010 13:15:03 +0200
Subject: codecleanup02: #i112685# Removed ifdefs and code for WIN,W30,W31

---
 dbaccess/source/ui/dlg/ConnectionHelper.cxx |  2 +-
 dbaccess/source/ui/dlg/ConnectionPage.cxx   |  2 +-
 dbaccess/source/ui/dlg/adodatalinks.cxx     |  2 +-
 dbaccess/source/ui/dlg/odbcconfig.cxx       | 10 +++++-----
 dbaccess/source/ui/dlg/odbcconfig.hxx       |  4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'dbaccess')

diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index 1d1277f49301..7eae4fa04953 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -147,7 +147,7 @@
 #ifndef _SFX_DOCFILT_HACK_HXX
 #include <sfx2/docfilt.hxx>
 #endif
-#if !defined(WINDOWS_VISTA_PSDK) && (defined(WIN) || defined(WNT))
+#if !defined(WINDOWS_VISTA_PSDK) && defined(WNT)
 #define _ADO_DATALINK_BROWSE_
 #endif
 
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index dac80070a640..b2607ebc9f98 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -153,7 +153,7 @@
 #include <sfx2/docfilt.hxx>
 #endif
 #include "dsnItem.hxx"
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
 #define _ADO_DATALINK_BROWSE_
 #endif
 
diff --git a/dbaccess/source/ui/dlg/adodatalinks.cxx b/dbaccess/source/ui/dlg/adodatalinks.cxx
index 30dddc0bb793..4b7005976778 100644
--- a/dbaccess/source/ui/dlg/adodatalinks.cxx
+++ b/dbaccess/source/ui/dlg/adodatalinks.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_dbaccess.hxx"
 
 
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
 #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 c4b73ee08af0..c1f77fc02dc2 100644
--- a/dbaccess/source/ui/dlg/odbcconfig.cxx
+++ b/dbaccess/source/ui/dlg/odbcconfig.cxx
@@ -56,7 +56,7 @@
 
 #ifdef HAVE_ODBC_SUPPORT
 
-#if defined(WIN) || defined(OS2)
+#if defined(OS2)
 #define ODBC_LIBRARY    "ODBC.DLL"
 #define ODBC_UI_LIBRARY "ODBCINST.DLL"
 #endif
@@ -78,7 +78,7 @@
 
 // just to go with calling convention of windows
 // so don't touch this
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
 #define SQL_API __stdcall
 // At least under some circumstances, the below #include <odbc/sqlext.h> re-
 // defines SQL_API to an empty string, leading to a compiler warning on MSC; to
@@ -88,7 +88,7 @@
 #pragma warning(push)
 #pragma warning(disable: 4005)
 #endif
-#endif // defined(WIN) || defined(WNT)
+#endif // defined(WNT)
 
 #if defined(OS2)
 #define ALLREADY_HAVE_OS2_TYPES
@@ -103,13 +103,13 @@
 #endif
 #endif
 
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
 #if defined _MSC_VER
 #pragma warning(pop)
 #endif
 #undef SQL_API
 #define SQL_API __stdcall
-#endif // defined(WIN) || defined(WNT)
+#endif // defined(WNT)
 // from here on you can do what you want to
 
 #if defined(OS2)
diff --git a/dbaccess/source/ui/dlg/odbcconfig.hxx b/dbaccess/source/ui/dlg/odbcconfig.hxx
index b4a10625e49b..8c0c70defe07 100644
--- a/dbaccess/source/ui/dlg/odbcconfig.hxx
+++ b/dbaccess/source/ui/dlg/odbcconfig.hxx
@@ -30,11 +30,11 @@
 
 #include "commontypes.hxx"
 
-#if defined(WIN) || defined(WNT) || defined (UNX) || defined (OS2)
+#if defined(WNT) || defined (UNX) || defined (OS2)
 #define HAVE_ODBC_SUPPORT
 #endif
 
-#if ( defined(WIN) || defined(WNT) || defined (OS2) ) && defined(HAVE_ODBC_SUPPORT)
+#if ( defined(WNT) || defined (OS2) ) && defined(HAVE_ODBC_SUPPORT)
 #define HAVE_ODBC_ADMINISTRATION
 #endif
 
-- 
cgit