diff options
75 files changed, 87 insertions, 230 deletions
diff --git a/avmedia/source/win/framegrabber.cxx b/avmedia/source/win/framegrabber.cxx index 612ace8785a6..e72fc16058db 100644 --- a/avmedia/source/win/framegrabber.cxx +++ b/avmedia/source/win/framegrabber.cxx @@ -26,11 +26,7 @@ #include <objbase.h> #include <strmif.h> #include <Amvideo.h> -#if defined(_MSC_VER) && (_MSC_VER < 1500) -#include <Qedit.h> -#else #include "interface.hxx" -#endif #include <uuids.h> #if defined _MSC_VER #pragma warning(pop) diff --git a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx index 9430f29d84a9..497958d0307f 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx @@ -503,13 +503,9 @@ int msci_filterCppException( if (pRecord == 0 || pRecord->ExceptionCode != MSVC_ExceptionCode) return EXCEPTION_CONTINUE_SEARCH; -#if _MSC_VER < 1300 // MSVC -6 - bool rethrow = (pRecord->NumberParameters < 3 || - pRecord->ExceptionInformation[ 2 ] == 0); -#else bool rethrow = __CxxDetectRethrow( &pRecord ); OSL_ASSERT( pRecord == pPointers->ExceptionRecord ); -#endif + if (rethrow && pRecord == pPointers->ExceptionRecord) { // hack to get msvcrt internal _curexception field: @@ -521,15 +517,7 @@ int msci_filterCppException( // crt\src\mtdll.h: // offsetof (_tiddata, _curexception) - // offsetof (_tiddata, _tpxcptinfoptrs): -#if _MSC_VER < 1300 - 0x18 // msvcrt,dll -#elif _MSC_VER < 1310 - 0x20 // msvcr70.dll -#elif _MSC_VER < 1400 - 0x24 // msvcr71.dll -#else - 0x28 // msvcr80.dll -#endif + 0x28 // msvcr80.dll (and later?) ); } // rethrow: handle only C++ exceptions: @@ -576,12 +564,11 @@ int msci_filterCppException( uno_type_any_constructAndConvert( pUnoExc, &exc, ::getCppuType( &exc ).getTypeLibType(), pCpp2Uno ); -#if _MSC_VER < 1400 // msvcr80.dll cleans up, different from former msvcrs + // msvcr80.dll cleans up, different from former msvcrs // if (! rethrow): // though this unknown exception leaks now, no user-defined // exception is ever thrown thru the binary C-UNO dispatcher // call stack. -#endif } else { @@ -589,14 +576,6 @@ int msci_filterCppException( uno_any_constructAndConvert( pUnoExc, (void *) pRecord->ExceptionInformation[1], pExcTypeDescr, pCpp2Uno ); -#if _MSC_VER < 1400 // msvcr80.dll cleans up, different from former msvcrs - if (! rethrow) - { - uno_destructData( - (void *) pRecord->ExceptionInformation[1], - pExcTypeDescr, cpp_release ); - } -#endif typelib_typedescription_release( pExcTypeDescr ); } diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx index 0a48f5ce0aff..5f47dc52d252 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx @@ -726,9 +726,7 @@ int mscx_filterCppException( // MSVS9/crt/src/mtdll.h: // offsetof (_tiddata, _curexception) - // offsetof (_tiddata, _tpxcptinfoptrs): -#if _MSC_VER < 1500 - error, this compiler version is not supported -#elif _MSC_VER < 1600 +#if _MSC_VER < 1600 0x48 // msvcr90.dll #else error, please find value for this compiler version @@ -792,12 +790,6 @@ int mscx_filterCppException( uno_type_any_constructAndConvert( pUnoExc, &exc, ::getCppuType( &exc ).getTypeLibType(), pCpp2Uno ); -#if _MSC_VER < 1400 // msvcr80.dll cleans up, different from former msvcrs - // if (! rethrow): - // though this unknown exception leaks now, no user-defined - // exception is ever thrown thru the binary C-UNO dispatcher - // call stack. -#endif } else { @@ -805,14 +797,6 @@ int mscx_filterCppException( uno_any_constructAndConvert( pUnoExc, (void *) pRecord->ExceptionInformation[1], pExcTD, pCpp2Uno ); -#if _MSC_VER < 1400 // msvcr80.dll cleans up, different from former msvcrs - if (! rethrow) - { - uno_destructData( - (void *) pRecord->ExceptionInformation[1], - pExcTD, cpp_release ); - } -#endif typelib_typedescription_release( pExcTD ); } diff --git a/cli_ure/source/uno_bridge/cli_bridge.cxx b/cli_ure/source/uno_bridge/cli_bridge.cxx index 6da6cdf25aad..4d6a4e3a2ddb 100644 --- a/cli_ure/source/uno_bridge/cli_bridge.cxx +++ b/cli_ure/source/uno_bridge/cli_bridge.cxx @@ -31,9 +31,6 @@ #include "cli_bridge.h" #include "cli_proxy.h" -#if defined(_MSC_VER) && (_MSC_VER < 1400) -#include <_vcclrit.h> -#endif namespace sri= System::Runtime::InteropServices; using ::rtl::OUString; @@ -268,9 +265,10 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_initEnvironment( uno_Environment * uno_cl SAL_THROW_EXTERN_C() { //ToDo: remove when compiled with .NET 2 -#if defined(_MSC_VER) && (_MSC_VER < 1400) - __crt_dll_initialize(); -#endif + + // Unclear whether the above comment refers to this whole function + // or a call to __crt_dll_initialize() that used to be here for + // _MSC_VER < 1400 uno_cli_env->environmentDisposing= cli_env_disposing; uno_cli_env->pExtEnv = 0; diff --git a/codemaker/inc/codemaker/global.hxx b/codemaker/inc/codemaker/global.hxx index f4eff3d92dc0..17f78a886b65 100644 --- a/codemaker/inc/codemaker/global.hxx +++ b/codemaker/inc/codemaker/global.hxx @@ -54,11 +54,6 @@ struct LessString } }; -#if defined(_MSC_VER) && _MSC_VER < 1200 -typedef ::std::new_alloc NewAlloc; -#endif - - typedef ::std::list< ::rtl::OString > StringList; typedef ::std::vector< ::rtl::OString > StringVector; typedef ::std::set< ::rtl::OString, LessString > StringSet; diff --git a/connectivity/source/drivers/postgresql/pq_allocator.hxx b/connectivity/source/drivers/postgresql/pq_allocator.hxx index dadeb8ee4293..78d1dfa3db9a 100644 --- a/connectivity/source/drivers/postgresql/pq_allocator.hxx +++ b/connectivity/source/drivers/postgresql/pq_allocator.hxx @@ -210,22 +210,11 @@ inline bool operator!= (const Allocator<T>&, const Allocator<U>&) SAL_THROW(()) /* REQUIRED BY STLPort (see stlport '_alloc.h'): Hack for compilers that do not support member template classes (e.g. MSVC 6) */ -#if defined (_MSC_VER) -#if (_MSC_VER < 1400) // MSVC 6 -namespace _STL -{ -#endif -#endif template<class T, class U> inline pq_sdbc_driver::Allocator<U> & __stl_alloc_rebind ( pq_sdbc_driver::Allocator<T> & a, U const *) { return (pq_sdbc_driver::Allocator<U>&)(a); } -#if defined (_MSC_VER) -#if (_MSC_VER < 1400) // MSVC 6 -} -#endif -#endif #endif /* _PQ_ALLOCATOR_ */ diff --git a/cppu/inc/cppu/unotype.hxx b/cppu/inc/cppu/unotype.hxx index 23d2ddead105..2861bdb2c922 100644 --- a/cppu/inc/cppu/unotype.hxx +++ b/cppu/inc/cppu/unotype.hxx @@ -107,11 +107,7 @@ getTypeFromTypeClass(::typelib_TypeClass tc) { } -// For _MSC_VER 1310, define cppu_detail_getUnoType in the global namespace, to -// avoid spurious compiler errors in code that calls cppu_detail_getUnoType: -#if !defined _MSC_VER || _MSC_VER > 1310 namespace cppu { namespace detail { -#endif inline ::com::sun::star::uno::Type const & cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::cppu::UnoVoidType const *) { @@ -240,9 +236,7 @@ cppu_detail_getUnoType( return ::cppu::UnoType< T >::get(); } -#if !defined _MSC_VER || _MSC_VER > 1310 } } -#endif namespace cppu { diff --git a/crashrep/source/win32/rcheader.txt b/crashrep/source/win32/rcheader.txt index bd831a372fc4..be3c0600d685 100644 --- a/crashrep/source/win32/rcheader.txt +++ b/crashrep/source/win32/rcheader.txt @@ -18,15 +18,11 @@ // Header #include "resource.h" -#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 #include "version.hrc" diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index f0db80157dad..55491b12c2f7 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -138,13 +138,13 @@ namespace dbaui protected: virtual FmGridControl* imp_CreateControl(Window* pParent, WinBits nStyle); -#if defined(_MSC_VER) && (_MSC_VER >= 1310 ) +#ifdef _MSC_VER typedef ::com::sun::star::frame::XStatusListener xstlist_type; typedef ::com::sun::star::uno::Reference< xstlist_type > xlistener_type; void NotifyStatusChanged(const ::com::sun::star::util::URL& aUrl, const xlistener_type & xControl = xlistener_type() ); #else void NotifyStatusChanged(const ::com::sun::star::util::URL& aUrl, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xControl = ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > ()); -#endif // # _MSC_VER>=1310 +#endif // # _MSC_VER private: // for asny execution of XDispatch::dispatch diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index 00936b624c56..bd83d12e5a5e 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx @@ -86,10 +86,6 @@ #include <boost/shared_ptr.hpp> #include <boost/scoped_ptr.hpp> -#if (defined(_MSC_VER) && (_MSC_VER < 1400)) -#define _WIN32_WINNT 0x0400 -#endif - #ifdef WNT #define GradientStyle_RECT BLA_GradientStyle_RECT #include <windows.h> diff --git a/desktop/win32/source/QuickStart/StdAfx.h b/desktop/win32/source/QuickStart/StdAfx.h index b8b138d88c4b..ce29121529a3 100644 --- a/desktop/win32/source/QuickStart/StdAfx.h +++ b/desktop/win32/source/QuickStart/StdAfx.h @@ -24,9 +24,9 @@ #if !defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_) #define AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_ -#if _MSC_VER > 1000 +#ifdef _MSC_VER #pragma once -#endif // _MSC_VER > 1000 +#endif #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx b/dtrans/source/win32/dtobj/DOTransferable.cxx index 003a02ab2c63..15f8fb9d9d79 100644 --- a/dtrans/source/win32/dtobj/DOTransferable.cxx +++ b/dtrans/source/win32/dtobj/DOTransferable.cxx @@ -30,11 +30,6 @@ #include "FmtFilter.hxx" #include "Fetc.hxx" - -#if(_MSC_VER < 1300) && !defined(__MINGW32__) -#include <olestd.h> -#endif - #define STR2(x) #x #define STR(x) STR2(x) #define PRAGMA_MSG( msg ) message( __FILE__ "(" STR(__LINE__) "): " #msg ) diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.cxx b/dtrans/source/win32/dtobj/DataFmtTransl.cxx index a990b70f543f..c3ba9624e90a 100644 --- a/dtrans/source/win32/dtobj/DataFmtTransl.cxx +++ b/dtrans/source/win32/dtobj/DataFmtTransl.cxx @@ -33,9 +33,6 @@ #pragma warning(disable:4917) #endif #include <windows.h> -#if (_MSC_VER < 1300) && !defined(__MINGW32__) -#include <olestd.h> -#endif #include <shlobj.h> #if defined _MSC_VER #pragma warning(pop) diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index 589b693c99c2..3b5033b6de3e 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -1557,7 +1557,7 @@ uno::Reference< uno::XInterface > SvxUnoTextRange_NewInstance() { SvxUnoText aText; uno::Reference< text::XTextRange > xRange( new SvxUnoTextRange( aText ) ); -#if (_MSC_VER < 1300) +#ifndef _MSC_VER return xRange; #else return (uno::Reference< uno::XInterface >)xRange; diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx index cf2b71c4c9d9..8ddfb66703ff 100644 --- a/embedserv/source/embed/docholder.cxx +++ b/embedserv/source/embed/docholder.cxx @@ -16,7 +16,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if defined(_MSC_VER) && (_MSC_VER > 1310) +#ifdef _MSC_VER #pragma warning(disable : 4917 4555) #endif @@ -1507,7 +1507,7 @@ void SAL_CALL DocumentHolder::modified( const lang::EventObject& /*aEvent*/ ) // Fix strange warnings about some // ATL::CAxHostWindow::QueryInterface|AddRef|Releae functions. // warning C4505: 'xxx' : unreferenced local function has been removed -#if defined(_MSC_VER) +#ifdef _MSC_VER #pragma warning(disable: 4505) #endif diff --git a/embedserv/source/embed/ed_idataobj.cxx b/embedserv/source/embed/ed_idataobj.cxx index 7dc8824ffde2..c62f6eae8cbe 100644 --- a/embedserv/source/embed/ed_idataobj.cxx +++ b/embedserv/source/embed/ed_idataobj.cxx @@ -16,7 +16,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if defined(_MSC_VER) && (_MSC_VER > 1310) +#ifdef _MSC_VER #pragma warning(disable : 4917 4555) #endif diff --git a/embedserv/source/embed/ed_ipersiststr.cxx b/embedserv/source/embed/ed_ipersiststr.cxx index 783ab45138e4..f65cd0163065 100644 --- a/embedserv/source/embed/ed_ipersiststr.cxx +++ b/embedserv/source/embed/ed_ipersiststr.cxx @@ -16,7 +16,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if defined(_MSC_VER) && (_MSC_VER > 1310) +#ifdef _MSC_VER #pragma warning(disable : 4917 4555) #endif diff --git a/embedserv/source/embed/esdll.cxx b/embedserv/source/embed/esdll.cxx index 6df9c2edb2cb..b5aa6b7a2762 100644 --- a/embedserv/source/embed/esdll.cxx +++ b/embedserv/source/embed/esdll.cxx @@ -20,7 +20,7 @@ #define STRICT #define _WIN32_WINNT 0x0403 #define _WIN32_DCOM -#if defined(_MSC_VER) && (_MSC_VER > 1310) +#ifdef _MSC_VER #pragma warning(disable : 4917 4555) #endif diff --git a/embedserv/source/embed/guid.cxx b/embedserv/source/embed/guid.cxx index a04dcd18bb76..b7520cd51552 100644 --- a/embedserv/source/embed/guid.cxx +++ b/embedserv/source/embed/guid.cxx @@ -16,7 +16,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if defined(_MSC_VER) && (_MSC_VER > 1310) +#ifdef _MSC_VER #pragma warning(disable : 4917 4555) #endif diff --git a/embedserv/source/embed/register.cxx b/embedserv/source/embed/register.cxx index e6d1fff1bdab..1ce0a67b5350 100644 --- a/embedserv/source/embed/register.cxx +++ b/embedserv/source/embed/register.cxx @@ -16,7 +16,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if defined(_MSC_VER) && (_MSC_VER > 1310) +#ifdef _MSC_VER #pragma warning(disable : 4917 4555) #endif diff --git a/embedserv/source/embed/servprov.cxx b/embedserv/source/embed/servprov.cxx index e6fb95880007..739a3088f025 100644 --- a/embedserv/source/embed/servprov.cxx +++ b/embedserv/source/embed/servprov.cxx @@ -16,7 +16,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if defined(_MSC_VER) && (_MSC_VER > 1310) +#ifdef _MSC_VER #pragma warning(disable : 4917 4555) #endif diff --git a/embedserv/source/embed/syswinwrapper.cxx b/embedserv/source/embed/syswinwrapper.cxx index b9ad3675257e..0621eb54ebb4 100644 --- a/embedserv/source/embed/syswinwrapper.cxx +++ b/embedserv/source/embed/syswinwrapper.cxx @@ -16,7 +16,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if defined(_MSC_VER) && (_MSC_VER > 1310) +#ifdef _MSC_VER #pragma warning(disable : 4917 4555) #endif diff --git a/embedserv/source/embed/tracker.cxx b/embedserv/source/embed/tracker.cxx index edaff017a12c..61338dbe4487 100644 --- a/embedserv/source/embed/tracker.cxx +++ b/embedserv/source/embed/tracker.cxx @@ -16,7 +16,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if defined(_MSC_VER) && (_MSC_VER > 1310) +#ifdef _MSC_VER #pragma warning(disable : 4917 4555) #endif diff --git a/embedserv/source/inc/embeddoc.hxx b/embedserv/source/inc/embeddoc.hxx index 3eab4a0b4bb1..1962c5451748 100644 --- a/embedserv/source/inc/embeddoc.hxx +++ b/embedserv/source/inc/embeddoc.hxx @@ -19,7 +19,7 @@ #ifndef _EMBEDDOC_HXX_ #define _EMBEDDOC_HXX_ -#if defined(_MSC_VER) && (_MSC_VER > 1310) +#ifdef _MSC_VER #pragma warning(disable : 4917 4555) #endif diff --git a/embedserv/source/inc/embeddocaccess.hxx b/embedserv/source/inc/embeddocaccess.hxx index 1b3ff4bd255a..b094ac0b4f8b 100644 --- a/embedserv/source/inc/embeddocaccess.hxx +++ b/embedserv/source/inc/embeddocaccess.hxx @@ -29,7 +29,7 @@ #include <oleidl.h> #ifndef __MINGW32__ -#if defined(_MSC_VER) && (_MSC_VER > 1310) +#ifdef _MSC_VER #pragma warning(disable : 4265) #include <atldbcli.h> #else diff --git a/embedserv/source/inc/iipaobj.hxx b/embedserv/source/inc/iipaobj.hxx index 24dd60b3b944..d4f9f8b2eb02 100644 --- a/embedserv/source/inc/iipaobj.hxx +++ b/embedserv/source/inc/iipaobj.hxx @@ -19,7 +19,7 @@ #ifndef _IIPAOBJ_HXX_ #define _IIPAOBJ_HXX_ -#if defined(_MSC_VER) && (_MSC_VER > 1310) +#ifdef _MSC_VER #pragma warning(disable : 4917 4555) #endif diff --git a/embedserv/source/inc/stdafx.h b/embedserv/source/inc/stdafx.h index c1110ac8ab42..d3109ddf9b91 100644 --- a/embedserv/source/inc/stdafx.h +++ b/embedserv/source/inc/stdafx.h @@ -2,9 +2,9 @@ #if !defined(AFX_STDAFX_H_) #define AFX_STDAFX_H_ -#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/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 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 diff --git a/extensions/test/ole/AxTestComponents/StdAfx.h b/extensions/test/ole/AxTestComponents/StdAfx.h index 3400227d6a5a..f25e075be701 100644 --- a/extensions/test/ole/AxTestComponents/StdAfx.h +++ b/extensions/test/ole/AxTestComponents/StdAfx.h @@ -23,9 +23,9 @@ #if !defined(AFX_STDAFX_H__BFE10EB4_8584_11D4_8335_005004526AB4__INCLUDED_) #define AFX_STDAFX_H__BFE10EB4_8584_11D4_8335_005004526AB4__INCLUDED_ -#if _MSC_VER > 1000 +#ifdef _MSC_VER #pragma once -#endif // _MSC_VER > 1000 +#endif #define STRICT #ifndef _WIN32_WINNT diff --git a/extensions/test/ole/EventListenerSample/EventListener/StdAfx.h b/extensions/test/ole/EventListenerSample/EventListener/StdAfx.h index 4eda34b62c78..b27537feab08 100644 --- a/extensions/test/ole/EventListenerSample/EventListener/StdAfx.h +++ b/extensions/test/ole/EventListenerSample/EventListener/StdAfx.h @@ -23,9 +23,9 @@ #if !defined(AFX_STDAFX_H__E275407A_804A_477E_9A28_F5CA84E711C3__INCLUDED_) #define AFX_STDAFX_H__E275407A_804A_477E_9A28_F5CA84E711C3__INCLUDED_ -#if _MSC_VER > 1000 +#ifdef _MSC_VER #pragma once -#endif // _MSC_VER > 1000 +#endif #define STRICT #ifndef _WIN32_WINNT diff --git a/extensions/test/ole/MfcControl/MfcControl.h b/extensions/test/ole/MfcControl/MfcControl.h index 538e65696b82..ef7a4b4132a3 100644 --- a/extensions/test/ole/MfcControl/MfcControl.h +++ b/extensions/test/ole/MfcControl/MfcControl.h @@ -19,9 +19,9 @@ #if !defined(AFX_MFCCONTROL_H__AC221FBC_A0D8_11D4_833B_005004526AB4__INCLUDED_) #define AFX_MFCCONTROL_H__AC221FBC_A0D8_11D4_833B_005004526AB4__INCLUDED_ -#if _MSC_VER > 1000 +#ifdef _MSC_VER #pragma once -#endif // _MSC_VER > 1000 +#endif // MfcControl.h : main header file for MFCCONTROL.DLL diff --git a/extensions/test/ole/MfcControl/MfcControlCtl.h b/extensions/test/ole/MfcControl/MfcControlCtl.h index 7c02865eea64..fb95d210f8e3 100644 --- a/extensions/test/ole/MfcControl/MfcControlCtl.h +++ b/extensions/test/ole/MfcControl/MfcControlCtl.h @@ -19,9 +19,9 @@ #if !defined(AFX_MFCCONTROLCTL_H__AC221FC3_A0D8_11D4_833B_005004526AB4__INCLUDED_) #define AFX_MFCCONTROLCTL_H__AC221FC3_A0D8_11D4_833B_005004526AB4__INCLUDED_ -#if _MSC_VER > 1000 +#ifdef _MSC_VER #pragma once -#endif // _MSC_VER > 1000 +#endif // MfcControlCtl.h : Declaration of the CMfcControlCtrl ActiveX Control class. diff --git a/extensions/test/ole/MfcControl/MfcControlPpg.h b/extensions/test/ole/MfcControl/MfcControlPpg.h index aadd3fb38624..821152a1ff38 100644 --- a/extensions/test/ole/MfcControl/MfcControlPpg.h +++ b/extensions/test/ole/MfcControl/MfcControlPpg.h @@ -19,9 +19,9 @@ #if !defined(AFX_MFCCONTROLPPG_H__AC221FC5_A0D8_11D4_833B_005004526AB4__INCLUDED_) #define AFX_MFCCONTROLPPG_H__AC221FC5_A0D8_11D4_833B_005004526AB4__INCLUDED_ -#if _MSC_VER > 1000 +#ifdef _MSC_VER #pragma once -#endif // _MSC_VER > 1000 +#endif // MfcControlPpg.h : Declaration of the CMfcControlPropPage property page class. diff --git a/extensions/test/ole/MfcControl/StdAfx.h b/extensions/test/ole/MfcControl/StdAfx.h index 882e5d23e416..b3a303a6c19b 100644 --- a/extensions/test/ole/MfcControl/StdAfx.h +++ b/extensions/test/ole/MfcControl/StdAfx.h @@ -19,9 +19,9 @@ #if !defined(AFX_STDAFX_H__AC221FBA_A0D8_11D4_833B_005004526AB4__INCLUDED_) #define AFX_STDAFX_H__AC221FBA_A0D8_11D4_833B_005004526AB4__INCLUDED_ -#if _MSC_VER > 1000 +#ifdef _MSC_VER #pragma once -#endif // _MSC_VER > 1000 +#endif // stdafx.h : include file for standard system include files, // or project specific include files that are used frequently, diff --git a/extensions/test/ole/cpptest/cpptest.cxx b/extensions/test/ole/cpptest/cpptest.cxx index b711c401e3a2..6c6556cda8e9 100644 --- a/extensions/test/ole/cpptest/cpptest.cxx +++ b/extensions/test/ole/cpptest/cpptest.cxx @@ -20,9 +20,9 @@ // cpptest.cpp : Defines the entry point for the console application. // -#if _MSC_VER > 1000 +#ifdef _MSC_VER #pragma once -#endif // _MSC_VER > 1000 +#endif #pragma warning(disable: 4917) #include <comdef.h> #include <tchar.h> diff --git a/extensions/test/ole/unoTocomCalls/Test/StdAfx.h b/extensions/test/ole/unoTocomCalls/Test/StdAfx.h index 6cd33d8191b2..4a9eda2a51ad 100644 --- a/extensions/test/ole/unoTocomCalls/Test/StdAfx.h +++ b/extensions/test/ole/unoTocomCalls/Test/StdAfx.h @@ -24,9 +24,9 @@ #if !defined(AFX_STDAFX_H__180FF568_6F5C_11D4_8330_005004526AB4__INCLUDED_) #define AFX_STDAFX_H__180FF568_6F5C_11D4_8330_005004526AB4__INCLUDED_ -#if _MSC_VER > 1000 +#ifdef _MSC_VER #pragma once -#endif // _MSC_VER > 1000 +#endif #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.h b/extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.h index f837a8c37732..b35c1ddc8df9 100644 --- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.h +++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.h @@ -23,9 +23,9 @@ #if !defined(AFX_STDAFX_H__180FF556_6F5C_11D4_8330_005004526AB4__INCLUDED_) #define AFX_STDAFX_H__180FF556_6F5C_11D4_8330_005004526AB4__INCLUDED_ -#if _MSC_VER > 1000 +#ifdef _MSC_VER #pragma once -#endif // _MSC_VER > 1000 +#endif #define STRICT #ifndef _WIN32_WINNT diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx index 851346d581b3..dd22a75044fa 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx @@ -20,7 +20,7 @@ #ifndef FPICKER_WIN32_VISTA_FILEPICKER_EVENTHANDLER_HXX #define FPICKER_WIN32_VISTA_FILEPICKER_EVENTHANDLER_HXX -#if defined(_MSC_VER) && (_MSC_VER >= 1400) +#ifdef _MSC_VER #pragma warning( disable : 4917 ) #endif diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx index 364ed66acccc..15ed136b5d8c 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx @@ -20,7 +20,7 @@ #ifndef FPICKER_WIN32_VISTA_FILEPICKERIMPL_HXX #define FPICKER_WIN32_VISTA_FILEPICKERIMPL_HXX -#if defined(_MSC_VER) && (_MSC_VER >= 1400) +#ifdef _MSC_VER #pragma warning( disable : 4917 ) #endif diff --git a/neon/configs/config.h b/neon/configs/config.h index b677e7ece95d..6f715e3aedd0 100644 --- a/neon/configs/config.h +++ b/neon/configs/config.h @@ -282,15 +282,13 @@ #endif /* Define to 1 if you have the `vsnprintf' function. */ -#if defined( UNX ) || (defined(_MSC_VER) && (_MSC_VER > 1400)) +#if defined( UNX ) || defined(_MSC_VER) #define HAVE_VSNPRINTF 1 #endif -#ifdef WIN32 -#if (defined(_MSC_VER) && (_MSC_VER < 1500)) || defined(__MINGW32__) +#ifdef __MINGW32__ #define vsnprintf _vsnprintf #endif -#endif /* Define to be location of localedir */ /* #undef LOCALEDIR */ diff --git a/rsc/inc/rsclex.hxx b/rsc/inc/rsclex.hxx index 838bf845721d..a2ad19f32fb3 100644 --- a/rsc/inc/rsclex.hxx +++ b/rsc/inc/rsclex.hxx @@ -100,11 +100,7 @@ extern "C" int yyparse(); // forward Deklaration fuer erzeugte Funktion extern "C" void yyerror( const char * ); extern "C" int yylex( void ); #else -#if defined ( GCC ) || (_MSC_VER >= 1400) int yyparse(); // forward Deklaration fuer erzeugte Funktion -#else -yyparse(); // forward Deklaration fuer erzeugte Funktion -#endif void yyerror( char * ); int yylex( void ); #endif diff --git a/rsc/source/parser/rsckey.cxx b/rsc/source/parser/rsckey.cxx index dda03cfd1760..6667ee058fe9 100644 --- a/rsc/source/parser/rsckey.cxx +++ b/rsc/source/parser/rsckey.cxx @@ -27,7 +27,7 @@ #include <rschash.hxx> #include <rsckey.hxx> -#if defined(_MSC_VER) && (_MSC_VER >= 1200 ) +#ifdef _MSC_VER #define _cdecl __cdecl #endif diff --git a/sal/inc/sal/config.h b/sal/inc/sal/config.h index 01a093b18135..03e24c6c6394 100644 --- a/sal/inc/sal/config.h +++ b/sal/inc/sal/config.h @@ -39,20 +39,6 @@ #define _USE_MATH_DEFINES // needed by Visual C++ for math constants #endif -/* warnings ought to be disabled using /wd:n option of msvc.net compiler */ -#if _MSC_VER < 1300 -/* no performance warning: int to bool */ -#pragma warning( disable : 4800 ) - -/* No warning for: C++ Exception Specification ignored */ -#pragma warning( disable : 4290 ) - -#if OSL_DEBUG_LEVEL > 0 -/* No warning for: identifier was truncated to '255' characters in the browser information */ -#pragma warning( disable : 4786 ) -#endif -#endif /* defined _MSC_VER < 1300 */ - #endif /* defined _MSC_VER */ /* Provide ISO C99 compatible versions of snprint and vsnprintf */ diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h index 3e3dc7c3cdcd..318bfa7bfa68 100644 --- a/sal/inc/sal/types.h +++ b/sal/inc/sal/types.h @@ -84,7 +84,7 @@ typedef unsigned char sal_uInt8; #error "Could not find 32-bit type, add support for your architecture" #endif -#if defined _MSC_VER && _MSC_VER >= 1000 +#ifdef _MSC_VER typedef __int64 sal_Int64; typedef unsigned __int64 sal_uInt64; diff --git a/sal/rtl/source/string.cxx b/sal/rtl/source/string.cxx index 89d69c592ed2..a68c0932d115 100644 --- a/sal/rtl/source/string.cxx +++ b/sal/rtl/source/string.cxx @@ -19,7 +19,7 @@ #include "sal/config.h" -#if defined(_MSC_VER) && (_MSC_VER >= 1400) +#ifdef _MSC_VER #pragma warning(disable:4738) // storing 32-bit float result in memory, possible loss of performance #endif diff --git a/sal/rtl/source/ustring.cxx b/sal/rtl/source/ustring.cxx index 0216428da5ab..bdebd897a71b 100644 --- a/sal/rtl/source/ustring.cxx +++ b/sal/rtl/source/ustring.cxx @@ -19,7 +19,7 @@ #include "sal/config.h" -#if defined(_MSC_VER) && (_MSC_VER >= 1400) +#ifdef _MSC_VER #pragma warning(disable:4738) // storing 32-bit float result in memory, possible loss of performance #endif diff --git a/sal/systools/win32/uwinapi/legacy.c b/sal/systools/win32/uwinapi/legacy.c index 2218d1d77a8a..3a7c54c6dff5 100644 --- a/sal/systools/win32/uwinapi/legacy.c +++ b/sal/systools/win32/uwinapi/legacy.c @@ -25,7 +25,7 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> -#if defined(_MSC_VER) && (_MSC_VER >= 1400) +#ifdef _MSC_VER #pragma warning(disable:4273) // inconsistent dll linkage #endif diff --git a/sal/systools/win32/uwinapi/sntprintf.c b/sal/systools/win32/uwinapi/sntprintf.c index 704c0887fa7a..12eaee9f252d 100644 --- a/sal/systools/win32/uwinapi/sntprintf.c +++ b/sal/systools/win32/uwinapi/sntprintf.c @@ -29,11 +29,11 @@ #include <tchar.h> #include <systools/win32/snprintf.h> -#if defined(_MSC_VER) && (_MSC_VER >= 1400) +#ifdef _MSC_VER #pragma warning(disable:4273) // inconsistent dll linkage #endif -#if (defined(_MSC_VER) && (_MSC_VER < 1300)) || (defined(__MINGW32_VERSION) && ((__MINGW32_MAJOR_VERSION < 3)||((__MINGW32_MAJOR_VERSION == 3)&&(__MINGW32_MINOR_VERSION < 18)))) +#if defined(__MINGW32_VERSION) && ((__MINGW32_MAJOR_VERSION < 3)||((__MINGW32_MAJOR_VERSION == 3)&&(__MINGW32_MINOR_VERSION < 18))) /* The non-debug versions of _vscprintf/_scprintf are just calls to _vsprintf/_sprintf with string buffer pointer set to NULL, diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx index 352b3ab5a6e4..1c72e6d1605b 100644 --- a/sc/source/filter/ftools/ftools.cxx +++ b/sc/source/filter/ftools/ftools.cxx @@ -48,13 +48,6 @@ // ============================================================================ // ScFilterTools::ReadLongDouble() -#ifdef _MSC_VER -#if _MSC_VER <= 800 -#undef __SIMPLE_FUNC -#define __SIMPLE_FUNC -#endif -#endif - double ScfTools::ReadLongDouble( SvStream& rStrm ) #ifdef __SIMPLE_FUNC // for <=VC 1.5 diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index fa0eb80f0245..c41aa8db2957 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -84,12 +84,6 @@ #include <sfx2/request.hxx> #include <boost/bind.hpp> -#ifdef _MSC_VER -#if (_MSC_VER < 1400) -#pragma optimize ( "", off ) -#endif -#endif - using namespace com::sun::star; namespace sd { @@ -1348,10 +1342,4 @@ sal_Int8 DrawViewShell::ExecuteDrop ( } // end of namespace sd -#ifdef _MSC_VER -#if (_MSC_VER < 1400) -#pragma optimize ( "", on ) -#endif -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index 0138f4168a00..2e6ba668a22b 100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if defined(_MSC_VER) && (_MSC_VER >= 1300) +#ifdef _MSC_VER #pragma warning( disable : 4290 ) #endif #include <com/sun/star/document/UpdateDocMode.hpp> diff --git a/shell/source/win32/shlxthandler/res/rcheader.txt b/shell/source/win32/shlxthandler/res/rcheader.txt index fac9fa31f256..f2d716b65971 100644 --- a/shell/source/win32/shlxthandler/res/rcheader.txt +++ b/shell/source/win32/shlxthandler/res/rcheader.txt @@ -1,12 +1,8 @@ -#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 #include "internal/resource.h" diff --git a/sot/source/sdstor/stgole.cxx b/sot/source/sdstor/stgole.cxx index 9616347cb476..e4f90ca2636f 100644 --- a/sot/source/sdstor/stgole.cxx +++ b/sot/source/sdstor/stgole.cxx @@ -23,7 +23,7 @@ #include "stgole.hxx" #include "sot/storinfo.hxx" // Read/WriteClipboardFormat() -#if defined(_MSC_VER) && (_MSC_VER>=1400) +#ifdef _MSC_VER #pragma warning(disable: 4342) #endif ///////////////////////// class StgInternalStream //////////////////////// diff --git a/tools/inc/tools/solar.h b/tools/inc/tools/solar.h index 48d57ce7f6f6..74df22f58843 100644 --- a/tools/inc/tools/solar.h +++ b/tools/inc/tools/solar.h @@ -36,11 +36,7 @@ typedef sal_uIntPtr sal_uLong; /* Replaces type ULONG */ #define DELETEZ( p ) ( delete p,p = 0 ) #ifdef WNT -#if defined (_MSC_VER) && ( _MSC_VER < 1200 ) -#define __LOADONCALLAPI _cdecl -#else #define __LOADONCALLAPI __cdecl -#endif #else #define __LOADONCALLAPI #endif diff --git a/ucb/source/ucp/webdav/DAVSession.hxx b/ucb/source/ucp/webdav/DAVSession.hxx index d0e3cc90ae7a..ebb7fd2162e2 100644 --- a/ucb/source/ucp/webdav/DAVSession.hxx +++ b/ucb/source/ucp/webdav/DAVSession.hxx @@ -203,12 +203,7 @@ private: oslInterlockedCount m_nRefCount; friend class DAVSessionFactory; -#if defined WNT && _MSC_VER < 1310 - friend struct std::auto_ptr< DAVSession >; - // work around compiler bug... -#else // WNT friend class std::auto_ptr< DAVSession >; -#endif // WNT }; } // namespace http_dav_ucp diff --git a/unoxml/source/dom/saxbuilder.cxx b/unoxml/source/dom/saxbuilder.cxx index cd7045652f1e..459cd6bb9ee9 100644 --- a/unoxml/source/dom/saxbuilder.cxx +++ b/unoxml/source/dom/saxbuilder.cxx @@ -16,7 +16,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#if defined(_MSC_VER) && (_MSC_VER > 1310) +#ifdef _MSC_VER #pragma warning(disable : 4701) #endif diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx index 90bfd06db0bd..ce1e7ec55cca 100644 --- a/vcl/inc/vcl/outdev.hxx +++ b/vcl/inc/vcl/outdev.hxx @@ -769,7 +769,7 @@ public: const Gradient& rGradient, GDIMetaFile& rMtf ); -#if defined(_MSC_VER) && (_MSC_VER >= 1400) +#ifdef _MSC_VER void DrawHatch( const PolyPolygon& rPolyPoly, const ::Hatch& rHatch ); void AddHatchActions( const PolyPolygon& rPolyPoly, const ::Hatch& rHatch, diff --git a/vcl/inc/vcl/sysdata.hxx b/vcl/inc/vcl/sysdata.hxx index 8a2859d817fc..bf5f337e6d87 100644 --- a/vcl/inc/vcl/sysdata.hxx +++ b/vcl/inc/vcl/sysdata.hxx @@ -46,12 +46,12 @@ class UIView; #endif #if defined( WNT ) -#if _MSC_VER >= 1200 +#ifdef _MSC_VER #pragma warning(push) #pragma warning(disable:4201) #endif #include <windef.h> -#if _MSC_VER >= 1200 +#ifdef _MSC_VER #pragma warning(pop) #endif #endif diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index 88ae0f15eda7..f2110d54677b 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -54,7 +54,7 @@ #include <vcl/svapp.hxx> // Warning in SDK header -#if defined(_MSC_VER) && (_MSC_VER > 1400) +#ifdef _MSC_VER #pragma warning( disable: 4242 4244 ) #endif #include <win/wincomp.hxx> diff --git a/xmloff/inc/xmloff/xformsimport.hxx b/xmloff/inc/xmloff/xformsimport.hxx index 06710bc71145..f98a3356858c 100644 --- a/xmloff/inc/xmloff/xformsimport.hxx +++ b/xmloff/inc/xmloff/xformsimport.hxx @@ -29,10 +29,6 @@ class SvXMLImport; class SvXMLImportContext; namespace rtl { class OUString; } -#if defined(WNT) && _MSC_VER < 1400 -namespace std { template<typename A, typename B> struct pair; } -#endif - namespace com { namespace sun { namespace star { namespace uno { template<typename T> class Reference; } namespace beans { class XPropertySet; struct PropertyValue; } |