CWS-TOOLING: integrate CWS native196_DEV300

6 files changed, 25 insertions, 41 deletions

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 2aa4aa6641dc..ae4adbeff802 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -330,7 +330,7 @@ File gid_Brand_File_BasisLink
    TXT_FILE_BODY;
    Dir = gid_Dir_Brand_Root;
    Name = "basis-link";
-   Styles = (PACKED, SCPZIP_REPLACE, ONLY_INSTALLED_PRODUCT);
+   Styles = (PACKED);
 End
 #elif defined MACOSX
 Directory gid_Brand_Dir_BasisLink
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index daf5bf2e8db7..732ce619a25a 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: directory_ooo.scp,v $
- * $Revision: 1.55 $
+ * $Revision: 1.55.66.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -100,9 +100,13 @@ End
 
 #ifndef MACOSX
 Directory gid_Dir_Ooo_Basis
+  #ifdef WNT
+    ParentID = gid_Dir_Brand_Root;
+  #else
     ParentID = gid_Dir_Ooo_Openofficeorg;
+  #endif
   #ifdef WNT
-    HostName = "Basis ${OOOBASEVERSION}";
+    HostName = "Basis";
   #else
     HostName = "basis${OOOBASEVERSION}";
   #endif
diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf
index ca3a5430747f..a5257ea58d0e 100644
--- a/scp2/source/ooo/module_langpack.ulf
+++ b/scp2/source/ooo/module_langpack.ulf
@@ -484,6 +484,12 @@ en-US = "Serbian (Latin)"
 [STR_DESC_MODULE_LANGPACK_SH_YU]
 en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION"
 
+[STR_NAME_MODULE_LANGPACK_SH]
+en-US = "Serbian (Latin)"
+
+[STR_DESC_MODULE_LANGPACK_SH]
+en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION"
+
 [STR_NAME_MODULE_LANGPACK_GA]
 en-US = "Irish"
 
@@ -496,6 +502,12 @@ en-US = "Serbian (Cyrillic)"
 [STR_DESC_MODULE_LANGPACK_SR_CS]
 en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION"
 
+[STR_NAME_MODULE_LANGPACK_SR]
+en-US = "Serbian (Cyrillic)"
+
+[STR_DESC_MODULE_LANGPACK_SR]
+en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION"
+
 [STR_NAME_MODULE_LANGPACK_BS]
 en-US = "Bosnian"
 
diff --git a/scp2/source/ooo/ure_into_ooo.scp b/scp2/source/ooo/ure_into_ooo.scp
index 3d2fa8b96069..0f5be1aae19b 100755
--- a/scp2/source/ooo/ure_into_ooo.scp
+++ b/scp2/source/ooo/ure_into_ooo.scp
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ure_into_ooo.scp,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.176.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,7 +32,11 @@
 
 #ifndef MACOSX
 Directory gid_Dir_Common_Ure
+  #ifdef WNT
+    ParentID = gid_Dir_Brand_Root;
+  #else
     ParentID = gid_Dir_Ooo_Openofficeorg;
+  #endif
   #ifdef WNT
     HostName = "URE";
   #else
@@ -47,7 +51,7 @@ File gid_File_UreLink
     TXT_FILE_BODY;
     Dir = gid_Dir_Ooo_Basis;
     Name = "ure-link";
-    Styles = (PACKED, ONLY_INSTALLED_PRODUCT);
+    Styles = (PACKED);
 End
 #elif defined MACOSX
 Directory gid_Dir_UreLink
diff --git a/scp2/source/ooo/ure_standalone.scp b/scp2/source/ooo/ure_standalone.scp
index 1de8c2900645..d4fd951c9771 100755
--- a/scp2/source/ooo/ure_standalone.scp
+++ b/scp2/source/ooo/ure_standalone.scp
@@ -108,15 +108,6 @@ RegistryItem gid_Regitem_Ure_Software_Manufacturer_Productname_Productversion_Up
 	Styles = (ALWAYS_REQUIRED);
 End
 
-RegistryItem gid_Regitem_Ure_Software_OpenOfficeorg_Ooobaseversion_Install
-	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\URE\%URELAYERVERSION";
-	ModuleID = gid_Module_Root;
-	Name = "INSTALLLOCATION";
-	Value = "[INSTALLLOCATION]";
-	Styles = (ALWAYS_REQUIRED);
-End
-
 RegistryItem gid_Regitem_Ure_Software_Manufacturer_Productname_Productversion_Productcode_Ureinstall
 	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
 	Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
@@ -135,11 +126,3 @@ RegistryItem gid_Regitem_Ure_Software_Manufacturer_Productname_Productversion_Up
 	Styles = (ALWAYS_REQUIRED);
 End
 
-RegistryItem gid_Regitem_Ure_Software_OpenOfficeorg_Ooobaseversion_Ureinstall
-	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\URE\%URELAYERVERSION";
-	ModuleID = gid_Module_Root;
-	Name = "UREINSTALLLOCATION";
-	Value = "[UREINSTALLLOCATION]";
-	Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_URELAYERVERSION);
-End
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index 0e86f5577f85..49579a9cde87 100755
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -217,25 +217,6 @@ WindowsCustomAction gid_Customaction_Check_Install_Directory
 	Assignment3 = ("ControlEvent", "CustomSetup", "Next", "DoAction", "CheckInstallDirectory", "Not Installed", "2");
 End
 
-WindowsCustomAction gid_Customaction_Create_Layerlinks
-	Name = "CreateLayerLinks";
-	Typ = "65";
-	Source = "shlxtmsi.dll";
-	Target = "CreateLayerLinks";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\"", "behind_InstallFinalize");
-	Assignment2 = ("AdminExecuteSequence", "", "behind_SetUreInstallLocation");
-End
-
-WindowsCustomAction gid_Customaction_Remove_Layerlinks
-	Name = "RemoveLayerLinks";
-	Typ = "65";
-	Source = "shlxtmsi.dll";
-	Target = "RemoveLayerLinks";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\"", "behind_CreateLayerLinks");
-End
-
 WindowsCustomAction gid_Customaction_Dotnetcheck
 	Name = "DotNetCheck";
 	Typ = "321";