diff options
Diffstat (limited to 'extensions/source/ole')
-rw-r--r-- | extensions/source/ole/ole2uno.hxx | 6 | ||||
-rw-r--r-- | extensions/source/ole/oledll.cxx | 2 | ||||
-rw-r--r-- | extensions/source/ole/oleobjw.hxx | 2 | ||||
-rw-r--r-- | extensions/source/ole/olethread.cxx | 2 | ||||
-rw-r--r-- | extensions/source/ole/servprov.cxx | 2 | ||||
-rw-r--r-- | extensions/source/ole/unoobjw.cxx | 2 |
6 files changed, 7 insertions, 9 deletions
diff --git a/extensions/source/ole/ole2uno.hxx b/extensions/source/ole/ole2uno.hxx index 342d28bb5e8d..5b281a57d9cb 100644 --- a/extensions/source/ole/ole2uno.hxx +++ b/extensions/source/ole/ole2uno.hxx @@ -21,9 +21,9 @@ #define _OLE2UNO_HXX -#if _MSC_VER > 1000 +#ifdef _MSC_VER #pragma once -#endif // _MSC_VER > 1000 +#endif #define STRICT #ifndef _WIN32_WINNT @@ -41,9 +41,7 @@ #pragma warning (disable:4548) #include <tchar.h> -#if (_MSC_VER >= 1200) || defined(__MINGW32__) #include <dispex.h> -#endif #include <tools/presys.h> #include <list> diff --git a/extensions/source/ole/oledll.cxx b/extensions/source/ole/oledll.cxx index 8109f49ec9de..a4b75951ddf0 100644 --- a/extensions/source/ole/oledll.cxx +++ b/extensions/source/ole/oledll.cxx @@ -25,7 +25,7 @@ #pragma warning (push,1) #pragma warning (disable:4548) -#if defined(_MSC_VER) && (_MSC_VER >= 1300) && !defined(_DEBUG_RUNTIME) +#if defined(_MSC_VER) && !defined(_DEBUG_RUNTIME) #undef _DEBUG #endif #ifdef __MINGW32__ diff --git a/extensions/source/ole/oleobjw.hxx b/extensions/source/ole/oleobjw.hxx index b84f20c5d649..f10a95acdf59 100644 --- a/extensions/source/ole/oleobjw.hxx +++ b/extensions/source/ole/oleobjw.hxx @@ -24,7 +24,7 @@ #include <tools/presys.h> #define _WIN32_WINNT 0x0403 -#if defined(_MSC_VER) && (_MSC_VER >= 1300) +#ifdef _MSC_VER #undef _DEBUG // why? #endif #include <atlbase.h> diff --git a/extensions/source/ole/olethread.cxx b/extensions/source/ole/olethread.cxx index eda5aee6ffe9..a7e5fc88ae9b 100644 --- a/extensions/source/ole/olethread.cxx +++ b/extensions/source/ole/olethread.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if defined _MSC_VER && ( _MSC_VER >= 1200 ) +#ifdef _MSC_VER #define _WIN32_WINNT 0x0400 #endif diff --git a/extensions/source/ole/servprov.cxx b/extensions/source/ole/servprov.cxx index e8f71955cf98..10fb507d478a 100644 --- a/extensions/source/ole/servprov.cxx +++ b/extensions/source/ole/servprov.cxx @@ -38,7 +38,7 @@ #include <tools/presys.h> #define _WIN32_WINNT 0x0403 -#if defined(_MSC_VER) && (_MSC_VER >= 1300) +#ifdef _MSC_VER #undef _DEBUG #endif #include <atlbase.h> diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx index 95d9cd6a3b5f..069da1ed98b7 100644 --- a/extensions/source/ole/unoobjw.cxx +++ b/extensions/source/ole/unoobjw.cxx @@ -72,7 +72,7 @@ using namespace com::sun::star::reflection; using ::rtl::OUString; -#if _MSC_VER < 1200 +#ifndef _MSC_VER extern "C" const GUID IID_IDispatchEx; #endif |