summaryrefslogtreecommitdiff
path: root/shell/source
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2013-11-06 11:23:15 +0100
committerThorsten Behrens <thb@documentfoundation.org>2013-11-20 07:15:16 -0600
commitf01580ce9c5f898c1fdb85e302a158f1a31205db (patch)
treea49f1c99391904d8b4f96e6ff1a7160ce82d4461 /shell/source
parentd0c5f4522f8aa063b3e7c034db079d74b7f0b3fa (diff)
Windows: Require at least Windows XP SP2
* Windows XP SP2 is 0x0502, see http://msdn.microsoft.com/en-us/library/aa383745.aspx * If a module changes the Windows SDK version setting, this is done module wide now. So the overall behavior is as before. This seems to be the best compromise for now. * We need at least SP2 because of the bluetooth stuff used in sd/source/ui/remotecontrol. * Now, we require at least Internet Explorer 7.0. IE6 has been outdated for a long time. * Leave StdAfx.h file definitions, as those are Microsoft project specific precompiled header files. * All local definitions of WINVER are removed, because the global WINVER setting makes them obsolete now. To the relation of the three macros: Setting _WIN32_WINNT sets WINVER and NTDDI_VERSION automatically to the same value as _WIN32_WINNT. WINVER and NTDDI_VERSION can be set idenpendently each for itself. Change-Id: Ibcc12493aae4fcaf7bcfda88be99c1b61bc326cb Reviewed-on: https://gerrit.libreoffice.org/6496 Reviewed-by: Thorsten Behrens <thb@documentfoundation.org> Tested-by: Thorsten Behrens <thb@documentfoundation.org>
Diffstat (limited to 'shell/source')
-rw-r--r--shell/source/backends/localebe/localebackend.cxx6
-rw-r--r--shell/source/win32/shlxthandler/res/rcheader.txt1
2 files changed, 0 insertions, 7 deletions
diff --git a/shell/source/backends/localebe/localebackend.cxx b/shell/source/backends/localebe/localebackend.cxx
index 02bdc97eef5c..2d38cd28dcd3 100644
--- a/shell/source/backends/localebe/localebackend.cxx
+++ b/shell/source/backends/localebe/localebackend.cxx
@@ -26,12 +26,6 @@
#include <stdio.h>
#ifdef WNT
-
-#ifdef WINVER
-#undef WINVER
-#endif
-#define WINVER 0x0501
-
#if defined _MSC_VER
#pragma warning(push, 1)
#endif
diff --git a/shell/source/win32/shlxthandler/res/rcheader.txt b/shell/source/win32/shlxthandler/res/rcheader.txt
index f2d716b65971..065bf2a3a11e 100644
--- a/shell/source/win32/shlxthandler/res/rcheader.txt
+++ b/shell/source/win32/shlxthandler/res/rcheader.txt
@@ -1,4 +1,3 @@
-#define WINVER 0x0500
#include <winresrc.h>
#define LB_ADDSTRING (WM_USER+1)
#define CB_ADDSTRING (WM_USER+3)