INTEGRATION: CWS sysui26 (1.14.48); FILE MERGED

2008/06/30 20:21:09 dv 1.14.48.3: #i90335# Moved all binfilter related registry entries to binfilter module
2008/06/27 13:12:16 dv 1.14.48.2: Add Office to open with list for mso types, too
2008/06/25 08:58:25 dv 1.14.48.1: Register for mso file extensions

1 files changed, 10 insertions, 133 deletions

diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
index 7d37badc11c1..9d1476634cd3 100644
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: registryitem_calc.scp,v $
- * $Revision: 1.14 $
+ * $Revision: 1.15 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -266,86 +266,6 @@ RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Versionind
     Value = "opendocument.CalcDocument.1";
 End
 
-RegistryItem gid_Regitem_Sdc_Contenttype
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = ".sdc";
-    Name = "Content Type";
-    Value = "application/vnd.stardivision.calc";
-End
-
-RegistryItem gid_Regitem_Sdc_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "MIME\Database\Content Type\application/vnd.stardivision.calc";
-    Name = "Extension";
-    Value = ".sdc";
-End
-
-RegistryItem gid_Regitem_Sdc_So4_Mime_Database
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "MIME\Database\Content Type\application/x-starcalc";
-    Name = "Extension";
-    Value = ".sdc";
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_5
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "soffice.StarCalcDocument.5";
-    REG_VALUE_LNG(SO51_SPREADSHEET_OOO)
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "soffice.StarCalcDocument.5\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,29";
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Shell
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "soffice.StarCalcDocument.5\shell";
-    Value = "open";
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Shell_New
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "soffice.StarCalcDocument.5\shell\new";
-    REG_VALUE_LNG(NEW)
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Shell_New_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "soffice.StarCalcDocument.5\shell\new\command";
-    Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Shell_Open_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "soffice.StarCalcDocument.5\shell\open\command";
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Shell_Print_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "soffice.StarCalcDocument.5\shell\print\command";
-    Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
-End
-
-RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Shell_Printto_Command
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "soffice.StarCalcDocument.5\shell\printto\command";
-    Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
-End
-
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_6
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
@@ -593,22 +513,6 @@ RegistryItem gid_Regitem_Sxc_Mime_Database
     Value = ".sxc";
 End
 
-RegistryItem gid_Regitem__Sdc
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = ".sdc";
-    Value = "soffice.StarCalcDocument.5";
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_sdc
-    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
-    ModuleID = gid_Module_Root;
-    Name = ".sdc";
-    Value = "soffice.StarCalcDocument.5";
-    Styles = ();
-End
-
 
 RegistryItem gid_Regitem__Sxc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -975,15 +879,6 @@ RegistryItem gid_Regitem_OpenOffice_DBF_OpenWith_Calc
     Value = " ";
 End
 
-// .XLS
-RegistryItem gid_Regitem_OpenOffice_XLS_OpenWith_Calc
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".xls\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
-    Value = " ";
-End
-
 // .XLW
 RegistryItem gid_Regitem_OpenOffice_XLW_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -993,15 +888,6 @@ RegistryItem gid_Regitem_OpenOffice_XLW_OpenWith_Calc
     Value = " ";
 End
 
-// .XLT
-RegistryItem gid_Regitem_OpenOffice_XLT_OpenWith_Calc
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".xlt\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
-    Value = " ";
-End
-
 // .RTF
 RegistryItem gid_Regitem_OpenOffice_RTF_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -1011,24 +897,6 @@ RegistryItem gid_Regitem_OpenOffice_RTF_OpenWith_Calc
     Value = " ";
 End
 
-// .SDC
-RegistryItem gid_Regitem_OpenOffice_SDC_OpenWith_Calc
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".sdc\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
-    Value = " ";
-End
-
-// .VOR
-RegistryItem gid_Regitem_OpenOffice_VOR_OpenWith_Calc
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".vor\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
-    Value = " ";
-End
-
 // .SLK
 RegistryItem gid_Regitem_OpenOffice_SLK_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -1223,3 +1091,12 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Scal
     Name = "Path";
     Value = "<progpath>";
 End
+
+CONDITIONAL_REGISTER_DOC_EXTENSION( Xls,  gid_Module_Prg_Calc_Bin, xls,  XLS,  MS_EXCEL_WORKSHEET_OLD, 3, scalc.exe, open, Calc )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsx, gid_Module_Prg_Calc_Bin, xlsx, XLSX, MS_EXCEL_WORKSHEET, 3, scalc.exe, open, Calc )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsm, gid_Module_Prg_Calc_Bin, xlsm, XLSM, MS_EXCEL_WORKSHEET, 3, scalc.exe, open, Calc )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsb, gid_Module_Prg_Calc_Bin, xlsb, XLSB, MS_EXCEL_WORKSHEET, 3, scalc.exe, open, Calc )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Xlt,  gid_Module_Prg_Calc_Bin, xlt,  XLT,  MS_EXCEL_TEMPLATE_OLD, 4, scalc.exe, new, Calc )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Xltx, gid_Module_Prg_Calc_Bin, xltx, XLTX, MS_EXCEL_TEMPLATE, 4, scalc.exe, new, Calc )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Xltm, gid_Module_Prg_Calc_Bin, xltm, XLTM, MS_EXCEL_TEMPLATE, 4, scalc.exe, new, Calc )
+