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

3 files changed, 3 insertions, 22 deletions

diff --git a/ure/source/uretest/Makefile.pln b/ure/source/uretest/Makefile.pln
index 6f2832cc762c..2c5f62e0f8bb 100644
--- a/ure/source/uretest/Makefile.pln
+++ b/ure/source/uretest/Makefile.pln
@@ -21,12 +21,10 @@
 
 # The following variables can be set, if necessary (see README):
 #URE_HOME := /opt/openoffice.org/ure
-#GXX_INCLUDE_PATH := /usr/include/g++
 #GCCS_COMPAT := LD_PRELOAD=/lib/libgcc_s.so.1
 
 
 URE_HOME ?= /opt/openoffice.org/ure
-GXX_INCLUDE_PATH ?= /usr/include/g++
 
 .DELETE_ON_ERROR:
 
@@ -90,8 +88,7 @@ out.pln/cppmain.o: cppmain.cc out.pln/cpputypes.cppumaker.flag \
 	g++ -c -o $@ -fpic -fvisibility=hidden -Wall -Wno-ctor-dtor-privacy \
             -I $(SDK_HOME)/include/stl -I $(SDK_HOME)/include \
             -I out.pln/include/cpputypes -I out.pln/include/types \
-            -DCPPU_ENV=gcc3 -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) -DLINUX \
-            -DUNX $<
+            -DCPPU_ENV=gcc3 -DLINUX -DUNX $<
 
 
 out.pln/cpptest.uno.so: out.pln/cpptest.o | out.pln out.pln/lib/libuno_cppu.so \
@@ -104,8 +101,7 @@ out.pln/cpptest.o: cpptest.cc out.pln/cpputypes.cppumaker.flag \
 	g++ -c -o $@ -fpic -fvisibility=hidden -Wall -Wno-ctor-dtor-privacy \
             -I $(SDK_HOME)/include/stl -I $(SDK_HOME)/include \
             -I out.pln/include/cpputypes -I out.pln/include/types \
-            -DCPPU_ENV=gcc3 -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) -DLINUX \
-            -DUNX $<
+            -DCPPU_ENV=gcc3 -DLINUX -DUNX $<
 
 
 out.pln/cppserver.uno.so: out.pln/cppserver.o | out.pln \
@@ -119,8 +115,7 @@ out.pln/cppserver.o: cppserver.cc out.pln/cpputypes.cppumaker.flag \
 	g++ -c -o $@ -fpic -fvisibility=hidden -Wall -Wno-ctor-dtor-privacy \
             -I $(SDK_HOME)/include/stl -I $(SDK_HOME)/include \
             -I out.pln/include/cpputypes -I out.pln/include/types \
-            -DCPPU_ENV=gcc3 -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) -DLINUX \
-            -DUNX $<
+            -DCPPU_ENV=gcc3 -DLINUX -DUNX $<
 
 
 out.pln/cpputypes.cppumaker.flag: | out.pln
diff --git a/ure/source/uretest/README b/ure/source/uretest/README
index 291d2964d534..18b74c8a2520 100644
--- a/ure/source/uretest/README
+++ b/ure/source/uretest/README
@@ -54,10 +54,6 @@ requirements, see the SDK Installation Guide ($SDK_HOME/docs/install.html).
 - URE_HOME (optional)
 Overwrites the default URE location, that is, /opt/openoffice.org/ure.
 
-- GXX_INCLUDE_PATH (optional)
-Overwrites the default location of the GCC C++ headers (/usr/include/g++).  This
-information is needed by the STLport included in the URE.
-
 - GCCS_COMPAT (optional)
 Fixes incompatibility issues between the GCC that was used to build the URE and
 the GCC that Makefile.pln accesses.  For more details, see the UDK README file.
diff --git a/ure/source/uretest/cppmain.cc b/ure/source/uretest/cppmain.cc
index 92aa1257ea4d..ab0c92d625cd 100644
--- a/ure/source/uretest/cppmain.cc
+++ b/ure/source/uretest/cppmain.cc
@@ -20,10 +20,8 @@
 #include "sal/macros.h"
 
 #include <cstddef>
-#include <functional>
 #include <memory>
 #include <new>
-#include <boost/unordered_map.hpp>
 
 #include "com/sun/star/lang/XMain.hpp"
 #include "com/sun/star/uno/Exception.hpp"
@@ -38,7 +36,6 @@
 #include "cppuhelper/interfacecontainer.hxx"
 #include "cppuhelper/unourl.hxx"
 #include "cppuhelper/weak.hxx"
-#include "osl/mutex.hxx"
 #include "osl/thread.h"
 #include "rtl/malformeduriexception.hxx"
 #include "rtl/string.h"
@@ -90,13 +87,6 @@ private:
     try { // check for cppuhelper
         std::auto_ptr< cppu::UnoUrl > dummy(new cppu::UnoUrl(rtl::OUString()));
     } catch (rtl::MalformedUriException &) {}
-    { // check for stlport
-        osl::Mutex m;
-        std::auto_ptr< cppu::OMultiTypeInterfaceContainerHelperVar<
-            int, boost::hash< int >, std::equal_to< int > > > dummy(
-                new cppu::OMultiTypeInterfaceContainerHelperVar<
-                int, boost::hash< int >, std::equal_to< int > >(m));
-    }
     static char const * const services[] = {
         "com.sun.star.beans.Introspection",
         "com.sun.star.bridge.BridgeFactory",