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

5 files changed, 7 insertions, 100 deletions

diff --git a/ure/source/README b/ure/source/README
index 2512d5681297..7d7654d3cd22 100644
--- a/ure/source/README
+++ b/ure/source/README
@@ -37,8 +37,6 @@ Linux x86, Solaris x86, and Solaris SPARC:
 /opt/openoffice.org/ure/lib/libuno_sal.so.3
 /opt/openoffice.org/ure/lib/libuno_salhelpergcc3.so.3  [Linux x86 only]
 /opt/openoffice.org/ure/lib/libuno_salhelperC52.so.3  [Solaris only]
-/opt/openoffice.org/ure/lib/libstlport_gcc.so  [Linux x86 only]
-/opt/openoffice.org/ure/lib/libstlport_sunpro.so  [Solaris only]
 /opt/openoffice.org/ure/share/java/unoloader.jar
 /opt/openoffice.org/ure/share/java/juh.jar
 /opt/openoffice.org/ure/share/java/jurt.jar
@@ -105,7 +103,6 @@ Program Files\URE\bin\cppuhelper3MSC.dll
 Program Files\URE\bin\purpenvhelper3MSC.dll
 Program Files\URE\bin\sal3.dll
 Program Files\URE\bin\salhelper3MSC.dll
-Program Files\URE\bin\stlport_vc7145.dll
 Program Files\URE\java\unoloader.jar
 Program Files\URE\java\juh.jar
 Program Files\URE\java\jurt.jar
@@ -200,11 +197,6 @@ functionality that these libraries offer, see the "C++ Reference" section of the
 SDK HTML documentation.  The corresponding C++ header files are not in the URE,
 but rather in the SDK.
 
--  stlport is the dynamic library of STLport 4.5, which is used in the public
-interface of cppuhelper and salhelper, and thus also has to be part of the
-public interface of the URE.  The corresponding C++ header files are not in the
-URE, but rather in the SDK.
-
 - unoloader.jar, juh.jar, jurt.jar, and ridl.jar are the public Java UNO runtime
 Java[tm] Archives (JARs) that client code can call.  For details on the
 functionality that these files offer, see the "Java UNO Runtime Reference"
@@ -334,10 +326,10 @@ C++ and Java UNO Components
 
 C++ UNO components run from within the uno executable can depend on an
 environment in which the public C++ UNO runtime dynamic libraries (cppu,
-cppuhelper, purpenvhelper, sal, salhelper, stlport) and the external dynamic
-libraries (libxml2 etc.) are already available (that is, on Linux x86, Solaris
-x86, and Solaris SPARC, a component dynamic library need not make sure that the
-UNO runtime dynamic libraries it needs can be found on its RPATH).
+cppuhelper, purpenvhelper, sal, salhelper) and the external dynamic libraries
+(libxml2 etc.) are already available (that is, on Linux x86, Solaris x86, and
+Solaris SPARC, a component dynamic library need not make sure that the UNO
+runtime dynamic libraries it needs can be found on its RPATH).
 
 Similarly, Java UNO components can depend on an environment in which the public
 Java UNO runtime JARs are already available (that is, a component JAR need not
diff --git a/ure/source/THIRDPARTYLICENSEREADME.html b/ure/source/THIRDPARTYLICENSEREADME.html
index eeacd59bbea7..0f08b281f079 100644
--- a/ure/source/THIRDPARTYLICENSEREADME.html
+++ b/ure/source/THIRDPARTYLICENSEREADME.html
@@ -57,72 +57,6 @@ ings in this Software without prior written authorization from him.
 ***************************************************************************
 
 %%The following software may be included in this product:
-STLport
-
-Use of any of this software is governed by the terms of the license below:
-
-License Agreement
-
-Boris Fomitchev grants Licensee a non-exclusive, non-transferable, royalty-free
-license to use STLport and its documentation without fee.
-
-By downloading, using, or copying STLport or any portion thereof,  Licensee
-agrees to abide by the intellectual property laws and all other applicable laws
-of the United States of America, and to all of the terms and conditions of this
-Agreement.
-
-Licensee shall maintain the following copyright and permission  notices on
-STLport sources and its documentation unchanged :
-Copyright 1999,2000 Boris Fomitchev
-
-This material is provided "as is", with absolutely no warranty expressed or
-implied. Any use is at your own risk.
-Permission to use or copy this software for any purpose is hereby granted
-without fee, provided the above notices are retained on all copies. Permission
-to modify the code and to distribute modified code is granted, provided the
-above notices are retained, and a notice that the code was modified is included
-with the above copyright notice.
-
-The Licensee may distribute binaries compiled with STLport (whether original or
-modified) without any royalties or restrictions.
-
-The Licensee may distribute original or modified STLport sources, provided that:
-
-    * The conditions indicated in the above permission notice are met;
-    * The following copyright notices are retained when present, and conditions
-provided in accompanying permission notices are met :
-
-Copyright 1994 Hewlett-Packard Company
-
-Copyright 1996,97 Silicon Graphics Computer Systems, Inc.
-
-Copyright 1997 Moscow Center for SPARC Technology.
-
-    Permission to use, copy, modify, distribute and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that the
-above copyright notice appear in all copies and that both that copyright notice
-and this permission notice appear in supporting documentation. Hewlett-Packard
-Company makes no representations about the suitability of this software for any
-purpose. It is provided "as is" without express or implied warranty.
-
-    Permission to use, copy, modify, distribute and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that the
-above copyright notice appear in all copies and that both that copyright notice
-and this permission notice appear in supporting documentation. Silicon Graphics
-makes no representations about the suitability of this software for any purpose.
-It is provided "as is" without express or implied warranty.
-
-    Permission to use, copy, modify, distribute and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that the
-above copyright notice appear in all copies and that both that copyright notice
-and this permission notice appear in supporting documentation. Moscow Center for
-SPARC Technology  makes no representations about the suitability of this
-software for any purpose. It is provided "as is" without express or implied
-warranty.
-
-***************************************************************************
-
-%%The following software may be included in this product:
 libstdc++
 
 Use of any of this software is governed by the terms of the license below:
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",