diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-05-15 14:12:42 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-05-15 14:12:42 +0000 |
commit | fe868574cc0f8247ff2c915c2957fac901f91be0 (patch) | |
tree | 01af3d45c2c1d3455cba6b9925b0fe2c762fb14a /scp2/source/calc | |
parent | #100000# some changes for SO build environment (diff) | |
download | core-fe868574cc0f8247ff2c915c2957fac901f91be0.tar.gz core-fe868574cc0f8247ff2c915c2957fac901f91be0.zip |
CWS-TOOLING: integrate CWS dv11
2009-05-13 16:50:24 +0200 dv r271863 : #i101829# Use UPGRADINGPRODUCTCODE to detect major upgrade
2009-04-17 15:55:48 +0200 dv r270953 : CWS-TOOLING: rebase CWS dv11 to trunk@270723 (milestone: DEV300:m46)
2009-04-17 09:14:21 +0200 dv r270916 : #i100915# Use better product name
2009-04-16 14:41:49 +0200 dv r270884 : #i101132# Use a waiting thread to defere update check
2009-04-07 15:46:52 +0200 dv r270599 : #i100915# Use one include file for all version.rc files
2009-04-07 13:49:56 +0200 dv r270596 : #i100915# Use one include file for all version.rc files
2009-04-03 09:04:08 +0200 dv r270447 : #100776# Added Microsoft XML file types to 'Default Applications', cleaned up Application name display in 'Default Applications'
2009-04-01 10:13:28 +0200 dv r270306 : #i100713# Remove instmsia.exe from installation set
2009-03-30 16:35:35 +0200 dv r270240 : CWS-TOOLING: rebase CWS dv11 to trunk@270033 (milestone: DEV300:m45)
2009-03-27 10:24:40 +0100 dv r270138 : #i100410# Show survey after deinstalling OpenOffice.org (Windows only)
2009-03-18 15:05:31 +0100 dv r269679 : #i98780# Use 'Desktop' folder only, if it exists
2009-03-17 11:19:47 +0100 dv r269581 : #i100082# Ignore updates with failed dependencies for automatic update check
2009-03-13 14:37:27 +0100 dv r269479 : #i100082# Use 'value' instead of 'name' to create error message
2009-03-13 10:14:48 +0100 dv r269460 : #i100082# Support better error message when extension manager update finds an incompatible update
Diffstat (limited to 'scp2/source/calc')
-rw-r--r-- | scp2/source/calc/file_calc.scp | 5 | ||||
-rw-r--r-- | scp2/source/calc/registryitem_calc.scp | 52 |
2 files changed, 22 insertions, 35 deletions
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp index e49770f4ec0b..904960fdbdb1 100644 --- a/scp2/source/calc/file_calc.scp +++ b/scp2/source/calc/file_calc.scp @@ -155,5 +155,10 @@ File gid_File_Exe_Scalc BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; Name = EXENAME(scalc); + #ifdef WNT + FileDescription = "%PRODUCTNAME Calc"; + Styles = (PACKED, PATCH_SO_NAME); + #else Styles = (PACKED); + #endif End diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp index 0e767128194b..133dc6952c94 100644 --- a/scp2/source/calc/registryitem_calc.scp +++ b/scp2/source/calc/registryitem_calc.scp @@ -526,7 +526,7 @@ End RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sxc ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; - ModuleID = gid_Module_Root; + ModuleID = gid_Module_Prg_Calc_Bin; Name = ".sxc"; Value = "soffice.StarCalcDocument.6"; Styles = (); @@ -573,7 +573,7 @@ End RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_ods ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; - ModuleID = gid_Module_Root; + ModuleID = gid_Module_Prg_Calc_Bin; Name = ".ods"; Value = "opendocument.CalcDocument.1"; Styles = (); @@ -983,7 +983,7 @@ End RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Stc ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; - ModuleID = gid_Module_Root; + ModuleID = gid_Module_Prg_Calc_Bin; Name = ".stc"; Value = "opendocument.CalcDocument.1"; Styles = (); @@ -992,7 +992,7 @@ End RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Dif ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; - ModuleID = gid_Module_Root; + ModuleID = gid_Module_Prg_Calc_Bin; Name = ".dif"; Value = "opendocument.CalcDocument.1"; Styles = (); @@ -1001,53 +1001,35 @@ End RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Dbf ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; - ModuleID = gid_Module_Root; + ModuleID = gid_Module_Prg_Calc_Bin; Name = ".dbf"; Value = "opendocument.CalcDocument.1"; Styles = (); End -RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Xls - ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; - ModuleID = gid_Module_Root; - Name = ".xls"; - Value = "opendocument.CalcDocument.1"; - Styles = (); -End - -RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Xlw - ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; - ModuleID = gid_Module_Root; - Name = ".xlw"; - Value = "opendocument.CalcDocument.1"; - Styles = (); -End - -RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Xlt +RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Slk ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; - ModuleID = gid_Module_Root; - Name = ".xlt"; + ModuleID = gid_Module_Prg_Calc_Bin; + Name = ".slk"; Value = "opendocument.CalcDocument.1"; Styles = (); End -RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Slk +RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Csv ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; - ModuleID = gid_Module_Root; - Name = ".slk"; + ModuleID = gid_Module_Prg_Calc_Bin; + Name = ".csv"; Value = "opendocument.CalcDocument.1"; Styles = (); End -RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Csv +RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Xlw ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; - ModuleID = gid_Module_Root; - Name = ".csv"; + ModuleID = gid_Module_Prg_Calc_Bin; + Name = ".xlw"; Value = "opendocument.CalcDocument.1"; Styles = (); End @@ -1055,7 +1037,7 @@ End RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Wk1 ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; - ModuleID = gid_Module_Root; + ModuleID = gid_Module_Prg_Calc_Bin; Name = ".wk1"; Value = "opendocument.CalcDocument.1"; Styles = (); @@ -1064,7 +1046,7 @@ End RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Wks ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; - ModuleID = gid_Module_Root; + ModuleID = gid_Module_Prg_Calc_Bin; Name = ".wks"; Value = "opendocument.CalcDocument.1"; Styles = (); @@ -1073,7 +1055,7 @@ End RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_123 ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; - ModuleID = gid_Module_Root; + ModuleID = gid_Module_Prg_Calc_Bin; Name = ".123"; Value = "opendocument.CalcDocument.1"; Styles = (); |