INTEGRATION: CWS sysint1 (1.3.2); FILE MERGED

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

1 files changed, 105 insertions, 113 deletions

diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp
index 4c3b52e3886f..4f4549e52849 100644
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: registryitem_writer.scp,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: pjunck $ $Date: 2004-11-03 08:08:29 $
+ *  last change: $Author: hr $ $Date: 2004-11-26 21:58:03 $
  *
  *  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_Starwriterdocument_5_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Subkey = "soffice.StarWriterDocument.5\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,1";
+    Value = "<progpath>\program\soffice.exe,27";
 End
 
 RegistryItem gid_Regitem_Soffice_Starwriterdocument_5_Shell
@@ -292,7 +292,7 @@ RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Subkey = "soffice.StarWriterDocument.6\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,1";
+    Value = "<progpath>\program\soffice.exe,27";
 End
 
 RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Insertable
@@ -389,7 +389,7 @@ RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "soffice.StarWriterGlobalDocument.5\DefaultIcon";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "<progpath>\program\soffice.exe,10";
+    Value = "<progpath>\program\soffice.exe,35";
 End
 
 RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_5_Shell
@@ -452,7 +452,7 @@ RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "soffice.StarWriterGlobalDocument.6\DefaultIcon";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "<progpath>\program\soffice.exe,10";
+    Value = "<progpath>\program\soffice.exe,35";
 End
 
 RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6_Shell
@@ -522,7 +522,7 @@ RegistryItem gid_Regitem_Soffice_Starwritertemplate_6_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "soffice.StarWriterTemplate.6\DefaultIcon";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "<progpath>\program\soffice.exe,2";
+    Value = "<progpath>\program\soffice.exe,28";
 End
 
 RegistryItem gid_Regitem_Soffice_Starwritertemplate_6_Shell
@@ -691,14 +691,6 @@ RegistryItem gid_Regitem_StarWriterDocument_6_Shellex_PropertySheetHandlers_MyPr
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
-RegistryItem gid_Regitem_Sxw_Soffice_Starwriterdocument_6_Shellnew
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".sxw\soffice.StarWriterDocument.6\ShellNew";
-    Name = "FileName";
-    Value = "soffice.sxw";
-End
-
 RegistryItem gid_Regitem__Sdw
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
@@ -720,168 +712,168 @@ RegistryItem gid_Regitem__Sxw
     Value = "soffice.StarWriterDocument.6";
 End
 
-// new oot file extension 
+// new odt file extension 
 
-RegistryItem gid_Regitem_Oot_PersistentHandler
+RegistryItem gid_Regitem_Odt_PersistentHandler
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".oot\PersistentHandler";
+    Subkey = ".odt\PersistentHandler";
     Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
 End
 
-RegistryItem gid_Regitem_Oot_Shellex_00021500_0000_0000_C000_000000000046
+RegistryItem gid_Regitem_Odt_Shellex_00021500_0000_0000_C000_000000000046
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".oot\shellex\{00021500-0000-0000-C000-000000000046}";
+    Subkey = ".odt\shellex\{00021500-0000-0000-C000-000000000046}";
     Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
 End
 
-RegistryItem gid_Regitem_Oot_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
+RegistryItem gid_Regitem_Odt_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".oot\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
+    Subkey = ".odt\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
     Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
 End
 
 RegistryItem gid_Regitem_WriterDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "openoffice.WriterDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "opendocument.WriterDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
-RegistryItem gid_Regitem__Oot
+RegistryItem gid_Regitem__Odt
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".oot";
-    Value = "openoffice.WriterDocument.1";
+    Subkey = ".odt";
+    Value = "opendocument.WriterDocument.1";
 End
 
-RegistryItem gid_Regitem_Oot_Contenttype
+RegistryItem gid_Regitem_Odt_Contenttype
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".oot";
+    Subkey = ".odt";
     Name = "Content Type";
-    Value = "application/x-vnd.oasis.openoffice.text";
+    Value = "application/vnd.oasis.opendocument.text";
 End
 
-RegistryItem gid_Regitem_Oot_Mime_Database
+RegistryItem gid_Regitem_Odt_Mime_Database
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "MIME\Database\Content Type\application/x-vnd.oasis.openoffice.text";
+    Subkey = "MIME\Database\Content Type\application/vnd.oasis.opendocument.text";
     Name = "Extension";
-    Value = ".oot";
+    Value = ".odt";
 End
 
-RegistryItem gid_Regitem_Oot_Openoffice_Writerdocument_1_Shellnew
+RegistryItem gid_Regitem_Odt_Openoffice_Writerdocument_1_Shellnew
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".oot\openoffice.WriterDocument.1\ShellNew";
+    Subkey = ".odt\opendocument.WriterDocument.1\ShellNew";
     Name = "FileName";
-    Value = "soffice.oot";
+    Value = "soffice.odt";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_Curver
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "openoffice.WriterDocument\CurVer";
-    Value = "openoffice.WriterDocument.1";
+    Subkey = "opendocument.WriterDocument\CurVer";
+    Value = "opendocument.WriterDocument.1";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "openoffice.WriterDocument.1";
+    Subkey = "opendocument.WriterDocument.1";
     REG_VALUE_LNG(OO_WRITER)
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "openoffice.WriterDocument.1\CLSID";
+    Subkey = "opendocument.WriterDocument.1\CLSID";
     Value = "{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "openoffice.WriterDocument.1\DefaultIcon";
+    Subkey = "opendocument.WriterDocument.1\DefaultIcon";
     Value = "<progpath>\program\soffice.exe,1";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Insertable
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "openoffice.WriterDocument.1\Insertable";
+    Subkey = "opendocument.WriterDocument.1\Insertable";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Protocol_Stdfileediting_Server
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "openoffice.WriterDocument.1\protocol\StdFileEditing\server";
+    Subkey = "opendocument.WriterDocument.1\protocol\StdFileEditing\server";
     Value = "<progpath>\program\soffice.exe";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Protocol_Stdfileediting_Verb_0
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "openoffice.WriterDocument.1\protocol\StdFileEditing\verb\0";
+    Subkey = "opendocument.WriterDocument.1\protocol\StdFileEditing\verb\0";
     Value = "&Edit";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Protocol_Stdfileediting_Verb__1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "openoffice.WriterDocument.1\protocol\StdFileEditing\verb\-1";
+    Subkey = "opendocument.WriterDocument.1\protocol\StdFileEditing\verb\-1";
     Value = "&Show";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Protocol_Stdfileediting_Verb__2
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "openoffice.WriterDocument.1\protocol\StdFileEditing\verb\-2";
+    Subkey = "opendocument.WriterDocument.1\protocol\StdFileEditing\verb\-2";
     Value = "&Open";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "openoffice.WriterDocument.1\shell";
+    Subkey = "opendocument.WriterDocument.1\shell";
     Value = "open";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell_New
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "openoffice.WriterDocument.1\shell\new";
+    Subkey = "opendocument.WriterDocument.1\shell\new";
     REG_VALUE_LNG(NEW)
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell_New_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "openoffice.WriterDocument.1\shell\new\command";
+    Subkey = "opendocument.WriterDocument.1\shell\new\command";
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "openoffice.WriterDocument.1\shell\open\command";
+    Subkey = "opendocument.WriterDocument.1\shell\open\command";
     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "openoffice.WriterDocument.1\shell\print\command";
+    Subkey = "opendocument.WriterDocument.1\shell\print\command";
     Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell_Printto_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "openoffice.WriterDocument.1\shell\printto\command";
+    Subkey = "opendocument.WriterDocument.1\shell\printto\command";
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
 
@@ -911,7 +903,7 @@ End
 RegistryItem gid_Regitem_WriterTemplate_1_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "openoffice.WriterTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "opendocument.WriterTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
@@ -919,7 +911,7 @@ RegistryItem gid_Regitem_Ott
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".ott";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "openoffice.WriterTemplate.1";
+    Value = "opendocument.WriterTemplate.1";
 End
 
 RegistryItem gid_Regitem_Ott_Contenttype
@@ -927,19 +919,19 @@ RegistryItem gid_Regitem_Ott_Contenttype
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Subkey = ".ott";
     Name = "Content Type";
-    Value = "application/x-vnd.oasis.openoffice.text";
+    Value = "application/vnd.oasis.opendocument.text";
 End
 
 RegistryItem gid_Regitem_Soffice_Starwritertemplate_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "openoffice.WriterTemplate.1";
+    Subkey = "opendocument.WriterTemplate.1";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     REG_VALUE_LNG(OO_WRITER_TEMPLATE)
 End
 
 RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "openoffice.WriterTemplate.1\DefaultIcon";
+    Subkey = "opendocument.WriterTemplate.1\DefaultIcon";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "<progpath>\program\soffice.exe,2";
 End
@@ -947,157 +939,157 @@ End
 RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "openoffice.WriterTemplate.1\shell";
+    Subkey = "opendocument.WriterTemplate.1\shell";
     Value = "new";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell_New
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "openoffice.WriterTemplate.1\shell\new";
+    Subkey = "opendocument.WriterTemplate.1\shell\new";
     REG_VALUE_LNG(NEW)
 End
 
 RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell_New_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "openoffice.WriterTemplate.1\shell\new\command";
+    Subkey = "opendocument.WriterTemplate.1\shell\new\command";
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "openoffice.WriterTemplate.1\shell\open\command";
+    Subkey = "opendocument.WriterTemplate.1\shell\open\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "openoffice.WriterTemplate.1\shell\print\command";
+    Subkey = "opendocument.WriterTemplate.1\shell\print\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell_Printto_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "openoffice.WriterTemplate.1\shell\printto\command";
+    Subkey = "opendocument.WriterTemplate.1\shell\printto\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
 
-// new oom file extension 
+// new odm file extension 
 
-RegistryItem gid_Regitem_Oom_PersistentHandler
+RegistryItem gid_Regitem_Odm_PersistentHandler
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".oom\PersistentHandler";
+    Subkey = ".odm\PersistentHandler";
     Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
 End
 
-RegistryItem gid_Regitem_Oom_Shellex_00021500_0000_0000_C000_000000000046
+RegistryItem gid_Regitem_Odm_Shellex_00021500_0000_0000_C000_000000000046
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".oom\shellex\{00021500-0000-0000-C000-000000000046}";
+    Subkey = ".odm\shellex\{00021500-0000-0000-C000-000000000046}";
     Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
 End
 
-RegistryItem gid_Regitem_Oom_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
+RegistryItem gid_Regitem_Odm_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".oom\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
+    Subkey = ".odm\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
     Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
 End
 
 RegistryItem gid_Regitem_WriterGlobalDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "openoffice.WriterGlobalDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "opendocument.WriterGlobalDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
-RegistryItem gid_Regitem_Oom
+RegistryItem gid_Regitem_Odm
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".oom";
-    Value = "openoffice.WriterGlobalDocument.1";
+    Subkey = ".odm";
+    Value = "opendocument.WriterGlobalDocument.1";
 End
 
-RegistryItem gid_Regitem_Oom_Contenttype
+RegistryItem gid_Regitem_Odm_Contenttype
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = ".oom";
+    Subkey = ".odm";
     Name = "Content Type";
-    Value = "application/x-vnd.oasis.openoffice.text-master";
+    Value = "application/vnd.oasis.opendocument.text-master";
 End
 
-RegistryItem gid_Regitem_Oom_Mime_Database
+RegistryItem gid_Regitem_Odm_Mime_Database
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "MIME\Database\Content Type\application/x-vnd.oasis.openoffice.text-master";
+    Subkey = "MIME\Database\Content Type\application/vnd.oasis.opendocument.text-master";
     Name = "Extension";
-    Value = ".oom";
+    Value = ".odm";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_Curver
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "openoffice.WriterGlobalDocument\CurVer";
+    Subkey = "opendocument.WriterGlobalDocument\CurVer";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "openoffice.WriterGlobalDocument.1";
+    Value = "opendocument.WriterGlobalDocument.1";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "openoffice.WriterGlobalDocument.1";
+    Subkey = "opendocument.WriterGlobalDocument.1";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     REG_VALUE_LNG(OO_MASTERDOC)
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "openoffice.WriterGlobalDocument.1\DefaultIcon";
+    Subkey = "opendocument.WriterGlobalDocument.1\DefaultIcon";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "<progpath>\program\soffice.exe,10";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "openoffice.WriterGlobalDocument.1\shell";
+    Subkey = "opendocument.WriterGlobalDocument.1\shell";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "open";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell_New
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "openoffice.WriterGlobalDocument.1\shell\new";
+    Subkey = "opendocument.WriterGlobalDocument.1\shell\new";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     REG_VALUE_LNG(NEW)
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell_New_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "openoffice.WriterGlobalDocument.1\shell\new\command";
+    Subkey = "opendocument.WriterGlobalDocument.1\shell\new\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "openoffice.WriterGlobalDocument.1\shell\open\command";
+    Subkey = "opendocument.WriterGlobalDocument.1\shell\open\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "openoffice.WriterGlobalDocument.1\shell\print\command";
+    Subkey = "opendocument.WriterGlobalDocument.1\shell\print\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell_Printto_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "openoffice.WriterGlobalDocument.1\shell\printto\command";
+    Subkey = "opendocument.WriterGlobalDocument.1\shell\printto\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
@@ -1125,10 +1117,10 @@ RegistryItem gid_Regitem_Oth_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
     Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
 End
 
-RegistryItem gid_Regitem_WriterWebDocument_Shellex_PropertySheetHandlers_MyPropSheet1
+RegistryItem gid_Regitem_WriterWebTemplate_Shellex_PropertySheetHandlers_MyPropSheet1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "openoffice.WriterWebDocument.1\shellex\PropertySheetHandlers\MyPropSheet1";
+    Subkey = "opendocument.WriterWebTemplate.1\shellex\PropertySheetHandlers\MyPropSheet1";
     Value = "{63542C48-9552-494A-84F7-73AA6A7C99C1}";
 End
 
@@ -1136,7 +1128,7 @@ RegistryItem gid_Regitem_Oth
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Subkey = ".oth";
-    Value = "openoffice.WriterWebDocument.1";
+    Value = "opendocument.WriterWebTemplate.1";
 End
 
 RegistryItem gid_Regitem_Oth_Contenttype
@@ -1144,76 +1136,76 @@ RegistryItem gid_Regitem_Oth_Contenttype
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Subkey = ".oth";
     Name = "Content Type";
-    Value = "application/x-vnd.oasis.openoffice.text-web";
+    Value = "application/vnd.oasis.opendocument.text-web";
 End
 
 RegistryItem gid_Regitem_Oth_Mime_Database
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Subkey = "MIME\Database\Content Type\application/x-vnd.oasis.openoffice.text-web";
+    Subkey = "MIME\Database\Content Type\application/vnd.oasis.opendocument.text-web";
     Name = "Extension";
     Value = ".oth";
 End
 
-RegistryItem gid_Regitem_Openoffice_Writerwebdocument_Curver
+RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_Curver
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "openoffice.WriterWebDocument\CurVer";
+    Subkey = "opendocument.WriterWebTemplate\CurVer";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "openoffice.WriterWebDocument.1";
+    Value = "opendocument.WriterWebTemplate.1";
 End
 
-RegistryItem gid_Regitem_Openoffice_Writerwebdocument_1
+RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "openoffice.WriterWebDocument.1";
+    Subkey = "opendocument.WriterWebTemplate.1";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     REG_VALUE_LNG(OO_WEBDOC)
 End
 
-RegistryItem gid_Regitem_Openoffice_Writerwebdocument_1_Defaulticon
+RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "openoffice.WriterWebDocument.1\DefaultIcon";
+    Subkey = "opendocument.WriterWebTemplate.1\DefaultIcon";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "<progpath>\program\soffice.exe,11";
 End
 
-RegistryItem gid_Regitem_Openoffice_Writerwebdocument_1_Shell
+RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "openoffice.WriterWebDocument.1\shell";
+    Subkey = "opendocument.WriterWebTemplate.1\shell";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "open";
 End
 
-RegistryItem gid_Regitem_Openoffice_Writerwebdocument_1_Shell_New
+RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell_New
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "openoffice.WriterWebDocument.1\shell\new";
+    Subkey = "opendocument.WriterWebTemplate.1\shell\new";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     REG_VALUE_LNG(NEW)
 End
 
-RegistryItem gid_Regitem_Openoffice_Writerwebdocument_1_Shell_New_Command
+RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell_New_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "openoffice.WriterWebDocument.1\shell\new\command";
+    Subkey = "opendocument.WriterWebTemplate.1\shell\new\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
-RegistryItem gid_Regitem_Openoffice_Writerwebdocument_1_Shell_Open_Command
+RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "openoffice.WriterWebDocument.1\shell\open\command";
+    Subkey = "opendocument.WriterWebTemplate.1\shell\open\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
 End
 
-RegistryItem gid_Regitem_Openoffice_Writerwebdocument_1_Shell_Print_Command
+RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell_Print_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "openoffice.WriterWebDocument.1\shell\print\command";
+    Subkey = "opendocument.WriterWebTemplate.1\shell\print\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -p \"%1\"";
 End
 
-RegistryItem gid_Regitem_Openoffice_Writerwebdocument_1_Shell_Printto_Command
+RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell_Printto_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = "openoffice.WriterWebDocument.1\shell\printto\command";
+    Subkey = "opendocument.WriterWebTemplate.1\shell\printto\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End