summaryrefslogtreecommitdiff
path: root/basic
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-12-13 16:52:50 +0100
committerStephan Bergmann <sbergman@redhat.com>2012-12-17 16:34:23 +0100
commit77d3777c8934171a9557a96872d020cf12443fb9 (patch)
tree405281132307da4125f32651aee78e19ed47b34b /basic
parentc075b8068bff1b3c6025638aaf0acab5bbebab4d (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 'basic')
-rw-r--r--basic/source/runtime/methods.cxx7
1 files changed, 7 insertions, 0 deletions
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 8f1ac5d90f05..cbf7bda7c6f1 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -96,7 +96,14 @@ SbxVariable* getDefaultProp( SbxVariable* pRef );
#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 <io.h>
#undef GetObject
#undef GradientSyle_RECT