[Libreoffice-commits] .: 5 commits - avmedia/source bridges/source cli_ure/source codemaker/inc configure.ac connectivity/source cppu/inc crashrep/source dbaccess/source desktop/source desktop/win32 dtrans/source editeng/source embedserv/source extensions/source extensions/test fpicker/source neon/configs oowintool rsc/inc rsc/source sal/inc sal/rtl sal/systools sc/source sd/source sfx2/source shell/source sot/source tools/inc ucb/source unoxml/source vcl/inc vcl/win xmloff/inc
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Nov 28 10:56:55 PST 2012
avmedia/source/win/framegrabber.cxx | 4
bridges/source/cpp_uno/msvc_win32_intel/except.cxx | 27 ---
bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx | 18 --
cli_ure/source/uno_bridge/cli_bridge.cxx | 10 -
codemaker/inc/codemaker/global.hxx | 5
configure.ac | 77 ++++++----
connectivity/source/drivers/postgresql/pq_allocator.hxx | 11 -
cppu/inc/cppu/unotype.hxx | 6
crashrep/source/win32/rcheader.txt | 4
dbaccess/source/ui/inc/sbagrid.hxx | 4
desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 4
desktop/win32/source/QuickStart/StdAfx.h | 4
dtrans/source/win32/dtobj/DOTransferable.cxx | 5
dtrans/source/win32/dtobj/DataFmtTransl.cxx | 3
editeng/source/uno/unotext.cxx | 2
embedserv/source/embed/docholder.cxx | 4
embedserv/source/embed/ed_idataobj.cxx | 2
embedserv/source/embed/ed_ipersiststr.cxx | 2
embedserv/source/embed/esdll.cxx | 2
embedserv/source/embed/guid.cxx | 2
embedserv/source/embed/register.cxx | 2
embedserv/source/embed/servprov.cxx | 2
embedserv/source/embed/syswinwrapper.cxx | 2
embedserv/source/embed/tracker.cxx | 2
embedserv/source/inc/embeddoc.hxx | 2
embedserv/source/inc/embeddocaccess.hxx | 2
embedserv/source/inc/iipaobj.hxx | 2
embedserv/source/inc/stdafx.h | 4
extensions/source/activex/SOActionsApproval.cxx | 2
extensions/source/activex/SOActionsApproval.h | 6
extensions/source/activex/SOActiveX.h | 2
extensions/source/activex/SOComWindowPeer.cxx | 2
extensions/source/activex/SOComWindowPeer.h | 6
extensions/source/activex/SODispatchInterceptor.cxx | 2
extensions/source/activex/SODispatchInterceptor.h | 6
extensions/source/activex/StdAfx2.cxx | 2
extensions/source/activex/StdAfx2.h | 4
extensions/source/activex/so_activex.rc | 4
extensions/source/ole/ole2uno.hxx | 6
extensions/source/ole/oledll.cxx | 2
extensions/source/ole/oleobjw.hxx | 2
extensions/source/ole/olethread.cxx | 2
extensions/source/ole/servprov.cxx | 2
extensions/source/ole/unoobjw.cxx | 2
extensions/test/ole/AxTestComponents/StdAfx.h | 4
extensions/test/ole/EventListenerSample/EventListener/StdAfx.h | 4
extensions/test/ole/MfcControl/MfcControl.h | 4
extensions/test/ole/MfcControl/MfcControlCtl.h | 4
extensions/test/ole/MfcControl/MfcControlPpg.h | 4
extensions/test/ole/MfcControl/StdAfx.h | 4
extensions/test/ole/cpptest/cpptest.cxx | 4
extensions/test/ole/unoTocomCalls/Test/StdAfx.h | 4
extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.h | 4
fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx | 2
fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx | 2
neon/configs/config.h | 6
oowintool | 46 +++--
rsc/inc/rsclex.hxx | 4
rsc/source/parser/rsckey.cxx | 2
sal/inc/sal/config.h | 14 -
sal/inc/sal/types.h | 2
sal/rtl/source/string.cxx | 2
sal/rtl/source/ustring.cxx | 2
sal/systools/win32/uwinapi/legacy.c | 2
sal/systools/win32/uwinapi/sntprintf.c | 4
sc/source/filter/ftools/ftools.cxx | 7
sd/source/ui/view/drviews1.cxx | 12 -
sfx2/source/appl/appuno.cxx | 2
shell/source/win32/shlxthandler/res/rcheader.txt | 4
sot/source/sdstor/stgole.cxx | 2
tools/inc/tools/solar.h | 4
ucb/source/ucp/webdav/DAVSession.hxx | 5
unoxml/source/dom/saxbuilder.cxx | 2
vcl/inc/vcl/outdev.hxx | 2
vcl/inc/vcl/sysdata.hxx | 4
vcl/win/source/window/salframe.cxx | 2
xmloff/inc/xmloff/xformsimport.hxx | 4
77 files changed, 170 insertions(+), 270 deletions(-)
New commits:
commit c87389c7680481da2a96d4f4e0615913f0054da9
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Wed Nov 28 20:52:32 2012 +0200
Add comment about Windows SDK 8
Change-Id: I91abacdbe75b36a61e110068e300c54c08c7ead2
diff --git a/configure.ac b/configure.ac
index b21a59b..5ebf6ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8997,8 +8997,22 @@ if test "$_os" = "WINNT"; then
WINDOWS_SDK_HOME=`cygpath -d "$WINDOWS_SDK_HOME"`
WINDOWS_SDK_HOME=`cygpath -u "$WINDOWS_SDK_HOME"`
- #If this sdk is incomplete, lets see if the one
- #recommended to be installed is available
+ # If this sdk is incomplete, lets see if the one
+ # recommended to be installed is available.
+
+ # This refers to the Windows SDK 8 (as distributed
+ # with Visual Studio 2012, or maybe also
+ # separately), I assume.
+
+ # I wouldn't say that it is "incomplete", it is
+ # just structured differtently. We do seem to try
+ # to adapt to that structure below (look for the
+ # Include/um etc stuff), so rejecting it here is a
+ # bit premature... *but* then one notices that
+ # compiling with MSVS2008 and trying to use SDK 8
+ # leads to horrible errors in ICU at least. Oh
+ # well.
+
if test ! -x "$WINDOWS_SDK_HOME/bin/msiinfo.exe"; then
WINDOWS_SDK7_HOME=`cat "/proc/registry/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft SDKs/Windows/v7.1/InstallationFolder" 2> /dev/null | tr '\000' '\n' | head -n 1`
if test -n "$WINDOWS_SDK7_HOME"; then
commit 13fa5d94f287f6e6bba767bd491731667f921b48
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Wed Nov 28 19:57:41 2012 +0200
Make print_al_home more reliable
Change-Id: Ib979916a32a9a9ea8ae1e711559613e8b6b3dfe9
diff --git a/oowintool b/oowintool
index c7be356..d927169 100755
--- a/oowintool
+++ b/oowintool
@@ -2,6 +2,7 @@
# -*- tab-width: 4; cperl-indent-level: 4; indent-tabs-mode: nil -*-
use File::Copy;
+use File::Glob;
my $output_format = 'u';
@@ -27,17 +28,6 @@ sub reg_get_value($)
return $value;
}
-sub reg_find_key($)
-{
- # it is believed that the registry moves keys around
- # depending on OS version, this will de-mangle that
- my $key = shift;
- $key =~ s| |\\ |;
- $key = `cd /proc/registry/ ; ls $key 2>/dev/null`;
-
- return $key;
-}
-
sub print_syntax()
{
print "oowintool [option] ...\n";
@@ -99,6 +89,7 @@ sub print_windows_sdk_home()
{
my ($value, $key);
+ # This is for the Windows SDK 8 distributed with MSVS 2012
$value = reg_get_value ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Windows Kits/Installed Roots/KitsRoot');
if (!defined $value) {
@@ -108,10 +99,13 @@ sub print_windows_sdk_home()
$value = reg_get_value ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/Directories/Install Dir');
}
-
if (!defined $value) {
- $key = reg_find_key ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/*/Install Dir');
- $value = reg_get_value ($key);
+ # Unclear whether we ever get here, don't the above match any
+ # recent Windows SDK?
+ foreach $key (File::Glob::bsd_glob('/proc/registry/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MicrosoftSDK/InstalledSDKs/*/Install Dir')) {
+ $value = reg_get_value ($key);
+ last if defined $value;
+ }
}
defined $value || die "Windows SDK not found";
@@ -121,12 +115,32 @@ sub print_windows_sdk_home()
sub print_al_home()
{
+ # Called by configure only if al.exe is not in the Windows SDK's
+ # bin folder, where it AFAIK always is in any recent Windows SDK,
+ # so whether this will ever be called is unclear...
+
my ($value, $key);
- $key = reg_find_key ('HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft SDKs/Windows/*/WinSDK-NetFx40Tools/InstallationFolder');
+ foreach $key (File::Glob::bsd_glob('/proc/registry/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft SDKs/Windows/*/WinSDK-NetFx40Tools/InstallationFolder')) {
+ $key =~ s!^/proc/registry/!!;
$value = reg_get_value ($key);
- print cygpath ($value, 'w', $output_format);
+ # Sigh, the same test that configure does for al.exe
+ # being either directly in it, or in a "bin" subdir... But on
+ # the other hand we don't want to be mislead by a registry key
+ # that matches the above but points to a directory that does
+ # in fact not contain an al.exe. For me,
+ # HKLM/SOFTWARE/Microsoft/Microsoft SDKs/Windows/v7.0A/WinSDK-NetFx40Tools/InstallationFolder
+ # contains
+ # c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\bin\NETFX 4.0 Tools\
+ # but that then does not contain any al.exe.
+
+ if (-f "$value/bin/al.exe" || -f "$value/al.exe") {
+ print cygpath ($value, 'w', $output_format);
+ return;
+ }
+ }
+ die "Can't find al.exe";
}
my %msvs_2008 = (
commit adcb31d12166a6117b2800eb3a7d32ace9efd9f7
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Wed Nov 28 19:52:00 2012 +0200
Use uniform spacing before the "then" of if statements
Change-Id: I657f14b26f76b874fd6d84eb6ae2009dfcbd0f88
diff --git a/configure.ac b/configure.ac
index 4c9f370..b21a59b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,7 +53,7 @@ cat /dev/null > warn
have_WARNINGS="no"
add_warning()
{
- if test "$have_WARNINGS" = "no" ; then
+ if test "$have_WARNINGS" = "no"; then
echo "*************************************" >> warn
have_WARNINGS="yes"
if which tput >/dev/null 2>/dev/null && test `tput colors` -ge 8; then
@@ -66,7 +66,7 @@ add_warning()
echo "$COLORWARN $@" >> warn
}
-if test -n "$SOLARENV" ; then
+if test -n "$SOLARENV"; then
AC_MSG_ERROR([You have sourced config_host.mk in this shell. This may lead to trouble, please run in a fresh (login) shell.])
fi
@@ -3068,7 +3068,7 @@ if test "$_os" = "WINNT"; then
dnl Check for mspdb80.dll/mspdb100.dll/mspdb110.dll
dnl ===========================================================
dnl MSVS 2008/10/12 Compiler
- if test -n "$with_mspdb_path";then
+ if test -n "$with_mspdb_path"; then
with_mspdb_path=`cygpath -u "$with_mspdb_path"`
fi
if test -e "$with_mspdb_path/mspdb80.dll" -o -e "$with_mspdb_path/mspdb100.dll" -o -e "$with_mspdb_path/mspdb110.dll"; then
@@ -3091,7 +3091,7 @@ if test "$_os" = "WINNT"; then
MSPDB_PATH="$with_cl_home/../Common7/IDE"
fi
- if test -z "$MSPDB_PATH";then
+ if test -z "$MSPDB_PATH"; then
dnl AC_PATH_PROG only checks if MSPDB_PATH is still empty
AC_PATH_PROG(MSPDB_PATH, mspdb80.dll)
AC_PATH_PROG(MSPDB_PATH, mspdb100.dll)
@@ -4555,7 +4555,7 @@ all:
EOF
$GNUMAKE -C $TESTGMAKEFILEFUNC 2>/dev/null 1>&2
-if test -f $TESTGMAKEFILEFUNC/test.txt ; then
+if test -f $TESTGMAKEFILEFUNC/test.txt; then
HAVE_GNUMAKE_FILE_FUNC="YES"
AC_MSG_RESULT([yes])
else
@@ -4722,12 +4722,12 @@ dnl ===================================================================
if test "$build_os" = "cygwin"; then
dnl Check midl.exe
AC_PATH_PROG(MIDL_PATH, midl.exe)
- if test -n "$MIDL_PATH";then
+ if test -n "$MIDL_PATH"; then
MIDL_PATH=`dirname "$MIDL_PATH"`
else
AC_MSG_CHECKING([for midl.exe more thoroughly])
fi
- if test -n "$with_midl_path";then
+ if test -n "$with_midl_path"; then
with_midl_path=`cygpath -u "$with_midl_path"`
fi
if test -x "$with_midl_path/midl.exe"; then
@@ -4761,10 +4761,10 @@ if test "$build_os" = "cygwin"; then
dnl Check csc.exe
AC_PATH_PROG(CSC_PATH, csc.exe)
- if test -n "$CSC_PATH";then
+ if test -n "$CSC_PATH"; then
CSC_PATH=`dirname "$CSC_PATH"`
fi
- if test -n "$with_csc_path";then
+ if test -n "$with_csc_path"; then
with_csc_path=`cygpath -u "$with_csc_path"`
else
AC_MSG_CHECKING([for csc.exe more thoroughly])
@@ -4788,12 +4788,12 @@ if test "$build_os" = "cygwin"; then
dnl Check al.exe
AC_PATH_PROG(AL_PATH, al.exe)
- if test -n "$AL_PATH";then
+ if test -n "$AL_PATH"; then
AL_PATH=`dirname "$AL_PATH"`
else
AC_MSG_CHECKING([for al.exe more thoroughly])
fi
- if test -n "$with_al_path";then
+ if test -n "$with_al_path"; then
with_al_path=`cygpath -u "$with_al_path"`
fi
if test -x "$with_al_path/al.exe"; then
@@ -5207,7 +5207,7 @@ using namespace std;
if test -n "$MINGW_GXXDLL"; then
mingw_gxxdll_root=${MINGW_GXXDLL%.dll}
mingw_gxxdll_root=${mingw_gxxdll_root#lib}
- if test "$CROSS_COMPILING" = "YES" ; then
+ if test "$CROSS_COMPILING" = "YES"; then
dnl m4 escaping!
mingw_gxxdll_root=${mingw_gxxdll_root%-[[0-9]]}
fi
@@ -6723,7 +6723,7 @@ dnl ===================================================================
dnl We need winegcc when building MinGW build to be able to cross-build msi tools
dnl ===================================================================
WINEGCC=
-if test "$enable_winegcc" = "yes" ; then
+if test "$enable_winegcc" = "yes"; then
AC_PATH_PROG(WINEGCC, winegcc)
if test "$WINEGCC" = ""; then
AC_MSG_ERROR([winegcc was not found, please install wine-devel, or wine-devel-32bit])
@@ -8198,7 +8198,7 @@ else
uwin=`cygpath -d "$WINDIR"`
uwin=`cygpath -u "$uwin"`
#if we have one we have all
- if test -e $uwin/winsxs/x86_microsoft.vc80.crt_1fc8b3b9a1e18e3b_8.0.50727.4053* ; then
+ if test -e $uwin/winsxs/x86_microsoft.vc80.crt_1fc8b3b9a1e18e3b_8.0.50727.4053*; then
MSVC80_DLL_DIR=`cd $uwin/winsxs/; ls -d x86_microsoft.vc80.crt_1fc8b3b9a1e18e3b_8.0.50727.4053*`
MSVC80_MNFST=`ls $uwin/winsxs/Manifests/x86_microsoft.vc80.crt_1fc8b3b9a1e18e3b_8.0.50727.4053_*.manifest`
AC_MSG_RESULT([Found])
@@ -10517,9 +10517,9 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE"; then
dnl Check for qmake
AC_PATH_PROG( QMAKEQT4, qmake-qt4, no, [`dirname $qt_header_dir`/bin:$QT4DIR/bin:$PATH] )
QMAKE4="$QMAKEQT4"
- if test "$QMAKE4" = "no" ; then
+ if test "$QMAKE4" = "no"; then
AC_PATH_PROG( QMAKE4, qmake, no, [`dirname $qt_header_dir`/bin:$QT4DIR/bin:$PATH] )
- if test "$QMAKE4" = "no" ; then
+ if test "$QMAKE4" = "no"; then
AC_MSG_ERROR([Qmake not found. Please specify
the root of your Qt installation by exporting QT4DIR before running "configure".])
fi
@@ -11256,7 +11256,7 @@ if test "$GUIBASE" = "unx"; then
test_cairo=yes
fi
-if test "$test_cairo" = "yes" ; then
+if test "$test_cairo" = "yes"; then
AC_MSG_CHECKING([whether to use the system cairo])
if test "$with_system_cairo" = "yes"; then
@@ -11882,8 +11882,8 @@ fi
AC_SUBST(INTRO_BITMAP)
AC_MSG_CHECKING([for yet another 'about' svg])
-if test -z "$with_about_background_svg" -o "$with_about_background_svg" = "no" ; then
- if test "$with_about_background_svg" = "no" ; then
+if test -z "$with_about_background_svg" -o "$with_about_background_svg" = "no"; then
+ if test "$with_about_background_svg" = "no"; then
ABOUT_BACKGROUND_SVG=
fi
AC_MSG_RESULT([none])
@@ -11897,8 +11897,8 @@ fi
AC_SUBST(ABOUT_BACKGROUND_SVG)
AC_MSG_CHECKING([for yet another 'flat_logo' svg])
-if test -z "$with_flat_logo_svg" -o "$with_flat_logo_svg" = "no" ; then
- if test "$with_flat_logo_svg" = "no" ; then
+if test -z "$with_flat_logo_svg" -o "$with_flat_logo_svg" = "no"; then
+ if test "$with_flat_logo_svg" = "no"; then
FLAT_LOGO_SVG=
fi
AC_MSG_RESULT([none])
@@ -12213,7 +12213,7 @@ fi
# ===================================================================
AC_MSG_CHECKING([whether to create huge library])
MERGELIBS=
-if test "$enable_mergelibs" = "yes" ; then
+if test "$enable_mergelibs" = "yes"; then
if test $_os != Linux -a $_os != Android -a $_os != WINNT; then
add_warning "--enable-mergelibs is not tested for this platform"
fi
commit 22daf988cee75a7ba4ccb63b4ddcda7cdba62a01
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Wed Nov 28 19:47:21 2012 +0200
More informative logging for the search for midl.exe, csc.exe and al.exe
Also adapt to the "bin" structure of the Windows Kit 8, where there
are no tools directly in "bin" but only in the "x86" and "amd674"
subdirectories.
Change-Id: Id3aaaaaba6f4386a54e7becbb2d4fc66a8f5a0d8
diff --git a/configure.ac b/configure.ac
index 2599d4b..4c9f370 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4724,6 +4724,8 @@ if test "$build_os" = "cygwin"; then
AC_PATH_PROG(MIDL_PATH, midl.exe)
if test -n "$MIDL_PATH";then
MIDL_PATH=`dirname "$MIDL_PATH"`
+ else
+ AC_MSG_CHECKING([for midl.exe more thoroughly])
fi
if test -n "$with_midl_path";then
with_midl_path=`cygpath -u "$with_midl_path"`
@@ -4750,6 +4752,8 @@ if test "$build_os" = "cygwin"; then
fi
if test ! -x "$MIDL_PATH/midl.exe"; then
AC_MSG_ERROR([midl.exe not found. Make sure it's in PATH or use --with-midl-path])
+ else
+ AC_MSG_RESULT([$MIDL_PATH/midl.exe])
fi
# Convert to posix path with 8.3 filename restrictions ( No spaces )
MIDL_PATH=`cygpath -d "$MIDL_PATH"`
@@ -4762,6 +4766,8 @@ if test "$build_os" = "cygwin"; then
fi
if test -n "$with_csc_path";then
with_csc_path=`cygpath -u "$with_csc_path"`
+ else
+ AC_MSG_CHECKING([for csc.exe more thoroughly])
fi
if test -x "$with_csc_path/csc.exe"; then
CSC_PATH="$with_csc_path"
@@ -4773,6 +4779,8 @@ if test "$build_os" = "cygwin"; then
fi
if test ! -x "$CSC_PATH/csc.exe"; then
AC_MSG_ERROR([csc.exe not found. Make sure it's in the path or use --with-csc-path])
+ else
+ AC_MSG_RESULT([$CSC_PATH/csc.exe])
fi
# Convert to posix path with 8.3 filename restrictions ( No spaces )
CSC_PATH=`cygpath -d "$CSC_PATH"`
@@ -4782,6 +4790,8 @@ if test "$build_os" = "cygwin"; then
AC_PATH_PROG(AL_PATH, al.exe)
if test -n "$AL_PATH";then
AL_PATH=`dirname "$AL_PATH"`
+ else
+ AC_MSG_CHECKING([for al.exe more thoroughly])
fi
if test -n "$with_al_path";then
with_al_path=`cygpath -u "$with_al_path"`
@@ -4793,6 +4803,8 @@ if test "$build_os" = "cygwin"; then
winsdktest=`./oowintool --windows-sdk-home`
if test -x "$winsdktest/Bin/al.exe"; then
AL_PATH="$winsdktest/Bin"
+ elif test -x "$winsdktest/Bin/$SDK_ARCH/al.exe"; then
+ AL_PATH="$winsdktest/Bin/$SDK_ARCH"
fi
fi
if test -z "$AL_PATH"; then
@@ -4805,7 +4817,10 @@ if test "$build_os" = "cygwin"; then
fi
if test ! -x "$AL_PATH/al.exe"; then
AC_MSG_ERROR([al.exe not found. Make sure it's in PATH or use --with-al-path])
+ else
+ AC_MSG_RESULT([$AL_PATH/al.exe])
fi
+
# Convert to posix path with 8.3 filename restrictions ( No spaces )
AL_PATH=`cygpath -d "$AL_PATH"`
AL_PATH=`cygpath -u "$AL_PATH"`
commit a3ce60eb3c8bb5c69ab41556398efa8316286477
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Tue Nov 27 14:41:16 2012 +0200
We only support MSVC 2008 (_MSC_VER 1500) or later
We can drop or simplify many conditionals.
Change-Id: I37e820e515cc09845c30b62c89ddb3b6ff370f97
diff --git a/avmedia/source/win/framegrabber.cxx b/avmedia/source/win/framegrabber.cxx
index 612ace8..e72fc16 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 9430f29..497958d 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 0a48f5c..5f47dc5 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 6da6cdf..4d6a4e3 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 f4eff3d..17f78a8 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 dadeb8e..78d1dfa 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 23d2dde..2861bdb 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 bd831a3..be3c060 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 f0db801..55491b1 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 00936b6..bd83d12 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 b8b138d..ce29121 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 003a02a..15f8fb9 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 a990b70..c3ba962 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 589b693..3b5033b 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 cf2b71c..8ddfb66 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 7dc8824..c62f6ea 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 783ab45..f65cd01 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 6df9c2e..b5aa6b7 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 a04dcd1..b7520cd 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 e6d1fff..1ce0a67 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 e6fb958..739a308 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 b9ad367..0621eb5 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 edaff01..61338db 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 3eab4a0..1962c54 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 1b3ff4b..b094ac0 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 24dd60b..d4f9f8b 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 c1110ac..d3109dd 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 cb18c84..d184d49 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 1790c78..de2cf52 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 e2e5b68..4bef47a 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 a9d6379..298e320 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 d8c4d2d..0e8dc37 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 6ac0e8a..4663d3f 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 e90bbef..d873c6b 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 a2bfea9..82a8f54 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 1850322..c1ef7e5 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 1bc77e3..4f7246e 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 342d28b..5b281a5 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 8109f49..a4b7595 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 b84f20c..f10a95a 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 eda5aee..a7e5fc8 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 e8f7195..10fb507 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 95d9cd6..069da1e 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 3400227..f25e075 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 4eda34b..b27537f 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 538e656..ef7a4b4 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 7c02865..fb95d21 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 aadd3fb..821152a 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 882e5d2..b3a303a 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 b711c40..6c6556c 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 6cd33d8..4a9eda2 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 f837a8c..b35c1dd 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 851346d..dd22a75 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 364ed66..15ed136 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 b677e7e..6f715e3 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 838bf84..a2ad19f 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 dda03cf..6667ee0 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 01a093b..03e24c6 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 3e3dc7c..318bfa7 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 89d69c5..a68c093 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 0216428..bdebd89 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 2218d1d..3a7c54c 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 704c088..12eaee9 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 352b3ab..1c72e6d 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 fa0eb80..c41aa8d 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 0138f41..2e6ba66 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 fac9fa3..f2d716b 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 9616347..e4f90ca 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 48d57ce..74df22f 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 d0e3cc9..ebb7fd2 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 cd70456..459cd6b 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 90bfd06..ce1e7ec 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 8a2859d..bf5f337 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 88ae0f1..f2110d5 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 06710bc..f98a335 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; }
More information about the Libreoffice-commits
mailing list