Trying to remove the stlport mention from the code

7 files changed, 21 insertions, 32 deletions

diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 3fa2f8bda690..8bf6350d7465 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -576,7 +576,7 @@ End
 #define SCP2_URE_DL_UNO_VER(n, v) n v ".dll"
 #define SCP2_URE_DL_UNO_COMID_VER(n, v) n v STRING(COMID) ".dll"
 #define SCP2_URE_SHARE_DIR gid_Dir_Common_Ure
-#if defined _STLP_DEBUG
+#if defined _DEBUG_RUNTIME
 #define SCP2_STDLP_DEBUG "d"
 #else
 #define SCP2_STDLP_DEBUG ""
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index c47ce7462653..bf492dfe0ba2 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -792,7 +792,7 @@ File gid_Brand_File_Lib_Msvcr80
     BIN_FILE_BODY;
     Styles = (PACKED);
     Dir = gid_Brand_Dir_Program;
-#ifndef _STLP_DEBUG
+#ifndef _DEBUG_RUNTIME
     Name = "msvcr80.dll";
 #else
     Name = "msvcr80d.dll";
@@ -835,7 +835,7 @@ File gid_Brand_File_Lib_Msvcp80
     BIN_FILE_BODY;
     Styles = (PACKED);
     Dir = gid_Brand_Dir_Program;
-#ifndef _STLP_DEBUG
+#ifndef _DEBUG_RUNTIME
     Name = "msvcp80.dll";
 #else
     Name = "msvcp80d.dll";
@@ -852,7 +852,7 @@ File gid_Brand_File_Lib_Msvcm80
     BIN_FILE_BODY;
     Styles = (PACKED);
     Dir = gid_Brand_Dir_Program;
-#ifndef _STLP_DEBUG
+#ifndef _DEBUG_RUNTIME
     Name = "msvcm80.dll";
 #else
     Name = "msvcm80d.dll";
@@ -869,7 +869,7 @@ File gid_Brand_File_Msvcm80crt_Manifest
     BIN_FILE_BODY;
     Styles = (PACKED);
     Dir = gid_Brand_Dir_Program;
-#ifndef _STLP_DEBUG
+#ifndef _DEBUG_RUNTIME
     Name = "Microsoft.VC80.CRT.manifest";
 #else
     Name = "Microsoft.VC80.DebugCRT.manifest";
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index e30422e82b41..2349c4b484be 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -993,7 +993,7 @@ File gid_File_Lib_Msvcr80
     BIN_FILE_BODY;
     Styles = (PACKED);
     Dir = gid_Dir_Program;
-#ifndef _STLP_DEBUG
+#ifndef _DEBUG_RUNTIME
     Name = "msvcr80.dll";
 #else
     Name = "msvcr80d.dll";
@@ -1010,7 +1010,7 @@ File gid_File_Lib_Msvcp80
     BIN_FILE_BODY;
     Styles = (PACKED);
     Dir = gid_Dir_Program;
-#ifndef _STLP_DEBUG
+#ifndef _DEBUG_RUNTIME
     Name = "msvcp80.dll";
 #else
     Name = "msvcp80d.dll";
@@ -1027,7 +1027,7 @@ File gid_File_Lib_Msvcm80
     BIN_FILE_BODY;
     Styles = (PACKED);
     Dir = gid_Dir_Program;
-#ifndef _STLP_DEBUG
+#ifndef _DEBUG_RUNTIME
     Name = "msvcm80.dll";
 #else
     Name = "msvcm80d.dll";
@@ -1070,7 +1070,7 @@ File gid_File_Msvcm80crt_Manifest
     BIN_FILE_BODY;
     Styles = (PACKED);
     Dir = gid_Dir_Program;
-#ifndef _STLP_DEBUG
+#ifndef _DEBUG_RUNTIME
     Name = "Microsoft.VC80.CRT.manifest";
 #else
     Name = "Microsoft.VC80.DebugCRT.manifest";
@@ -1782,7 +1782,7 @@ End
 STD_UNO_LIB_FILE( gid_File_Lib_Oooimprovecore , oooimprovecore)
 
 #if defined WNT && !defined _gcc3 && !defined SYSTEM_MOZILLA && !defined WITHOUT_MOZILLA && \
-    !(defined M1400 && defined PROF_EDITION && !defined _STLP_DEBUG)
+    !(defined M1400 && defined PROF_EDITION && !defined _DEBUG_RUNTIME)
         // see common_brand.scp gid_Brand_File_Lib_Msvcp80 and
         // gid_Brand_File_Lib_Msvcr80
 File gid_File_Moz_Msvcp80
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 87c680191547..b2dec77bac55 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -126,10 +126,6 @@ SCPDEFS+=-DLIBXSLT_MAJOR=$(LIBXSLT_MAJOR)
 SCPDEFS+=-DSYSTEM_DB
 .ENDIF
 
-.IF "$(USE_SYSTEM_STL)" == "YES" || "$(STLPORT4)" != "NO_STLPORT4"
-SCPDEFS+=-DUSE_SYSTEM_STL
-.ENDIF
-
 .IF "$(WITH_MOZILLA)" == "NO"
 SCPDEFS+=-DWITHOUT_MOZILLA
 .ENDIF
diff --git a/scp2/source/ooo/mergemodules_ooo.scp b/scp2/source/ooo/mergemodules_ooo.scp
index f88cce4d2314..b19ca8c47bba 100755
--- a/scp2/source/ooo/mergemodules_ooo.scp
+++ b/scp2/source/ooo/mergemodules_ooo.scp
@@ -29,7 +29,7 @@
 
 #ifdef M1500
 MergeModule gid_Mergemodule_Microsoft_Vc90_Crt_X86
-#ifdef _STLP_DEBUG
+#ifdef _DEBUG_RUNTIME
 	Name = "Microsoft_VC90_DebugCRT_x86.msm";
 #else
 	Name = "Microsoft_VC90_CRT_x86.msm";
@@ -43,7 +43,7 @@ End
 
 #ifdef M1500
 MergeModule gid_Mergemodule_Policy_Microsoft_Vc90_Crt_X86
-#ifdef _STLP_DEBUG
+#ifdef _DEBUG_RUNTIME
 	Name = "policy_9_0_Microsoft_VC90_DebugCRT_x86.msm";
 #else
 	Name = "policy_9_0_Microsoft_VC90_CRT_x86.msm";
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index ce790cb058f4..cda47b44137c 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -177,7 +177,7 @@ File gid_File_Lib_Msvcr80_Ure
     BIN_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_URE_DL_DIR;
-#ifndef _STLP_DEBUG
+#ifndef _DEBUG_RUNTIME
     Name = "msvcr80.dll";
 #else
     Name = "msvcr80d.dll";
@@ -194,7 +194,7 @@ File gid_File_Lib_Msvcp80_Ure
     BIN_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_URE_DL_DIR;
-#ifndef _STLP_DEBUG
+#ifndef _DEBUG_RUNTIME
     Name = "msvcp80.dll";
 #else
     Name = "msvcp80d.dll";
@@ -211,7 +211,7 @@ File gid_File_Lib_Msvcm80_Ure
     BIN_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_URE_DL_DIR;
-#ifndef _STLP_DEBUG
+#ifndef _DEBUG_RUNTIME
     Name = "msvcm80.dll";
 #else
     Name = "msvcm80d.dll";
@@ -228,7 +228,7 @@ File gid_File_Msvcm80crt_Manifest_Ure
     BIN_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_URE_DL_DIR;
-#ifndef _STLP_DEBUG
+#ifndef _DEBUG_RUNTIME
     Name = "Microsoft.VC80.CRT.manifest";
 #else
     Name = "Microsoft.VC80.DebugCRT.manifest";
@@ -961,19 +961,18 @@ Unixlink gid_Unixlink_File_Dl_Libxml2
 End
 #endif
 
-#if !defined USE_SYSTEM_STL || \
-    (defined USE_SYSTEM_STL && defined _C52 && defined IS_LP64)
+#if defined WITH_STLPORT
 File gid_File_Dl_Stlport
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
 #if defined _gcc3 && defined WNT
-#if defined _STLP_DEBUG
+#if defined _DEBUG_RUNTIME
     Name = SCP2_URE_DL_NORMAL("libstlport_gcc_stldebug");
 #else
     Name = SCP2_URE_DL_NORMAL("libstlport_gcc");
 #endif
 #elif defined _gcc3
-#if defined _STLP_DEBUG
+#if defined _DEBUG_RUNTIME
     Name = SCP2_URE_DL_NORMAL("stlport_gcc_stldebug");
 #else
     Name = SCP2_URE_DL_NORMAL("stlport_gcc");
@@ -982,20 +981,18 @@ File gid_File_Dl_Stlport
 #if defined IS_LP64
     Name = SCP2_URE_DL_VER("stlport", "1");
 #else
-#if defined _STLP_DEBUG
+#if defined _DEBUG_RUNTIME
     Name = SCP2_URE_DL_NORMAL("stlport_sunpro_debug");
 #else
     Name = SCP2_URE_DL_NORMAL("stlport_sunpro");
 #endif
 #endif
 #elif defined WNT && (defined(M1310) || defined(M1400) || defined(M1500) || defined (M1600) )
-#if defined _STLP_DEBUG
+#if defined _DEBUG_RUNTIME
     Name = SCP2_URE_DL_NORMAL("stlport_vc71_stldebug45");
 #else
     Name = SCP2_URE_DL_NORMAL("stlport_vc7145");
 #endif
-#else
-#error "stlport dynamic library: unsupported platform"
 #endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "D976338D-D2A5-4D29-B765-D3AC43181C7F";
diff --git a/scp2/source/winexplorerext/makefile.mk b/scp2/source/winexplorerext/makefile.mk
index 21eaad714eac..435ed439987d 100755
--- a/scp2/source/winexplorerext/makefile.mk
+++ b/scp2/source/winexplorerext/makefile.mk
@@ -50,10 +50,6 @@ PARFILES= \
         registryitem_winexplorerext.par
 .ENDIF
 
-.IF "$(USE_SYSTEM_STL)" == "YES" || "$(STLPORT4)" != "NO_STLPORT4"
-SCPDEFS+=-DUSE_SYSTEM_STL
-.ENDIF
-
 ULFFILES= \
         module_winexplorerext.ulf