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

12 files changed, 32 insertions, 71 deletions

diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index 771a46b32d4f..5468076d22d4 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -497,7 +497,7 @@ en-US = "&Abort"
 en-US = "&Cancel"
 
 [OOO_CONTROL_206]
-en-US = "<error text goes here><error text goes here><error text goes here><error text goes here><error text goes here><error text goes here><error text goes here><error text goes here><error text goes here><error text goes here><error text goes here>"
+en-US = "error text goes here  error text goes here  error text goes here  error text goes here  error text goes here  error text goes here  error text goes here  error text goes here  error text goes here  error text goes here"
 
 [OOO_CONTROL_207]
 en-US = "&Ignore"
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf
index 2ae1db4827b5..a5371150465d 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf
@@ -206,7 +206,7 @@ en-US = "Out of disk space -- Volume: '[2]'; required space: [3] KB; available s
 en-US = "Are you sure you want to cancel?"
 
 [OOO_ERROR_70]
-en-US = "The file [2][3] is being held in use{ by the following process: Name: [4], ID: [5], Window Title: [6]}.  Close that application and retry."
+en-US = "The file [2][3] is being held in use {by the following process: Name: [4], ID: [5], Window Title: [6]}.  Close that application and retry."
 
 [OOO_ERROR_71]
 en-US = "The product [2] is already installed, preventing the installation of this product.  The two products are incompatible."
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index 858d17f84c52..df12081ed1ef 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -269,7 +269,7 @@ ReadyToInstall	DlgTitle	Text	13	6	280	25	65538		OOO_CONTROL_170
 ReadyToInstall	DlgTitle2	Text	13	6	280	25	65538		OOO_CONTROL_171		
 ReadyToInstall	DlgTitle3	Text	13	6	280	25	65538		OOO_CONTROL_172		
 ReadyToInstall	InstallNow	PushButton	230	243	66	17	3		OOO_CONTROL_173	Cancel	
-ReadyToInstall	DesktopLink	CheckBox	21	100	200	10	3	CREATEDESKTOPLINK	OOO_CONTROL_319		
+ReadyToInstall	DesktopLink	CheckBox	21	100	300	10	3	CREATEDESKTOPLINK	OOO_CONTROL_319		
 ReadyToInstall	UpdateCheckBox	CheckBox	21	120	200	10	3	REMOVEOLDPRODUCTS	OOO_CONTROL_320		
 ReadyToRemove	Back	PushButton	164	243	66	17	3		OOO_CONTROL_174	RemoveNow	
 ReadyToRemove	Banner	Bitmap	297	0	77	44	1		BannerBmp		
diff --git a/instsetoo_native/res/DS_Store b/instsetoo_native/res/DS_Store
index 521691370161..ee936831bb43 100644
--- a/instsetoo_native/res/DS_Store
+++ b/instsetoo_native/res/DS_Store
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 4b4380dff002..db12652c693a 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -6,7 +6,7 @@ Globals
 		{
 			OOOBASEVERSION 3.0
 			OOOPACKAGEVERSION 3.0.0
-			UREPACKAGEVERSION 1.4.0
+			UREPACKAGEVERSION 1.5.0
 			URELAYERVERSION 1
 			BASISROOTNAME OpenOffice.org
 			UNIXBASISROOTNAME openoffice.org
@@ -244,8 +244,8 @@ URE
         variables
         {
             PRODUCTNAME URE
-            PRODUCTVERSION 1.4
-            PACKAGEVERSION 1.4
+            PRODUCTVERSION 1.5
+            PACKAGEVERSION 1.5
             PACKAGEREVISION 1
             PRODUCTEXTENSION
             LONG_PRODUCTEXTENSION
diff --git a/scp2/source/binfilter/registryitem_binfilter.ulf b/scp2/source/binfilter/registryitem_binfilter.ulf
index e9874f18ddf2..1372ee893ff4 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 62e013b8bfd8..4c58635690af 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 5b5a76baa475..6bccbd8ebbe0 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 a83067cb7173..cc5780b56f57 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 335edcd8f3e9..257835bbd9e9 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 bbd41b4d7ff1..1e8feee4aae3 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";
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 2338bd3dee82..2355ed689b32 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -1019,6 +1019,7 @@ sub nsis_language_converter
     elsif ( $language eq "lv" ) { $nsislanguage = "Latvian"; }
     elsif ( $language eq "lt" ) { $nsislanguage = "Lithuanian"; }
     elsif ( $language eq "mk" ) { $nsislanguage = "Macedonian"; }
+    elsif ( $language eq "mn" ) { $nsislanguage = "Mongolian"; }
     elsif ( $language eq "no" ) { $nsislanguage = "Norwegian"; }
     elsif ( $language eq "no-NO" ) { $nsislanguage = "Norwegian"; }
     elsif ( $language eq "es" ) { $nsislanguage = "Spanish"; }