INTEGRATION: CWS sysint1 (1.3.2); FILE MERGED

2004/11/24 15:06:06 hro 1.3.2.6: #i36906# UseoOld icons for old document formats
2004/11/22 15:53:51 hro 1.3.2.5: #i37080# New document format mimetypes
2004/11/17 15:26:09 is 1.3.2.4: #i36831# clsid with oo1.1 or so7
2004/11/17 09:20:28 is 1.3.2.3: #i36831# new file extensions
2004/11/16 15:47:35 is 1.3.2.2: #i36831# introducing SXWFORMATVERSION
2004/11/16 14:13:55 is 1.3.2.1: #i36828# new shellnew files

1 files changed, 53 insertions, 61 deletions

diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp
index 9eeaa58d5481..7bbad0d4722c 100644
--- a/scp2/source/impress/registryitem_impress.scp
+++ b/scp2/source/impress/registryitem_impress.scp
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: registryitem_impress.scp,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: pjunck $ $Date: 2004-11-03 08:06:34 $
+ *  last change: $Author: hr $ $Date: 2004-11-26 21:48:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -229,7 +229,7 @@ RegistryItem gid_Regitem_Soffice_Starimpressdocument_5_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
     Subkey = "soffice.StarImpressDocument.5\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,7";
+    Value = "<progpath>\program\soffice.exe,33";
 End
 
 RegistryItem gid_Regitem_Soffice_Starimpressdocument_5_Shell
@@ -292,7 +292,7 @@ RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
     Subkey = "soffice.StarImpressDocument.6\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,7";
+    Value = "<progpath>\program\soffice.exe,33";
 End
 
 RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Insertable
@@ -403,7 +403,7 @@ RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "soffice.StarImpressTemplate.6\DefaultIcon";
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Value = "<progpath>\program\soffice.exe,8";
+    Value = "<progpath>\program\soffice.exe,34";
 End
 
 RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_Shell
@@ -535,14 +535,6 @@ RegistryItem gid_Regitem_Sxi_Mime_Database
     Value = ".sxi";
 End
 
-RegistryItem gid_Regitem_Sxi_Soffice_Starimpressdocument_6_Shellnew
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = ".sxi\soffice.StarImpressDocument.6\ShellNew";
-    Name = "FileName";
-    Value = "soffice.sxi";
-End
-
 RegistryItem gid_Regitem__Sdd
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
@@ -564,182 +556,182 @@ RegistryItem gid_Regitem__Sxi
     Value = "soffice.StarImpressDocument.6";
 End
 
-// new oop file extension
+// new odp file extension
 
-RegistryItem gid_Regitem_Oop_PersistentHandler
+RegistryItem gid_Regitem_Odp_PersistentHandler
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = ".oop\PersistentHandler";
+    Subkey = ".odp\PersistentHandler";
     Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
 End
 
-RegistryItem gid_Regitem_Oop_Shellex_00021500_0000_0000_C000_000000000046
+RegistryItem gid_Regitem_Odp_Shellex_00021500_0000_0000_C000_000000000046
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = ".oop\shellex\{00021500-0000-0000-C000-000000000046}";
+    Subkey = ".odp\shellex\{00021500-0000-0000-C000-000000000046}";
     Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
 End
 
-RegistryItem gid_Regitem_Oop_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
+RegistryItem gid_Regitem_Odp_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = ".oop\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
+    Subkey = ".odp\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
     Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
 End
 
 RegistryItem gid_Regitem_ImpressDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "openoffice.ImpressDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "opendocument.ImpressDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
-RegistryItem gid_Regitem__Oop
+RegistryItem gid_Regitem__Odp
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = ".oop";
-    Value = "openoffice.ImpressDocument.1";
+    Subkey = ".odp";
+    Value = "opendocument.ImpressDocument.1";
 End
 
-RegistryItem gid_Regitem_Oop_Contenttype
+RegistryItem gid_Regitem_Odp_Contenttype
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = ".oop";
+    Subkey = ".odp";
     Name = "Content Type";
-    Value = "application/x-vnd.oasis.openoffice.presentation";
+    Value = "application/vnd.oasis.opendocument.presentation";
 End
 
-RegistryItem gid_Regitem_Oop_Mime_Database
+RegistryItem gid_Regitem_Odp_Mime_Database
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "MIME\Database\Content Type\application/x-vnd.oasis.openoffice.presentation";
+    Subkey = "MIME\Database\Content Type\application/vnd.oasis.opendocument.presentation";
     Name = "Extension";
-    Value = ".oop";
+    Value = ".odp";
 End
 
-RegistryItem gid_Regitem_Oop_Openoffice_Impressdocument_1_Shellnew
+RegistryItem gid_Regitem_Odp_Openoffice_Impressdocument_1_Shellnew
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = ".oop\openoffice.ImpressDocument.1\ShellNew";
+    Subkey = ".odp\opendocument.ImpressDocument.1\ShellNew";
     Name = "FileName";
-    Value = "soffice.oop";
+    Value = "soffice.odp";
 End
 
 RegistryItem gid_Regitem_Openoffice_Starimpressdocument_Curver
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "soffice.StarImpressDocument\CurVer";
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Value = "openoffice.ImpressDocument.1";
+    Value = "opendocument.ImpressDocument.1";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "openoffice.ImpressDocument.1";
+    Subkey = "opendocument.ImpressDocument.1";
     REG_VALUE_LNG(OO_PRESENT)
 End
 
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "openoffice.ImpressDocument.1\CLSID";
+    Subkey = "opendocument.ImpressDocument.1\CLSID";
     Value = "{E5A0B632-DFBA-4549-9346-E414DA06E6F8}";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "openoffice.ImpressDocument.1\DefaultIcon";
+    Subkey = "opendocument.ImpressDocument.1\DefaultIcon";
     Value = "<progpath>\program\soffice.exe,7";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Insertable
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "openoffice.ImpressDocument.1\Insertable";
+    Subkey = "opendocument.ImpressDocument.1\Insertable";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Protocol_Stdfileediting_Server
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "openoffice.ImpressDocument.1\protocol\StdFileEditing\server";
+    Subkey = "opendocument.ImpressDocument.1\protocol\StdFileEditing\server";
     Value = "<progpath>\program\soffice.exe";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Protocol_Stdfileediting_Verb_0
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "openoffice.ImpressDocument.1\protocol\StdFileEditing\verb\0";
+    Subkey = "opendocument.ImpressDocument.1\protocol\StdFileEditing\verb\0";
     Value = "&Edit";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Protocol_Stdfileediting_Verb__1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "openoffice.ImpressDocument.1\protocol\StdFileEditing\verb\-1";
+    Subkey = "opendocument.ImpressDocument.1\protocol\StdFileEditing\verb\-1";
     Value = "&Show";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Protocol_Stdfileediting_Verb__2
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "openoffice.ImpressDocument.1\protocol\StdFileEditing\verb\-2";
+    Subkey = "opendocument.ImpressDocument.1\protocol\StdFileEditing\verb\-2";
     Value = "&Open";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "openoffice.ImpressDocument.1\shell";
+    Subkey = "opendocument.ImpressDocument.1\shell";
     Value = "open";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_New
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "openoffice.ImpressDocument.1\shell\new";
+    Subkey = "opendocument.ImpressDocument.1\shell\new";
     REG_VALUE_LNG(NEW)
 End
 
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_New_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "openoffice.ImpressDocument.1\shell\new\command";
+    Subkey = "opendocument.ImpressDocument.1\shell\new\command";
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "openoffice.ImpressDocument.1\shell\open\command";
+    Subkey = "opendocument.ImpressDocument.1\shell\open\command";
     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "openoffice.ImpressDocument.1\shell\print\command";
+    Subkey = "opendocument.ImpressDocument.1\shell\print\command";
     Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_Printto_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "openoffice.ImpressDocument.1\shell\printto\command";
+    Subkey = "opendocument.ImpressDocument.1\shell\printto\command";
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_Show
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "openoffice.ImpressDocument.1\shell\show";
+    Subkey = "opendocument.ImpressDocument.1\shell\show";
     REG_VALUE_LNG(SO60_SHOW)
 End
 
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_Show_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "openoffice.ImpressDocument.1\shell\show\command";
+    Subkey = "opendocument.ImpressDocument.1\shell\show\command";
     Value = "\"<progpath>\program\soffice.exe\" -show \"%1\"";
 End
 
@@ -769,7 +761,7 @@ End
 RegistryItem gid_Regitem_ImpressTemplate_1_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Subkey = "openoffice.ImpressTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "opendocument.ImpressTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
@@ -777,7 +769,7 @@ RegistryItem gid_Regitem_Otp
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".otp";
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Value = "openoffice.ImpressTemplate.1";
+    Value = "opendocument.ImpressTemplate.1";
 End
 
 RegistryItem gid_Regitem_Otp_Contenttype
@@ -785,61 +777,61 @@ RegistryItem gid_Regitem_Otp_Contenttype
     ModuleID = gid_Module_Prg_Impress_Bin;
     Subkey = ".otp";
     Name = "Content Type";
-    Value = "application/x-vnd.oasis.openoffice.presentation";
+    Value = "application/vnd.oasis.opendocument.presentation";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impresstemplate_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "openoffice.ImpressTemplate.1";
+    Subkey = "opendocument.ImpressTemplate.1";
     ModuleID = gid_Module_Prg_Impress_Bin;
     REG_VALUE_LNG(OO_PRESENT_TEMPLATE)
 End
 
 RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "openoffice.ImpressTemplate.1\DefaultIcon";
+    Subkey = "opendocument.ImpressTemplate.1\DefaultIcon";
     ModuleID = gid_Module_Prg_Impress_Bin;
     Value = "<progpath>\program\soffice.exe,8";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "openoffice.ImpressTemplate.1\shell";
+    Subkey = "opendocument.ImpressTemplate.1\shell";
     ModuleID = gid_Module_Prg_Impress_Bin;
     Value = "new";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell_New
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "openoffice.ImpressTemplate.1\shell\new";
+    Subkey = "opendocument.ImpressTemplate.1\shell\new";
     ModuleID = gid_Module_Prg_Impress_Bin;
     REG_VALUE_LNG(NEW)
 End
 
 RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell_New_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "openoffice.ImpressTemplate.1\shell\new\command";
+    Subkey = "opendocument.ImpressTemplate.1\shell\new\command";
     ModuleID = gid_Module_Prg_Impress_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "openoffice.ImpressTemplate.1\shell\open\command";
+    Subkey = "opendocument.ImpressTemplate.1\shell\open\command";
     ModuleID = gid_Module_Prg_Impress_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "openoffice.ImpressTemplate.1\shell\print\command";
+    Subkey = "opendocument.ImpressTemplate.1\shell\print\command";
     ModuleID = gid_Module_Prg_Impress_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell_Printto_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "openoffice.ImpressTemplate.1\shell\printto\command";
+    Subkey = "opendocument.ImpressTemplate.1\shell\printto\command";
     ModuleID = gid_Module_Prg_Impress_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End