[Libreoffice-commits] .: scp2/source

[Tor Lillqvist]

 scp2/source/ooo/common_brand.scp                     |   10 -----
 scp2/source/ooo/ure.scp                              |   34 -------------------
 scp2/source/winexplorerext/file_winexplorerext.scp   |    9 -----
 scp2/source/winexplorerext/module_winexplorerext.scp |    1 
 4 files changed, 54 deletions(-)

New commits:
commit af39f35425530160283fec081eb0073b9ffcab0d
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Dec 21 17:11:34 2010 +0200

    Drop msvcr71, see fdo#32426

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index e4cf708..6e89001 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -62,7 +62,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_Shell,
              gid_Brand_File_Bmp_IntroAbout,
@@ -595,15 +594,6 @@ File gid_Brand_File_Bin_Unopkg
     Name = "unopkg.bin";
 End
 
-#ifdef WNT
-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
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
old mode 100755
new mode 100644
index 48c1b3f..ce790cb
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -1068,38 +1068,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;
@@ -1309,8 +1277,6 @@ 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_Unicows,
             gid_File_Dl_Uwinapi,
             gid_File_Lib_Msvcr80_Ure,
diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp
old mode 100755
new mode 100644
index 50f0aa0..a03a55e
--- a/scp2/source/winexplorerext/file_winexplorerext.scp
+++ b/scp2/source/winexplorerext/file_winexplorerext.scp
@@ -87,15 +87,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
old mode 100755
new mode 100644
index 6993ba2..f20edcc
--- a/scp2/source/winexplorerext/module_winexplorerext.scp
+++ b/scp2/source/winexplorerext/module_winexplorerext.scp
@@ -38,7 +38,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);