diff options
24 files changed, 11 insertions, 113 deletions
diff --git a/automation/util/makefile.mk b/automation/util/makefile.mk index 8747ff4c4b0e..046f6e043dea 100644 --- a/automation/util/makefile.mk +++ b/automation/util/makefile.mk @@ -214,14 +214,9 @@ APP3STDLIBS= \ $(VCLLIB) .IF "$(GUI)"=="UNX" -.IF "$(OS)"=="MACOSX" -APP3STDLIBS+= \ - $(SALLIB) $(LIBSTLPORT) -.ELSE APP3STDLIBS+= \ $(SALLIB) .ENDIF -.ENDIF # $(AUTOMATIONLIB) is build in SHL1TARGET .IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT") APP3DEPN=$(SHL1TARGETN) diff --git a/cui/source/dialogs/cuitbxform.cxx b/cui/source/dialogs/cuitbxform.cxx index 4d0f2d91d12f..ef232335940e 100644 --- a/cui/source/dialogs/cuitbxform.cxx +++ b/cui/source/dialogs/cuitbxform.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_cui.hxx" -#include <string> // HACK: prevent conflict between STLPORT and Workshop headers +#include <string> #include <tools/ref.hxx> #include <tools/shl.hxx> #include <svl/intitem.hxx> diff --git a/extensions/source/ole/makefile.mk b/extensions/source/ole/makefile.mk index 87841c463f43..783614590838 100644 --- a/extensions/source/ole/makefile.mk +++ b/extensions/source/ole/makefile.mk @@ -47,9 +47,9 @@ INCPRE+= $(foreach,i,$(ATL_INCLUDE) -I$(i)) .IF "$(GUI)" == "WNT" && "$(DISABLE_ATL)"=="" -.IF "$(USE_STLP_DEBUG)"!="" +.IF "$(USE_DEBUG_RUNTIME)"!="" CDEFS+=-D_DEBUG -.ENDIF # "$(USE_STLP_DEBUG)"!="" +.ENDIF # "$(USE_DEBUG_RUNTIME)"!="" SLOFILES= \ $(SLO)$/servreg.obj \ @@ -80,7 +80,7 @@ SHL1STDLIBS=\ .IF "$(COM)"=="MSC" .IF "$(WINDOWS_VISTA_PSDK)"!="" || "$(CCNUMVER)"<="001399999999" -.IF "$(USE_STLP_DEBUG)" != "" +.IF "$(USE_DEBUG_RUNTIME)" != "" SHL1STDLIBS+= $(ATL_LIB)$/atlsd.lib .ELSE SHL1STDLIBS+= $(ATL_LIB)$/atls.lib @@ -107,7 +107,7 @@ SHL2STDLIBS=\ .IF "$(COM)"=="MSC" .IF "$(WINDOWS_VISTA_PSDK)"!="" || "$(CCNUMVER)"<="001399999999" -.IF "$(USE_STLP_DEBUG)" != "" +.IF "$(USE_DEBUG_RUNTIME)" != "" SHL2STDLIBS+= $(ATL_LIB)$/atlsd.lib .ELSE SHL2STDLIBS+= $(ATL_LIB)$/atls.lib diff --git a/extensions/source/ole/oledll.cxx b/extensions/source/ole/oledll.cxx index 6c80487ffcb4..a2ac152fd8e2 100644 --- a/extensions/source/ole/oledll.cxx +++ b/extensions/source/ole/oledll.cxx @@ -36,7 +36,7 @@ #pragma warning (push,1) #pragma warning (disable:4548) -#if defined(_MSC_VER) && (_MSC_VER >= 1300) && !defined(_STLP_DEBUG) +#if defined(_MSC_VER) && (_MSC_VER >= 1300) && !defined(_DEBUG_RUNTIME) #undef _DEBUG #endif #ifdef __MINGW32__ diff --git a/extensions/source/plugin/base/context.cxx b/extensions/source/plugin/base/context.cxx index 5f295a13e76b..4881a610fe71 100644 --- a/extensions/source/plugin/base/context.cxx +++ b/extensions/source/plugin/base/context.cxx @@ -35,10 +35,8 @@ #undef _LINUX_SOURCE_COMPAT #endif -#if STLPORT_VERSION>=321 #include <cstdarg> #include <cstdio> -#endif #include <plugin/impl.hxx> diff --git a/extensions/source/plugin/base/evtlstnr.cxx b/extensions/source/plugin/base/evtlstnr.cxx index d01844aadff6..4f1db5bd3e7e 100644 --- a/extensions/source/plugin/base/evtlstnr.cxx +++ b/extensions/source/plugin/base/evtlstnr.cxx @@ -35,9 +35,7 @@ #undef _LINUX_SOURCE_COMPAT #endif -#if STLPORT_VERSION>=321 #include <cstdarg> -#endif #include <plugin/impl.hxx> diff --git a/extensions/source/plugin/base/manager.cxx b/extensions/source/plugin/base/manager.cxx index 9c0bd7dc1c7d..338eb1940df9 100644 --- a/extensions/source/plugin/base/manager.cxx +++ b/extensions/source/plugin/base/manager.cxx @@ -35,9 +35,7 @@ #undef _LINUX_SOURCE_COMPAT #endif -#if STLPORT_VERSION>=321 #include <cstdarg> -#endif #include "plugin/impl.hxx" diff --git a/extensions/source/plugin/base/nfuncs.cxx b/extensions/source/plugin/base/nfuncs.cxx index 297f96a0a441..094772501f1d 100644 --- a/extensions/source/plugin/base/nfuncs.cxx +++ b/extensions/source/plugin/base/nfuncs.cxx @@ -35,10 +35,7 @@ #undef _LINUX_SOURCE_COMPAT #endif -#if STLPORT_VERSION>=321 #include <cstdarg> -#endif - #include <list> #include <plugin/impl.hxx> diff --git a/extensions/source/plugin/base/plcom.cxx b/extensions/source/plugin/base/plcom.cxx index 9aef0e1de458..1b4c9fbcb312 100644 --- a/extensions/source/plugin/base/plcom.cxx +++ b/extensions/source/plugin/base/plcom.cxx @@ -39,9 +39,7 @@ #include <limits> #endif -#if STLPORT_VERSION>=321 #include <cstdarg> -#endif #include <tools/fsys.hxx> #include <plugin/impl.hxx> diff --git a/extensions/source/plugin/base/service.cxx b/extensions/source/plugin/base/service.cxx index 51a79bdbc153..bef0be999906 100644 --- a/extensions/source/plugin/base/service.cxx +++ b/extensions/source/plugin/base/service.cxx @@ -35,9 +35,7 @@ #undef _LINUX_SOURCE_COMPAT #endif -#if STLPORT_VERSION>=321 #include <cstdarg> -#endif #include <plugin/impl.hxx> #include <tools/debug.hxx> diff --git a/extensions/source/plugin/unx/nppapi.cxx b/extensions/source/plugin/unx/nppapi.cxx index bf0faabf15dc..1353722fdf91 100644 --- a/extensions/source/plugin/unx/nppapi.cxx +++ b/extensions/source/plugin/unx/nppapi.cxx @@ -35,9 +35,7 @@ #undef _LINUX_SOURCE_COMPAT #endif -#if STLPORT_VERSION>=321 #include <cstdarg> -#endif #include <plugin/impl.hxx> #include <vcl/svapp.hxx> diff --git a/extensions/source/plugin/util/makefile.mk b/extensions/source/plugin/util/makefile.mk index 75baea867c21..cb5b751c7404 100644 --- a/extensions/source/plugin/util/makefile.mk +++ b/extensions/source/plugin/util/makefile.mk @@ -73,24 +73,16 @@ DEF1NAME=$(SHL1TARGET) SHL1LIBS=$(LIB1TARGET) -.IF "$(OS)"=="MACOSX" -SHL1STDLIBS= \ - $(LIBSTLPORT) \ - $(TKLIB) -.ELSE -SHL1STDLIBS= \ - $(TKLIB) -.ENDIF - SHL1STDLIBS+= \ + $(TKLIB) \ $(VCLLIB) \ $(SVLLIB) \ - $(UNOTOOLSLIB) \ + $(UNOTOOLSLIB) \ $(TOOLSLIB) \ $(UCBHELPERLIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) \ - $(SALLIB) \ + $(SALLIB) \ $(SALHELPERLIB) .IF "$(GUIBASE)"=="unx" diff --git a/extensions/test/ole/cpnt/makefile.mk b/extensions/test/ole/cpnt/makefile.mk index dc1835e956d4..65601edd9444 100644 --- a/extensions/test/ole/cpnt/makefile.mk +++ b/extensions/test/ole/cpnt/makefile.mk @@ -49,7 +49,7 @@ SHL1STDLIBS= \ $(CPPUHELPERLIB) .IF "$(COMEX)"=="8" || "$(COMEX)"=="10" -.IF "$(USE_STLP_DEBUG)" != "" +.IF "$(USE_DEBUG_RUNTIME)" != "" SHL1STDLIBS+= $(ATL_LIB)$/atlsd.lib .ELSE SHL1STDLIBS+= $(ATL_LIB)$/atls.lib diff --git a/setup_native/source/win32/customactions/languagepacks/makefile.mk b/setup_native/source/win32/customactions/languagepacks/makefile.mk index cf703e033c8e..365772ca8cd3 100644 --- a/setup_native/source/win32/customactions/languagepacks/makefile.mk +++ b/setup_native/source/win32/customactions/languagepacks/makefile.mk @@ -39,10 +39,6 @@ USE_DEFFILE=TRUE .INCLUDE : settings.mk -.IF "$(USE_SYSTEM_STL)" != "YES" -CFLAGS+=-D_STLP_USE_STATIC_LIB -.ENDIF - #Disable precompiled header CDEFS+=-Dnot_used_define_to_disable_pch @@ -61,10 +57,6 @@ STDSHL+= \ $(MSILIB) \ $(SHELL32LIB) -.IF "$(USE_SYSTEM_STL)" != "YES" -STDSHL+=$(LIBSTLPORTST) -.ENDIF - SHL1OBJS = $(SLOFILES) \ $(SLO)$/seterror.obj diff --git a/setup_native/source/win32/customactions/patch/makefile.mk b/setup_native/source/win32/customactions/patch/makefile.mk index 3abd9988b486..77cd11e0322c 100755 --- a/setup_native/source/win32/customactions/patch/makefile.mk +++ b/setup_native/source/win32/customactions/patch/makefile.mk @@ -38,10 +38,6 @@ USE_DEFFILE=TRUE .INCLUDE : settings.mk -.IF "$(USE_SYSTEM_STL)" != "YES" -CFLAGS+=-D_STLP_USE_STATIC_LIB -.ENDIF - #Disable precompiled header CDEFS+=-Dnot_used_define_to_disable_pch @@ -59,10 +55,6 @@ STDSHL += \ $(MSILIB)\ $(SHELL32LIB) -.IF "$(USE_SYSTEM_STL)" != "YES" -STDSHL += $(LIBSTLPORTST) -.ENDIF - .IF "$(COM)"=="GCC" STDSHL+= \ $(KERNEL32LIB)\ diff --git a/setup_native/source/win32/customactions/quickstarter/makefile.mk b/setup_native/source/win32/customactions/quickstarter/makefile.mk index 0861c20efed8..870571578697 100644 --- a/setup_native/source/win32/customactions/quickstarter/makefile.mk +++ b/setup_native/source/win32/customactions/quickstarter/makefile.mk @@ -41,10 +41,6 @@ USE_DEFFILE=TRUE .INCLUDE : settings.mk -.IF "$(USE_SYSTEM_STL)" != "YES" -CFLAGS+=-D_STLP_USE_STATIC_LIB -.ENDIF - UWINAPILIB= # --- Files -------------------------------------------------------- @@ -56,10 +52,6 @@ STDSHL += \ $(SHELL32LIB)\ $(MSILIB) -.IF "$(USE_SYSTEM_STL)" != "YES" -STDSHL += $(LIBSTLPORTST) -.ENDIF - .IF "$(COM)"=="GCC" STDSHL+= \ $(KERNEL32LIB)\ diff --git a/setup_native/source/win32/customactions/rebase/makefile.mk b/setup_native/source/win32/customactions/rebase/makefile.mk index 47cd8fd59c87..cb9e29db1e60 100644 --- a/setup_native/source/win32/customactions/rebase/makefile.mk +++ b/setup_native/source/win32/customactions/rebase/makefile.mk @@ -40,10 +40,6 @@ MINGW_NODLL=YES .INCLUDE : settings.mk -.IF "$(USE_SYSTEM_STL)" != "YES" -CFLAGS+=-D_STLP_USE_STATIC_LIB -.ENDIF - UWINAPILIB= # --- Files -------------------------------------------------------- @@ -55,10 +51,6 @@ STDSHL += \ $(SHELL32LIB)\ $(MSILIB) -.IF "$(USE_SYSTEM_STL)" != "YES" -STDSHL += $(LIBSTLPORTST) -.ENDIF - .IF "$(COM)"=="GCC" STDSHL+= \ $(KERNEL32LIB)\ diff --git a/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk b/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk index d58291966ef2..24037f0c0c5b 100644 --- a/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk +++ b/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk @@ -39,9 +39,6 @@ USE_DEFFILE=TRUE .INCLUDE : settings.mk CFLAGS+=-DUNICODE -D_UNICODE -.IF "$(USE_SYSTEM_STL)" != "YES" -CFLAGS+=-D_STLP_USE_STATIC_LIB -.ENDIF # --- Files -------------------------------------------------------- @@ -58,10 +55,6 @@ SHL1STDLIBS= $(KERNEL32LIB)\ $(MSILIB)\ $(SHLWAPILIB) -.IF "$(USE_SYSTEM_STL)" != "YES" -SHL1STDLIBS+=$(LIBSTLPORTST) -.ENDIF - SHL1LIBS = $(SLB)$/$(TARGET).lib SHL1TARGET = $(TARGET) diff --git a/setup_native/source/win32/customactions/reg4msdoc/makefile.mk b/setup_native/source/win32/customactions/reg4msdoc/makefile.mk index fe2bf60949be..47239713ec1e 100644 --- a/setup_native/source/win32/customactions/reg4msdoc/makefile.mk +++ b/setup_native/source/win32/customactions/reg4msdoc/makefile.mk @@ -40,9 +40,6 @@ MINGW_NODLL=YES .INCLUDE : settings.mk CFLAGS+=-DUNICODE -D_UNICODE -.IF "$(USE_SYSTEM_STL)" != "YES" -CFLAGS+=-D_STLP_USE_STATIC_LIB -.ENDIF # --- Files -------------------------------------------------------- @@ -71,10 +68,6 @@ SHL1STDLIBS= $(KERNEL32LIB)\ $(MSILIB)\ $(SHLWAPILIB) -.IF "$(USE_SYSTEM_STL)" != "YES" -SHL1STDLIBS+=$(LIBSTLPORTST) -.ENDIF - SHL1LIBS = $(SLB)$/$(TARGET).lib SHL1TARGET = $(TARGET) diff --git a/setup_native/source/win32/customactions/reg64/makefile.mk b/setup_native/source/win32/customactions/reg64/makefile.mk index 5e807cfbebb8..4cb5a5ca20d0 100644 --- a/setup_native/source/win32/customactions/reg64/makefile.mk +++ b/setup_native/source/win32/customactions/reg64/makefile.mk @@ -39,10 +39,6 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE .INCLUDE : settings.mk -.IF "$(USE_SYSTEM_STL)" != "YES" -CFLAGS+=-D_STLP_USE_STATIC_LIB -.ENDIF - #Disable precompiled header CDEFS+=-Dnot_used_define_to_disable_pch diff --git a/setup_native/source/win32/customactions/relnotes/makefile.mk b/setup_native/source/win32/customactions/relnotes/makefile.mk index 4c29ead8bd6c..526d45e71393 100644 --- a/setup_native/source/win32/customactions/relnotes/makefile.mk +++ b/setup_native/source/win32/customactions/relnotes/makefile.mk @@ -40,9 +40,6 @@ USE_DEFFILE=TRUE .INCLUDE : settings.mk CDEFS+=-DUNICODE -.IF "$(USE_SYSTEM_STL)" != "YES" -CDEFS+=-D_STLP_USE_STATIC_LIB -.ENDIF UWINAPILIB= @@ -57,10 +54,6 @@ STDSHL+= \ $(SHELL32LIB)\ $(MSILIB) -.IF "$(USE_SYSTEM_STL)" != "YES" -STDSHL+=$(LIBSTLPORTST) -.ENDIF - SHL1LIBS = $(SLB)$/$(TARGET).lib SHL1TARGET = $(TARGET) diff --git a/setup_native/source/win32/customactions/sellang/makefile.mk b/setup_native/source/win32/customactions/sellang/makefile.mk index e2110ce708c9..a75c994fffc4 100644 --- a/setup_native/source/win32/customactions/sellang/makefile.mk +++ b/setup_native/source/win32/customactions/sellang/makefile.mk @@ -55,8 +55,7 @@ SHL1STDLIBS= kernel32.lib\ user32.lib\ advapi32.lib\ shell32.lib\ - msi.lib\ - $(LIBSTLPORTST) + msi.lib SHL1LIBS = $(SLB)$/$(TARGET).lib diff --git a/setup_native/source/win32/customactions/shellextensions/makefile.mk b/setup_native/source/win32/customactions/shellextensions/makefile.mk index 23fe24bb6ceb..de8f943320f0 100644 --- a/setup_native/source/win32/customactions/shellextensions/makefile.mk +++ b/setup_native/source/win32/customactions/shellextensions/makefile.mk @@ -38,10 +38,6 @@ USE_DEFFILE=TRUE .INCLUDE : settings.mk -.IF "$(USE_SYSTEM_STL)" != "YES" -CFLAGS+=-D_STLP_USE_STATIC_LIB -.ENDIF - #Disable precompiled header CDEFS+=-Dnot_used_define_to_disable_pch @@ -75,10 +71,6 @@ STDSHL += \ $(MSILIB)\ $(SHELL32LIB) -.IF "$(USE_SYSTEM_STL)" != "YES" -STDSHL += $(LIBSTLPORTST) -.ENDIF - .IF "$(COM)"=="GCC" STDSHL+= \ $(KERNEL32LIB)\ diff --git a/setup_native/source/win32/customactions/tools/makefile.mk b/setup_native/source/win32/customactions/tools/makefile.mk index 9be7d7093da3..24e14861b968 100644 --- a/setup_native/source/win32/customactions/tools/makefile.mk +++ b/setup_native/source/win32/customactions/tools/makefile.mk @@ -39,10 +39,6 @@ USE_DEFFILE=TRUE .INCLUDE : settings.mk -.IF "$(USE_SYSTEM_STL)" != "YES" -CFLAGS+=-D_STLP_USE_STATIC_LIB -.ENDIF - # --- Files -------------------------------------------------------- .IF "$(GUI)"=="WNT" @@ -58,10 +54,6 @@ STDSHL+= \ $(ADVAPI32LIB)\ $(MSILIB) -.IF "$(USE_SYSTEM_STL)" != "YES" -STDSHL+=$(LIBSTLPORTST) -.ENDIF - SHL1TARGET = $(TARGET) SHL1IMPLIB = i$(TARGET) |