INTEGRATION: CWS sysint1 (1.3.2); FILE MERGED

2004/11/24 15:06:04 hro 1.3.2.7: #i36906# UseoOld icons for old document formats
2004/11/23 13:42:38 hro 1.3.2.6: #i36906# New document icons
2004/11/22 15:53:49 hro 1.3.2.5: #i37080# New document format mimetypes
2004/11/17 15:25:40 is 1.3.2.4: #i36831# clsid with oo1.1 or so7
2004/11/17 09:19:56 is 1.3.2.3: #i36831# new file extensions
2004/11/16 15:46:51 is 1.3.2.2: #i36831# introducing SXWFORMATVERSION
2004/11/16 14:13:21 is 1.3.2.1: #i36828# new shellnew files

1 files changed, 52 insertions, 60 deletions

diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
index 10092827ccbe..9dacde36cf3b 100644
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: registryitem_calc.scp,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: pjunck $ $Date: 2004-11-03 08:06:05 $
+ *  last change: $Author: hr $ $Date: 2004-11-26 21:45:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -213,7 +213,7 @@ 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,3";
+    Value = "<progpath>\program\soffice.exe,29";
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_5_Shell
@@ -276,7 +276,7 @@ RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
     Subkey = "soffice.StarCalcDocument.6\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,3";
+    Value = "<progpath>\program\soffice.exe,29";
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Insertable
@@ -373,7 +373,7 @@ RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "soffice.StarCalcTemplate.6\DefaultIcon";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Value = "<progpath>\program\soffice.exe,4";
+    Value = "<progpath>\program\soffice.exe,30";
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_Shell
@@ -505,14 +505,6 @@ RegistryItem gid_Regitem_Sxc_Mime_Database
     Value = ".sxc";
 End
 
-RegistryItem gid_Regitem_Sxc_Soffice_Starcalcdocument_6_Shellnew
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = ".sxc\soffice.StarCalcDocument.6\ShellNew";
-    Name = "FileName";
-    Value = "soffice.sxc";
-End
-
 RegistryItem gid_Regitem__Sdc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
@@ -527,168 +519,168 @@ RegistryItem gid_Regitem__Sxc
     Value = "soffice.StarCalcDocument.6";
 End
 
-// new oos file extension 
+// new ods file extension 
 
-RegistryItem gid_Regitem_Oos_PersistentHandler
+RegistryItem gid_Regitem_Ods_PersistentHandler
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = ".oos\PersistentHandler";
+    Subkey = ".ods\PersistentHandler";
     Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
 End
 
-RegistryItem gid_Regitem_Oos_Shellex_00021500_0000_0000_C000_000000000046
+RegistryItem gid_Regitem_Ods_Shellex_00021500_0000_0000_C000_000000000046
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = ".oos\shellex\{00021500-0000-0000-C000-000000000046}";
+    Subkey = ".ods\shellex\{00021500-0000-0000-C000-000000000046}";
     Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
 End
 
-RegistryItem gid_Regitem_OOs_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
+RegistryItem gid_Regitem_Ods_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = ".oos\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
+    Subkey = ".ods\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
     Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
 End
 
 RegistryItem gid_Regitem_CalcDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "openoffice.CalcDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "opendocument.CalcDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
-RegistryItem gid_Regitem__Oos
+RegistryItem gid_Regitem__Ods
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = ".oos";
-    Value = "openoffice.CalcDocument.1";
+    Subkey = ".ods";
+    Value = "opendocument.CalcDocument.1";
 End
 
-RegistryItem gid_Regitem_Oos_Contenttype
+RegistryItem gid_Regitem_Ods_Contenttype
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = ".oos";
+    Subkey = ".ods";
     Name = "Content Type";
-    Value = "application/x-vnd.oasis.openoffice.spreadsheet";
+    Value = "application/vnd.oasis.opendocument.spreadsheet";
 End
 
-RegistryItem gid_Regitem_Oos_Mime_Database
+RegistryItem gid_Regitem_Ods_Mime_Database
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "MIME\Database\Content Type\application/x-vnd.oasis.openoffice.spreadsheet";
+    Subkey = "MIME\Database\Content Type\application/vnd.oasis.opendocument.spreadsheet";
     Name = "Extension";
-    Value = ".oos";
+    Value = ".ods";
 End
 
-RegistryItem gid_Regitem_Oos_Openoffice_Calcdocument_1_Shellnew
+RegistryItem gid_Regitem_Ods_Openoffice_Calcdocument_1_Shellnew
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = ".oos\openoffice.CalcDocument.1\ShellNew";
+    Subkey = ".ods\opendocument.CalcDocument.1\ShellNew";
     Name = "FileName";
-    Value = "soffice.oos";
+    Value = "soffice.ods";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_Curver
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "openoffice.CalcDocument\CurVer";
-    Value = "openoffice.CalcDocument.1";
+    Subkey = "opendocument.CalcDocument\CurVer";
+    Value = "opendocument.CalcDocument.1";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "openoffice.CalcDocument.1";
+    Subkey = "opendocument.CalcDocument.1";
     REG_VALUE_LNG(OO_CALC)
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "openoffice.CalcDocument.1\CLSID";
+    Subkey = "opendocument.CalcDocument.1\CLSID";
     Value = "{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "openoffice.CalcDocument.1\DefaultIcon";
+    Subkey = "opendocument.CalcDocument.1\DefaultIcon";
     Value = "<progpath>\program\soffice.exe,3";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Insertable
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "openoffice.CalcDocument.1\Insertable";
+    Subkey = "opendocument.CalcDocument.1\Insertable";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Protocol_Stdfileediting_Server
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "openoffice.CalcDocument.1\protocol\StdFileEditing\server";
+    Subkey = "opendocument.CalcDocument.1\protocol\StdFileEditing\server";
     Value = "<progpath>\program\soffice.exe";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Protocol_Stdfileediting_Verb_0
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "openoffice.CalcDocument.1\protocol\StdFileEditing\verb\0";
+    Subkey = "opendocument.CalcDocument.1\protocol\StdFileEditing\verb\0";
     Value = "&Edit";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Protocol_Stdfileediting_Verb__1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "openoffice.CalcDocument.1\protocol\StdFileEditing\verb\-1";
+    Subkey = "opendocument.CalcDocument.1\protocol\StdFileEditing\verb\-1";
     Value = "&Show";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Protocol_Stdfileediting_Verb__2
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "openoffice.CalcDocument.1\protocol\StdFileEditing\verb\-2";
+    Subkey = "opendocument.CalcDocument.1\protocol\StdFileEditing\verb\-2";
     Value = "&Open";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "openoffice.CalcDocument.1\shell";
+    Subkey = "opendocument.CalcDocument.1\shell";
     Value = "open";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_New
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "openoffice.CalcDocument.1\shell\new";
+    Subkey = "opendocument.CalcDocument.1\shell\new";
     REG_VALUE_LNG(NEW)
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_New_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "openoffice.CalcDocument.1\shell\new\command";
+    Subkey = "opendocument.CalcDocument.1\shell\new\command";
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "openoffice.CalcDocument.1\shell\open\command";
+    Subkey = "opendocument.CalcDocument.1\shell\open\command";
     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "openoffice.CalcDocument.1\shell\print\command";
+    Subkey = "opendocument.CalcDocument.1\shell\print\command";
     Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_Printto_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "openoffice.CalcDocument.1\shell\printto\command";
+    Subkey = "opendocument.CalcDocument.1\shell\printto\command";
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
 
@@ -718,7 +710,7 @@ End
 RegistryItem gid_Regitem_CalcTemplate_1_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Subkey = "openoffice.CalcTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "opendocument.CalcTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
@@ -726,7 +718,7 @@ RegistryItem gid_Regitem_Ots
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".ots";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Value = "openoffice.CalcTemplate.1";
+    Value = "opendocument.CalcTemplate.1";
 End
 
 RegistryItem gid_Regitem_Ots_Contenttype
@@ -734,61 +726,61 @@ RegistryItem gid_Regitem_Ots_Contenttype
     ModuleID = gid_Module_Prg_Calc_Bin;
     Subkey = ".ots";
     Name = "Content Type";
-    Value = "application/x-vnd.oasis.openoffice.spreadsheet";
+    Value = "application/vnd.oasis.opendocument.spreadsheet";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calctemplate_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "openoffice.CalcTemplate.1";
+    Subkey = "opendocument.CalcTemplate.1";
     ModuleID = gid_Module_Prg_Calc_Bin;
     REG_VALUE_LNG(OO_CALC_TEMPLATE)
 End
 
 RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "openoffice.CalcTemplate.1\DefaultIcon";
+    Subkey = "opendocument.CalcTemplate.1\DefaultIcon";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Value = "<progpath>\program\soffice.exe,4";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "openoffice.CalcTemplate.1\shell";
+    Subkey = "opendocument.CalcTemplate.1\shell";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Value = "new";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell_New
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "openoffice.CalcTemplate.1\shell\new";
+    Subkey = "opendocument.CalcTemplate.1\shell\new";
     ModuleID = gid_Module_Prg_Calc_Bin;
     REG_VALUE_LNG(NEW)
 End
 
 RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell_New_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "openoffice.CalcTemplate.1\shell\new\command";
+    Subkey = "opendocument.CalcTemplate.1\shell\new\command";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "openoffice.CalcTemplate.1\shell\open\command";
+    Subkey = "opendocument.CalcTemplate.1\shell\open\command";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "openoffice.CalcTemplate.1\shell\print\command";
+    Subkey = "opendocument.CalcTemplate.1\shell\print\command";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell_Printto_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "openoffice.CalcTemplate.1\shell\printto\command";
+    Subkey = "opendocument.CalcTemplate.1\shell\printto\command";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End