ka102: rebased to DEV300_m104

4 files changed, 15 insertions, 52 deletions

diff --git a/scp2/prj/build.lst b/scp2/prj/build.lst
index f3fbbec38273..10632bfc4d45 100644
--- a/scp2/prj/build.lst
+++ b/scp2/prj/build.lst
@@ -1,4 +1,4 @@
-cp    scp2    :    l10n i18npool setup_native l10ntools PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL
+cp    scp2    :    L10N:l10n i18npool setup_native l10ntools PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL
 cp    scp2                        usr1     -    all    cp_mkout NULL
 cp    scp2\macros                 nmake    -    all    cp_langmacros NULL
 cp    scp2\source\templates       nmake    -    all    cp_langtemplates NULL
diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp
index d6f294f1da08..b95df7d7f3ac 100644
--- a/scp2/source/ooo/scpaction_ooo.scp
+++ b/scp2/source/ooo/scpaction_ooo.scp
@@ -347,15 +347,6 @@ ScpAction scp_Copy_Xpd_Help_Html_Uninstallationprologue_En_Us
     Subdir = "installdata/html";
 End
 
-#if defined LINUX || defined SOLARIS
-ScpAction scp_Copy_Update_Script
-    Copy = "update";
-    Name = "update";
-    Styles = (SCPZIP_REPLACE);
-    UnixRights = 775;
-End
-#endif
-
 #ifdef MACOSX
 ScpAction scp_Copy_Dmg_Background_Image
   #if defined(BUILD_SPECIAL)
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 804f0edad0b2..2d6b8858eca1 100755
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -296,14 +296,6 @@ File gid_File_Dl_Reg
     // CompID = "D5313B1F-D09F-401F-B180-891F70D489ED";
 End
 
-File gid_File_Dl_Rmcxt
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_VER("rmcxt", "3");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "E0C091E3-7C18-4C32-B9CF-4D95AC243801";
-End
-
 File gid_File_Dl_Store
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
@@ -390,14 +382,6 @@ Shortcut gid_Shortcut_Dl_JavaUno
 End
 #endif
 
-File gid_File_Dl_UrpUno
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_NORMAL("urp_uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "D9F647ED-8E6F-4F80-8D2B-A45372B6AB60";
-End
-
 File gid_File_Dl_UnsafeUnoUno
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
@@ -678,20 +662,19 @@ File gid_File_Dl_Acceptor
     // CompID = "31183C51-C9A4-4D7A-A2F4-103252E1FEB0";
 End
 
-File gid_File_Dl_Bootstrap
+File gid_File_Dl_Binaryurp
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_BARE("bootstrap.uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "2620B307-25DB-498F-B2B8-46D928165331";
+    Name = SCP2_URE_DL_BARE("binaryurp.uno");
+    Styles = (PACKED);
 End
 
-File gid_File_Dl_Bridgefac
+File gid_File_Dl_Bootstrap
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_BARE("bridgefac.uno");
+    Name = SCP2_URE_DL_BARE("bootstrap.uno");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "E025163F-FE1E-4E8C-B0E5-49C08924A646";
+    // CompID = "2620B307-25DB-498F-B2B8-46D928165331";
 End
 
 File gid_File_Dl_Connector
@@ -779,14 +762,6 @@ File gid_File_Dl_Reflection
     // CompID = "601C7946-CFEB-4F56-9429-6D5963188DF3";
 End
 
-File gid_File_Dl_Remotebridge
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_BARE("remotebridge.uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "B440B28E-B7AD-40C7-89E1-1508CA798347";
-End
-
 File gid_File_Dl_Streams
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
@@ -1131,7 +1106,6 @@ Module gid_Module_Root_Ure_Hidden
             gid_File_Dl_Salhelper,
             gid_File_Dl_Profile_Uno,
             gid_File_Dl_Reg,
-            gid_File_Dl_Rmcxt,
             gid_File_Dl_Store,
             gid_File_Dl_Xmlreader,
             gid_File_Dl_Jvmaccess,
@@ -1141,7 +1115,6 @@ Module gid_Module_Root_Ure_Hidden
             gid_File_Dl_Profile_Jvmfwk3rc,
             gid_File_Dl_ComnameUno,
             gid_File_Dl_JavaUno,
-            gid_File_Dl_UrpUno,
             gid_File_Dl_UnsafeUnoUno,
             gid_File_Dl_AffineUnoUno,
             gid_File_Dl_LogUnoUno,
@@ -1150,8 +1123,8 @@ Module gid_Module_Root_Ure_Hidden
             gid_File_Dl_Juh,
             gid_File_Dl_Juhx,
             gid_File_Dl_Acceptor,
+            gid_File_Dl_Binaryurp,
             gid_File_Dl_Bootstrap,
-            gid_File_Dl_Bridgefac,
             gid_File_Dl_Connector,
             gid_File_Dl_Introspection,
             gid_File_Dl_Invocadapt,
@@ -1161,7 +1134,6 @@ Module gid_Module_Root_Ure_Hidden
             gid_File_Dl_Namingservice,
             gid_File_Dl_Proxyfac,
             gid_File_Dl_Reflection,
-            gid_File_Dl_Remotebridge,
             gid_File_Dl_Stocservices,
             gid_File_Dl_Streams,
             gid_File_Dl_Textinstream,
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index 7bd6c18fae99..2c46065db8f3 100755
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -201,12 +201,12 @@ End
 
 WindowsCustomAction gid_Customaction_Register_Extensions
 	Name = "RegisterExtensions";
-	Typ = "65";
+	Typ = "1025";
 	Source = "shlxtmsi.dll";
 	Target = "RegisterExtensions";
 	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\"", "end");
-	Assignment2 = ("AdminExecuteSequence", "Not REMOVE=\"ALL\"", "end");
+	Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\"", "behind_SetInstalllocation");
+	Assignment2 = ("AdminExecuteSequence", "Not REMOVE=\"ALL\"", "behind_SetInstalllocation");
 End
 
 WindowsCustomAction gid_Customaction_Remove_Extensions
@@ -264,8 +264,8 @@ WindowsCustomAction gid_Customaction_CopyExtensionData
     Source = "shlxtmsi.dll";
     Target = "copyExtensionData";
     Inbinarytable = 1;
-    Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\"", "RegisterExtensions");
-    Assignment2 = ("AdminExecuteSequence", "", "RegisterExtensions");
+    Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\"", "end");
+    Assignment2 = ("AdminExecuteSequence", "", "end");
 End
 
 WindowsCustomAction gid_Customaction_RegCleanOld
@@ -474,8 +474,8 @@ WindowsCustomAction gid_Customaction_RebaseLibrariesonproperties
 	Source = "rebase.dll";
 	Target = "RebaseLibrariesOnProperties";
 	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\"", "end");
-	Assignment2 = ("AdminExecuteSequence", "Not REMOVE=\"ALL\"", "end");
+	Assignment1 = ("InstallExecuteSequence", "VersionNT < 600 And Not REMOVE=\"ALL\"", "end");
+	Assignment2 = ("AdminExecuteSequence", "VersionNT < 600 And Not REMOVE=\"ALL\"", "end");
 End
 
 WindowsCustomAction gid_Customaction_ShowSurvey