10 files changed, 16 insertions, 20 deletions
diff --git a/extensions/source/activex/SOActionsApproval.cxx b/extensions/source/activex/SOActionsApproval.cxx
index cb18c84dae28..d184d49d65e4 100644
--- a/extensions/source/activex/SOActionsApproval.cxx
+++ b/extensions/source/activex/SOActionsApproval.cxx
@@ -37,7 +37,7 @@ STDMETHODIMP SOActionsApproval::InterfaceSupportsErrorInfo(REFIID riid)
 
     for (int i=0;i<SAL_N_ELEMENTS(arr);i++)
     {
-#if defined(_MSC_VER) && (_MSC_VER >= 1300)
+#ifdef _MSC_VER
         if (InlineIsEqualGUID(*arr[i],riid))
 #else
         if (::ATL::InlineIsEqualGUID(*arr[i],riid))
diff --git a/extensions/source/activex/SOActionsApproval.h b/extensions/source/activex/SOActionsApproval.h
index 1790c782448d..de2cf52f24cc 100644
--- a/extensions/source/activex/SOActionsApproval.h
+++ b/extensions/source/activex/SOActionsApproval.h
@@ -22,16 +22,16 @@
 #ifndef __SODOCUMENTEVENTLISTENER_H_
 #define __SODOCUMENTEVENTLISTENER_H_
 
-#if _MSC_VER > 1000
+#ifdef _MSC_VER
 #pragma once
-#endif // _MSC_VER > 1000
+#endif
 
 #include "resource.h"       // main symbols
 #include <ExDispID.h>
 #include <ExDisp.h>
 #include <shlguid.h>
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1300)
+#ifdef _MSC_VER
 #undef _DEBUG
 #endif
 
diff --git a/extensions/source/activex/SOActiveX.h b/extensions/source/activex/SOActiveX.h
index e2e5b68de617..4bef47a98765 100644
--- a/extensions/source/activex/SOActiveX.h
+++ b/extensions/source/activex/SOActiveX.h
@@ -34,7 +34,7 @@
 #include <ExDisp.h>
 #include <shlguid.h>
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1300)
+#ifdef _MSC_VER
 #undef _DEBUG
 #endif
 #include <atlctl.h>
diff --git a/extensions/source/activex/SOComWindowPeer.cxx b/extensions/source/activex/SOComWindowPeer.cxx
index a9d6379ce4cf..298e32014e66 100644
--- a/extensions/source/activex/SOComWindowPeer.cxx
+++ b/extensions/source/activex/SOComWindowPeer.cxx
@@ -36,7 +36,7 @@ STDMETHODIMP SOComWindowPeer::InterfaceSupportsErrorInfo(REFIID riid)
 
     for (int i=0;i<SAL_N_ELEMENTS(arr);i++)
     {
-#if defined(_MSC_VER) && (_MSC_VER >= 1300)
+#ifdef _MSC_VER
         if (InlineIsEqualGUID(*arr[i],riid))
 #else
         if (::ATL::InlineIsEqualGUID(*arr[i],riid))
diff --git a/extensions/source/activex/SOComWindowPeer.h b/extensions/source/activex/SOComWindowPeer.h
index d8c4d2d83a5d..0e8dc37a9684 100644
--- a/extensions/source/activex/SOComWindowPeer.h
+++ b/extensions/source/activex/SOComWindowPeer.h
@@ -22,16 +22,16 @@
 #ifndef __SOCOMWINDOWPEER_H_
 #define __SOCOMWINDOWPEER_H_
 
-#if _MSC_VER > 1000
+#ifdef _MSC_VER
 #pragma once
-#endif // _MSC_VER > 1000
+#endif
 
 #include "resource.h"       // main symbols
 #include <ExDispID.h>
 #include <ExDisp.h>
 #include <shlguid.h>
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1300)
+#ifdef _MSC_VER
 #undef _DEBUG
 #endif
 #include <atlctl.h>
diff --git a/extensions/source/activex/SODispatchInterceptor.cxx b/extensions/source/activex/SODispatchInterceptor.cxx
index 6ac0e8a61a82..4663d3f78ccc 100644
--- a/extensions/source/activex/SODispatchInterceptor.cxx
+++ b/extensions/source/activex/SODispatchInterceptor.cxx
@@ -39,7 +39,7 @@ STDMETHODIMP SODispatchInterceptor::InterfaceSupportsErrorInfo(REFIID riid)
 
     for (int i=0;i<SAL_N_ELEMENTS(arr);i++)
     {
-#if defined(_MSC_VER) && (_MSC_VER >= 1300)
+#ifdef _MSC_VER
         if (InlineIsEqualGUID(*arr[i],riid))
 #else
         if (::ATL::InlineIsEqualGUID(*arr[i],riid))
diff --git a/extensions/source/activex/SODispatchInterceptor.h b/extensions/source/activex/SODispatchInterceptor.h
index e90bbefec4e9..d873c6b41eac 100644
--- a/extensions/source/activex/SODispatchInterceptor.h
+++ b/extensions/source/activex/SODispatchInterceptor.h
@@ -22,16 +22,16 @@
 #ifndef __SODISPATCHINTERCEPTOR_H_
 #define __SODISPATCHINTERCEPTOR_H_
 
-#if _MSC_VER > 1000
+#ifdef _MSC_VER
 #pragma once
-#endif // _MSC_VER > 1000
+#endif
 
 #include "resource.h"       // main symbols
 #include <ExDispID.h>
 #include <ExDisp.h>
 #include <shlguid.h>
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1300)
+#ifdef _MSC_VER
 #undef _DEBUG
 #endif
 #include <atlctl.h>
diff --git a/extensions/source/activex/StdAfx2.cxx b/extensions/source/activex/StdAfx2.cxx
index a2bfea986072..82a8f5454715 100644
--- a/extensions/source/activex/StdAfx2.cxx
+++ b/extensions/source/activex/StdAfx2.cxx
@@ -30,7 +30,7 @@
 #include <statreg.h>
 #endif
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1300)
+#ifdef _MSC_VER
 #undef _DEBUG
 #endif
 
diff --git a/extensions/source/activex/StdAfx2.h b/extensions/source/activex/StdAfx2.h
index 18503222546c..c1ef7e523db4 100644
--- a/extensions/source/activex/StdAfx2.h
+++ b/extensions/source/activex/StdAfx2.h
@@ -24,9 +24,9 @@
 #if !defined(AFX_STDAFX_H__C1799EA0_62CC_44DE_A2DD_C9F0410FF7F1__INCLUDED_)
 #define AFX_STDAFX_H__C1799EA0_62CC_44DE_A2DD_C9F0410FF7F1__INCLUDED_
 
-#if _MSC_VER > 1000
+#ifdef _MSC_VER
 #pragma once
-#endif // _MSC_VER > 1000
+#endif
 
 #define STRICT
 #ifndef _WIN32_WINNT
diff --git a/extensions/source/activex/so_activex.rc b/extensions/source/activex/so_activex.rc
index 1bc77e36b7d8..4f7246e67b75 100644
--- a/extensions/source/activex/so_activex.rc
+++ b/extensions/source/activex/so_activex.rc
@@ -25,15 +25,11 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#if defined(_MSC_VER) && (_MSC_VER < 1500)
-#include "winres.h"
-#else
 #define WINVER 0x0500
 #include <winresrc.h>
 #define LB_ADDSTRING	(WM_USER+1)
 #define CB_ADDSTRING	(WM_USER+3)
 #define IDC_STATIC		(-1)
-#endif
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS