diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-12-13 16:52:50 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-12-17 16:34:23 +0100 |
| commit | 77d3777c8934171a9557a96872d020cf12443fb9 (patch) | |
| tree | 405281132307da4125f32651aee78e19ed47b34b /desktop | |
| parent | c075b8068bff1b3c6025638aaf0acab5bbebab4d (diff) | |
Remove --with-stlport from LO 4.0
The STLport was only built for the benefit of old extensions on platforms that
once used it themselves (Linux x86, Solaris x86 and SPARC, Windows). We
deliberately break such old extensions for LO 4.0 by no longer shipping that
backwards-compatiblity cludge.
Keeps STLport listed in readlicense_oo/ because of
o3tl/inc/o3tl/compat_functionality.hxx.
Also removes GXX_INCLUDE_PATH, as that was only used by STLport (if at all?).
Removes a spurious #define MOVEFILE_REPLACE_EXISTING 0x01 from
l10ntools/inc/helpmerge.hxx that was once added with
854812584862d0609b695682d2bfea2667d75c00 "INTEGRATION: CWS extensionl10nfix01
(1.11.6); FILE MERGED: 2008/06/26 13:56:03 ihi 1.11.6.1: #i90987# windows rename
-> MoveFileEx" but now starts to cause trouble on Windows. Also disables
warning C4005 about redefinition of WB_LEFT/RIGHT macros (defined in both
tools/wintypes.hxx and the Windows API) in a number of places that include
windows.h -- however the old STLport caused those warnings to not show.
Change-Id: Ie138a219fbbc86fb5aaa7ea0b88cf349935d9829
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 1 | ||||
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 26d79eccfcfb..a83296f95e03 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -111,6 +111,7 @@ #ifdef WNT #ifdef _MSC_VER #pragma warning(push, 1) /* disable warnings within system headers */ +#pragma warning (disable: 4005) #endif #define WIN32_LEAN_AND_MEAN #include <windows.h> diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index bd83d12e5a5e..36af07114e28 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx @@ -88,7 +88,14 @@ #ifdef WNT #define GradientStyle_RECT BLA_GradientStyle_RECT +#if defined _MSC_VER +#pragma warning (push, 1) +#pragma warning (disable: 4005) +#endif #include <windows.h> +#if defined _MSC_VER +#pragma warning (pop) +#endif #include <objbase.h> #undef GradientStyle_RECT #endif |