Trying to remove the stlport mention from the code

10 files changed, 8 insertions, 31 deletions

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"