CWS-TOOLING: integrate CWS tkr32

4 files changed, 6 insertions, 46 deletions

diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index cda0f3d363a5..e34baedf9515 100755
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -233,13 +233,13 @@ File gid_File_Lib_Curl
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
     #ifdef MACOSX
-       Name = STRING(CONCAT2(libcurl.3,UNXSUFFIX));
+       Name = STRING(CONCAT2(libcurl.4,UNXSUFFIX));
     #else
-       Name = STRING(CONCAT3(libcurl,UNXSUFFIX,.3));
+       Name = STRING(CONCAT3(libcurl,UNXSUFFIX,.4));
     #endif
   #else
    #ifdef _gcc3
-    Name = "libcurl-3.dll";
+    Name = "libcurl-4.dll";
    #else
     Name = "libcurl.dll";
    #endif
diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp
index dd8b8912ae8c..e51b8945903a 100644
--- a/scp2/source/winexplorerext/file_winexplorerext.scp
+++ b/scp2/source/winexplorerext/file_winexplorerext.scp
@@ -42,13 +42,6 @@ File gid_File_Lib_OOoFilt
     Name = "ooofilt.dll";
 End
 
-File gid_File_Lib_OOoFiltProxy
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Shlxthdl;
-    Name = "ooofiltproxy.dll";
-End
-
 #ifdef BUILD_X64
 
 File gid_File_Lib_OOoFilt64
@@ -59,14 +52,6 @@ File gid_File_Lib_OOoFilt64
     ComponentCondition = "VersionNT64";
 End
 
-File gid_File_Lib_OOoFiltProxy64
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Shlxthdl;
-    Name = "ooofiltproxy_x64.dll";
-    ComponentCondition = "VersionNT64";
-End
-
 #endif
 
 File gid_File_Lib_Shlxthdl
@@ -96,29 +81,6 @@ File gid_File_Lib_Shlxthdl_Msvcr71
 End
 #endif
 
-#if !defined USE_SYSTEM_STL
-File gid_File_Lib_Shlxthdl_Stlport
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Shlxthdl;
-#if defined _gcc3 /* && defined WNT */
-#if defined _STLP_DEBUG
-    Name = SCP2_URE_DL_NORMAL("libstlport_gcc_stldebug");
-#else
-    Name = SCP2_URE_DL_NORMAL("libstlport_gcc");
-#endif
-#elif (defined(M1310) || defined(M1400) || defined(M1500)) /* && defined WNT */
-#if defined _STLP_DEBUG
-    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);
-End
-#endif
-
 File gid_File_Lib_Shlxtmsi
     TXT_FILE_BODY;
     Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
@@ -132,3 +94,4 @@ File gid_File_Lib_Reg64
     Dir = SCP2_OOO_BIN_DIR;
     Name = "reg64msi.dll";
 End
+
diff --git a/scp2/source/winexplorerext/module_winexplorerext.scp b/scp2/source/winexplorerext/module_winexplorerext.scp
index c1f0ac7f9010..76dd4e5b209d 100644
--- a/scp2/source/winexplorerext/module_winexplorerext.scp
+++ b/scp2/source/winexplorerext/module_winexplorerext.scp
@@ -40,11 +40,8 @@ Module gid_Module_Optional_Winexplorerext
     Files = (gid_File_Lib_Shlxthdl,
 			 gid_File_Lib_Shlxthdl64,
 			 gid_File_Lib_OOoFilt,
-			 gid_File_Lib_OOoFiltProxy,
 			 gid_File_Lib_OOoFilt64,
-			 gid_File_Lib_OOoFiltProxy64,
              gid_File_Lib_Shlxthdl_Msvcr71,
-             gid_File_Lib_Shlxthdl_Stlport,
              gid_File_Lib_Shlxtmsi,
              gid_File_Lib_Reg64,
              gid_File_Tmp_Userinstall_Winexplorerext_Inf);    
diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
index 87084695ada0..b378f3db883e 100644
--- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
+++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
@@ -127,8 +127,8 @@ RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer
     ModuleID = gid_Module_Root;
     Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32";
     Styles = (X64); // Values: X64 / X64_ONLY
-    Value = "[BASISINSTALLLOCATION]program\shlxthdl\ooofiltproxy.dll";
-    Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\ooofiltproxy_x64.dll";
+    Value = "[BASISINSTALLLOCATION]program\shlxthdl\ooofilt.dll";
+    Val64 = "[BASISINSTALLLOCATION]program\shlxthdl\ooofilt_x64.dll";
 End
 
 RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_ThreadingModel