#i123647# RmMoz 9/9: with the moz-module gone the ancient msvc* dlls are no longer needed

6 files changed, 0 insertions, 295 deletions

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index fd14700477ed..42769143ed97 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -57,7 +57,6 @@ Module gid_Module_Root_Brand
              gid_Brand_File_Bin_Unopkgcom,
              gid_Brand_File_Bin_Unopkgexe,
              gid_Brand_File_Bin_Unopkg,
-             gid_Brand_File_Bin_Msvcr71,
  //            gid_Brand_File_Bin_Libxml2,
              gid_Brand_File_Bmp_IntroAbout,
              gid_Brand_File_Desktophelper_Txt,
@@ -66,12 +65,8 @@ Module gid_Module_Root_Brand
              gid_Brand_File_Lib_Mingw_GccS,
              gid_Brand_File_Lib_Mingw_Stdcpp,
              gid_Brand_File_Lib_Mingwm10,
-             gid_Brand_File_Lib_Msvcr80,
-             gid_Brand_File_Lib_Msvcp80,
-             gid_Brand_File_Lib_Msvcm80,
 			 gid_Brand_File_Lib_Oirm,
 			 gid_Brand_File_Lib_Oirm2,
-             gid_Brand_File_Msvcm80crt_Manifest,
              gid_Brand_File_Lib_Npsoplugin,
 //             gid_Brand_File_ServicesRdb,
 //             gid_Brand_File_Share_Registry_Brand_Xcd,
@@ -425,18 +420,6 @@ File gid_Brand_File_Bin_Unopkg
 End
 #endif
 
-#if defined WNT && \
-    (defined M1310 || \
-     ((defined M1400 || defined M1500) && \
-      !(defined SYSTEM_MOZILLA || defined WITHOUT_MOZILLA)))
-File gid_Brand_File_Bin_Msvcr71
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = SCP2_URE_DL_NORMAL("msvcr71" SCP2_STDLP_DEBUG);
-    Styles = (PACKED);
-End
-#endif
-
 // Due to Windows DLL search order, OOo executables might pick up a libxml2 DLL
 // from a Windows system directory instead of the one from the URE; to avoid
 // problems, as a HACK, for now a copy of the URE libxml2 DLL is placed next to
@@ -602,23 +585,6 @@ File gid_Brand_File_Lib_Mingwm10
 End
 #endif
 
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_Brand_File_Lib_Msvcr80
-    BIN_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Brand_Dir_Program;
-#ifndef _STLP_DEBUG
-    Name = "msvcr80.dll";
-#else
-    Name = "msvcr80d.dll";
-#endif
-End
-#endif
-#endif
-#endif
-
 #if defined(WNT) && defined( _gcc3 )
 
 #if defined(MINGW_GCCDLL)
@@ -645,57 +611,6 @@ End
 
 #endif
 
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_Brand_File_Lib_Msvcp80
-    BIN_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Brand_Dir_Program;
-#ifndef _STLP_DEBUG
-    Name = "msvcp80.dll";
-#else
-    Name = "msvcp80d.dll";
-#endif
-End
-#endif
-#endif
-#endif
-
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_Brand_File_Lib_Msvcm80
-    BIN_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Brand_Dir_Program;
-#ifndef _STLP_DEBUG
-    Name = "msvcm80.dll";
-#else
-    Name = "msvcm80d.dll";
-#endif
-End
-#endif
-#endif
-#endif
-
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_Brand_File_Msvcm80crt_Manifest
-    BIN_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Brand_Dir_Program;
-#ifndef _STLP_DEBUG
-    Name = "Microsoft.VC80.CRT.manifest";
-#else
-    Name = "Microsoft.VC80.DebugCRT.manifest";
-#endif
-End
-#endif
-#endif
-#endif
-
 // Profiles
 
 Profile gid_Brand_Profile_Bootstrap_Ini
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 2a529233e7a7..726783b9b3d0 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -947,60 +947,6 @@ End
 #endif
 #endif
 
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_File_Lib_Msvcr80
-    BIN_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Common_Ure;
-//    Dir = gid_Dir_Program;
-#ifndef _STLP_DEBUG
-    Name = "msvcr80.dll";
-#else
-    Name = "msvcr80d.dll";
-#endif
-End
-#endif
-#endif
-#endif
-
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_File_Lib_Msvcp80
-    BIN_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Common_Ure;
-//    Dir = gid_Dir_Program;
-#ifndef _STLP_DEBUG
-    Name = "msvcp80.dll";
-#else
-    Name = "msvcp80d.dll";
-#endif
-End
-#endif
-#endif
-#endif
-
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_File_Lib_Msvcm80
-    BIN_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Common_Ure;
-//    Dir = gid_Dir_Program;
-#ifndef _STLP_DEBUG
-    Name = "msvcm80.dll";
-#else
-    Name = "msvcm80d.dll";
-#endif
-End
-#endif
-#endif
-#endif
-
 #if defined(WNT) && defined( _gcc3 )
 
 #if defined(MINGW_GCCDLL)
@@ -1029,24 +975,6 @@ End
 
 #endif
 
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_File_Msvcm80crt_Manifest
-    BIN_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Common_Ure;
-//    Dir = gid_Dir_Program;
-#ifndef _STLP_DEBUG
-    Name = "Microsoft.VC80.CRT.manifest";
-#else
-    Name = "Microsoft.VC80.DebugCRT.manifest";
-#endif
-End
-#endif
-#endif
-#endif
-
 #if defined(OS2)
 STD_LIB_FILE(gid_File_Lib_Mysql,mysql)
 STD_LIB_FILE(gid_File_Lib_Odbc,odbc)
@@ -1857,24 +1785,6 @@ STD_LIB_FILE( gid_File_Lib_Oooimprovecore , oooimpc)
 STD_LIB_FILE( gid_File_Lib_Oooimprovecore , oooimprovecore)
 #endif
 
-#if defined WNT && !defined _gcc3 && !defined SYSTEM_MOZILLA && !defined WITHOUT_MOZILLA && \
-    !(defined M1400 && defined PROF_EDITION && !defined _STLP_DEBUG)
-        // see common_brand.scp gid_Brand_File_Lib_Msvcp80 and
-        // gid_Brand_File_Lib_Msvcr80
-File gid_File_Moz_Msvcp80
-    TXT_FILE_BODY;
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = SCP2_URE_DL_NORMAL("msvcp80");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-End
-File gid_File_Moz_Msvcr80
-    TXT_FILE_BODY;
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = SCP2_URE_DL_NORMAL("msvcr80");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-End
-#endif
-
 #if defined(WNT)
 File gid_File_Lib_Msvcr100
     TXT_FILE_BODY;
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index a3b289737b67..d014a3a1b40a 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -404,8 +404,6 @@ Module gid_Module_Root_Files_5
     gid_File_Lib_Mingw_GccS,
     gid_File_Lib_Mingw_Stdcpp,
     gid_File_Lib_Mingwm10,
-	gid_File_Lib_Msvcp70,
-	gid_File_Lib_Msvcr70,
 	gid_File_Lib_Ole,
 	gid_File_Lib_Patchmsi,
 	gid_File_Lib_Reg4allmsdoc,
@@ -416,8 +414,6 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Gconfebe,
 	gid_File_Lib_Wininetbe,
 	gid_File_Lib_Macbe,
-	gid_File_Lib_Msvcp70_So,
-	gid_File_Lib_Msvcr70_So,
 	gid_File_Lib_Gdiplus,
 	gid_File_Lib_Stlport_Vc6,
 	gid_File_Lib_Stlport_Vc7,
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index a908126741d3..5545ab8eed01 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -195,74 +195,6 @@ End
 
 // Public Dynamic Libraries:
 
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_File_Lib_Msvcr80_Ure
-    BIN_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_URE_DL_DIR;
-#ifndef _STLP_DEBUG
-    Name = "msvcr80.dll";
-#else
-    Name = "msvcr80d.dll";
-#endif
-End
-#endif
-#endif
-#endif
-
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_File_Lib_Msvcp80_Ure
-    BIN_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_URE_DL_DIR;
-#ifndef _STLP_DEBUG
-    Name = "msvcp80.dll";
-#else
-    Name = "msvcp80d.dll";
-#endif
-End
-#endif
-#endif
-#endif
-
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_File_Lib_Msvcm80_Ure
-    BIN_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_URE_DL_DIR;
-#ifndef _STLP_DEBUG
-    Name = "msvcm80.dll";
-#else
-    Name = "msvcm80d.dll";
-#endif
-End
-#endif
-#endif
-#endif
-
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_File_Msvcm80crt_Manifest_Ure
-    BIN_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_URE_DL_DIR;
-#ifndef _STLP_DEBUG
-    Name = "Microsoft.VC80.CRT.manifest";
-#else
-    Name = "Microsoft.VC80.DebugCRT.manifest";
-#endif
-End
-#endif
-#endif
-#endif
-
 File gid_File_Dl_Cppu
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
@@ -1042,38 +974,6 @@ End
 
 #endif
 
-#ifdef WNT
-#if defined(M1310)
-File gid_File_Dl_Msvcr71
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-#if defined _STLP_DEBUG
-    Name = SCP2_URE_DL_NORMAL("msvcr71d");
-#else
-    Name = SCP2_URE_DL_NORMAL("msvcr71");
-#endif
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "074DE395-C6EB-47F7-A587-6311F89C14B4";
-End
-#endif
-#endif
-
-#if defined(WNT)
-#if defined(M1310)
-File gid_File_Dl_Msvcp71
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-#if defined _STLP_DEBUG
-    Name = SCP2_URE_DL_NORMAL("msvcp71d");
-#else
-    Name = SCP2_URE_DL_NORMAL("msvcp71");
-#endif
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "1AF2708A-AAE2-4F25-ADF5-E61A549A51C2";
-End
-#endif
-#endif
-
 #if defined WNT
 File gid_File_Dl_Uwinapi
     TXT_FILE_BODY;
@@ -1249,13 +1149,7 @@ Module gid_Module_Root_Ure_Hidden
             gid_File_Lib_Mingw_GccS_Ure,
             gid_File_Lib_Mingw_Stdcpp_Ure,
             gid_File_Lib_Mingwm10_Ure,
-            gid_File_Dl_Msvcr71,
-            gid_File_Dl_Msvcp71,
             gid_File_Dl_Uwinapi,
-            gid_File_Lib_Msvcr80_Ure,
-            gid_File_Lib_Msvcp80_Ure,
-            gid_File_Lib_Msvcm80_Ure,
-            gid_File_Msvcm80crt_Manifest_Ure,
             gid_File_Java_UnoloaderJar,
             gid_File_Java_JuhJar,
             gid_File_Java_JurtJar,
diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp
index e3592912d518..d19996de0fde 100644
--- a/scp2/source/winexplorerext/file_winexplorerext.scp
+++ b/scp2/source/winexplorerext/file_winexplorerext.scp
@@ -89,15 +89,6 @@ End
 
 #endif
 
-#if defined M1310
-File gid_File_Lib_Shlxthdl_Msvcr71
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Shlxthdl;
-    Name = SCP2_URE_DL_NORMAL("msvcr71" SCP2_STDLP_DEBUG);
-    Styles = (PACKED);
-End
-#endif
-
 File gid_File_Lib_Shlxtmsi
     TXT_FILE_BODY;
     Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
diff --git a/scp2/source/winexplorerext/module_winexplorerext.scp b/scp2/source/winexplorerext/module_winexplorerext.scp
index 1dec1582b7ac..aae0aff3b007 100644
--- a/scp2/source/winexplorerext/module_winexplorerext.scp
+++ b/scp2/source/winexplorerext/module_winexplorerext.scp
@@ -34,7 +34,6 @@ Module gid_Module_Optional_Winexplorerext
 			 gid_File_Lib_Shlxthdl64,
 			 gid_File_Lib_OOoFilt,
 			 gid_File_Lib_OOoFilt64,
-             gid_File_Lib_Shlxthdl_Msvcr71,
              gid_File_Lib_Shlxtmsi,
              gid_File_Lib_Reg64,
              gid_File_Tmp_Userinstall_Winexplorerext_Inf);