CWS-TOOLING: integrate CWS native214

2009-01-05 16:05:30 +0100 is  r265877 : #i97060# version number 3.1 instead of 3.0
2009-01-05 14:02:05 +0100 is  r265868 : #i97060# 3.1 also for slackware packages
2008-12-15 13:47:31 +0100 is  r265482 : #i94714# adding string
2008-12-15 10:40:59 +0100 is  r265464 : #i94746# math.desktop for all products
2008-12-12 14:31:01 +0100 is  r265418 : #i94871# adjust image for dmg file
2008-12-12 13:02:05 +0100 is  r265409 : #i92038# avoiding sending mails to root
2008-12-12 12:43:58 +0100 is  r265408 : #158469# removing registry entries for wps and ichitaro
2008-12-12 12:36:13 +0100 is  r265407 : #i95257# adding Mongolian as nsis language
2008-12-11 15:59:57 +0100 is  r265325 : #89742# fixing typo
2008-12-11 15:54:43 +0100 is  r265324 : #i89732# minor string fixes
2008-12-11 15:35:29 +0100 is  r265320 : #i97060# gnome also for user installation required
2008-12-11 12:34:36 +0100 is  r265283 : #i96575# removing superfluous dependencies
2008-12-10 15:31:04 +0100 is  r265196 : #i96306# adding Gaelic
2008-12-10 14:35:28 +0100 is  r265187 : #i94776# ure version 1.5
2008-12-10 11:40:47 +0100 is  r265161 : #158920# new extension process
2008-12-10 11:38:46 +0100 is  r265160 : #158920# new extension process
2008-12-10 11:37:32 +0100 is  r265159 : #158920# new extension process
2008-12-09 13:05:20 +0100 is  r265077 : #i94453# longer textbox
2008-12-09 12:41:35 +0100 is  r265076 : #i97060# setting version 3.1.0

6 files changed, 25 insertions, 65 deletions

diff --git a/scp2/source/binfilter/registryitem_binfilter.ulf b/scp2/source/binfilter/registryitem_binfilter.ulf
index e9874f18d..1372ee893 100644
--- a/scp2/source/binfilter/registryitem_binfilter.ulf
+++ b/scp2/source/binfilter/registryitem_binfilter.ulf
@@ -52,3 +52,5 @@ en-US = "StarOffice 5.0 Formula"
 [STR_REG_VAL_SO52_CHART_OOO]
 en-US = "StarOffice 5.0 Chart"
 
+[STR_REG_VAL_SO50_TEMPLATE_OOO]
+en-US = "StarOffice 5.0 Template"
diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp
index 62e013b8b..4c5863569 100644
--- a/scp2/source/gnome/module_gnome.scp
+++ b/scp2/source/gnome/module_gnome.scp
@@ -44,7 +44,11 @@ Module gid_Module_Optional_Gnome
     Default = YES;
     PackageInfo = "packinfo_office.txt";
     MOD_NAME_DESC(MODULE_OPTIONAL_GNOME);
+#ifdef LINUX
+    Styles = ();
+#else
     Styles = (DONTSHOWINUSERINSTALL);
+#endif
 #ifdef ENABLE_GNOMEVFS
     XpdCheckSolaris = "SUNWgnome-vfs";
 #endif
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 5b5a76baa..6bccbd8eb 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -628,6 +628,15 @@ End
 #endif
 
 #if defined UNX && ! defined MACOSX
+File gid_Brand_File_Share_Xdg_Math
+	TXT_FILE_BODY;
+	Dir = gid_Brand_Dir_Share_Xdg;
+	Name = "math.desktop";
+	Styles = (PACKED,SCPZIP_REPLACE);
+End
+#endif
+
+#if defined UNX && ! defined MACOSX
 File gid_Brand_File_Share_Xdg_Printeradmin
     TXT_FILE_BODY;
     Dir = gid_Brand_Dir_Share_Xdg;
diff --git a/scp2/source/ooo/ooo_brand.scp b/scp2/source/ooo/ooo_brand.scp
index a83067cb7..cc5780b56 100644
--- a/scp2/source/ooo/ooo_brand.scp
+++ b/scp2/source/ooo/ooo_brand.scp
@@ -55,15 +55,4 @@ ProfileItem gid_Brand_Profileitem_Bootstrap_Errorreport_Server
   #endif
 End
 
-#if defined UNX && ! defined MACOSX
-
-File gid_Brand_File_Share_Xdg_Math
-	TXT_FILE_BODY;
-	Dir = gid_Brand_Dir_Share_Xdg;
-	Name = "math.desktop";
-	Styles = (PACKED,SCPZIP_REPLACE);
-End
-
-#endif
-
 BRAND_RES_FILE( gid_Brand_File_Res_Ooo, ooo )
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index 335edcd8f..257835bbd 100755
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -237,6 +237,16 @@ WindowsCustomAction gid_Customaction_CopyEditionData
     Assignment2 = ("AdminExecuteSequence", "", "end");
 End
 
+WindowsCustomAction gid_Customaction_CopyExtensionData
+    Name = "CopyExtensionData";
+    Typ = "1";
+    Source = "shlxtmsi.dll";
+    Target = "copyExtensionData";
+    Inbinarytable = 1;
+    Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\"", "RegisterExtensions");
+    Assignment2 = ("AdminExecuteSequence", "", "RegisterExtensions");
+End
+
 WindowsCustomAction gid_Customaction_RegCleanOld
 	Name = "RegCleanOld";
 	Typ = "65";
diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp
index bbd41b4d7..1e8feee4a 100644
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -1278,33 +1278,6 @@ RegistryItem gid_Regitem_OpenOffice_WPD_OpenWith_Writer
     Value = " ";
 End
 
-// .WPS
-RegistryItem gid_Regitem_OpenOffice_WPS_OpenWith_Writer
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".wps\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
-    Value = " ";
-End
-
-// .JTD
-RegistryItem gid_Regitem_OpenOffice_JTD_OpenWith_Writer
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".jtd\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
-    Value = " ";
-End
-
-// .JTT
-RegistryItem gid_Regitem_OpenOffice_JTT_OpenWith_Writer
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".jtt\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
-    Value = " ";
-End
-
 // .HWP
 RegistryItem gid_Regitem_OpenOffice_HWP_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -1431,33 +1404,6 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Styles = ();
 End
 
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Wps
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
-    Name = ".Wps";
-    Value = "opendocument.WriterDocument.1";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Jtd
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
-    Name = ".jtd";
-    Value = "opendocument.WriterDocument.1";
-    Styles = ();
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Jtt
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
-    Name = ".jtt";
-    Value = "opendocument.WriterDocument.1";
-    Styles = ();
-End
-
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Hwp
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";