#i108159# new ODF-Icons in OOo transplanted from 77e2f3138467@odficons01

7 files changed, 111 insertions, 184 deletions

diff --git a/scp2/source/binfilter/registryitem_binfilter.scp b/scp2/source/binfilter/registryitem_binfilter.scp
index 7640e83ec20a..fa4e2297516d 100644
--- a/scp2/source/binfilter/registryitem_binfilter.scp
+++ b/scp2/source/binfilter/registryitem_binfilter.scp
@@ -816,7 +816,7 @@ RegistryItem gid_Regitem_OpenOffice_SDW_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sdw\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "opendocument.WriterDocument.1";
+    Name = "soffice.StarWriterDocument.5";
     Value = " ";
 End
 
@@ -825,7 +825,7 @@ RegistryItem gid_Regitem_OpenOffice_VOR_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".vor\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "opendocument.WriterDocument.1";
+    Name = "soffice.StarWriterDocument.5";
     Value = " ";
 End
 
@@ -834,7 +834,7 @@ RegistryItem gid_Regitem_OpenOffice_SGL_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sgl\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "opendocument.WriterDocument.1";
+    Name = "soffice.StarWriterGlobalDocument.5";
     Value = " ";
 End
 
@@ -843,7 +843,7 @@ RegistryItem gid_Regitem_OpenOffice_SDC_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sdc\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.5";
     Value = " ";
 End
 
@@ -852,7 +852,7 @@ RegistryItem gid_Regitem_OpenOffice_VOR_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".vor\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.5";
     Value = " ";
 End
 
@@ -861,7 +861,7 @@ RegistryItem gid_Regitem_OpenOffice_SDD_OpenWith_Impress
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sdd\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "opendocument.ImpressDocument.1";
+    Name = "soffice.StarImpressDocument.5";
     Value = " ";
 End
 
@@ -870,7 +870,7 @@ RegistryItem gid_Regitem_OpenOffice_SDP_OpenWith_Impress
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sdp\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "opendocument.ImpressDocument.1";
+    Name = "soffice.StarImpressDocument.5";
     Value = " ";
 End
 
@@ -879,7 +879,7 @@ RegistryItem gid_Regitem_OpenOffice_SDA_OpenWith_Impress
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sda\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "opendocument.ImpressDocument.1";
+    Name = "soffice.StarImpressDocument.5";
     Value = " ";
 End
 
@@ -888,7 +888,7 @@ RegistryItem gid_Regitem_OpenOffice_VOR_OpenWith_Impress
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".vor\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "opendocument.ImpressDocument.1";
+    Name = "soffice.StarImpressDocument.5";
     Value = " ";
 End
 
@@ -897,7 +897,7 @@ RegistryItem gid_Regitem_OpenOffice_SDA_OpenWith_Draw
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sda\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "opendocument.DrawDocument.1";
+    Name = "soffice.StarDrawDocument.5";
     Value = " ";
 End
 
@@ -906,7 +906,7 @@ RegistryItem gid_Regitem_OpenOffice_SDD_OpenWith_Draw
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sdd\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "opendocument.DrawDocument.1";
+    Name = "soffice.StarDrawDocument.5";
     Value = " ";
 End
 
@@ -915,7 +915,7 @@ RegistryItem gid_Regitem_OpenOffice_VOR_OpenWith_Draw
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".vor\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "opendocument.DrawDocument.1";
+    Name = "soffice.StarDrawDocument.5";
     Value = " ";
 End
 
@@ -924,7 +924,7 @@ RegistryItem gid_Regitem_OpenOffice_SMF_OpenWith_Math
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".smf\OpenWithProgIDs";
     ModuleID = gid_Module_Optional_Binfilter;
-    Name = "opendocument.MathDocument.1";
+    Name = "soffice.StarMathDocument.5";
     Value = " ";
 End
 
diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
index 31742152cee1..79a49794b120 100755..100644
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -345,7 +345,7 @@ RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
     Subkey = "soffice.StarCalcDocument.6\shell\open\command";
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\scalc.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Shell_Print_Command
@@ -408,7 +408,7 @@ RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "soffice.StarCalcTemplate.6\shell\open\command";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\scalc.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_Shell_Print_Command
@@ -716,13 +716,6 @@ RegistryItem gid_Regitem_Openoffice_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 = "opendocument.CalcDocument.1\shell\open\command";
-//     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
-// End
-
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
@@ -837,7 +830,7 @@ RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.CalcTemplate.1\shell\open\command";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\scalc.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell_Print_Command
@@ -856,30 +849,12 @@ End
 
 // "OpenWith" Windows Registry keys for extensions supported by Calc
 
-// .ODS
-RegistryItem gid_Regitem_OpenOffice_ODS_OpenWith_Calc
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".ods\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
-    Value = " ";
-End
-
-// .OTS
-RegistryItem gid_Regitem_OpenOffice_OTS_OpenWith_Calc
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".ots\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
-    Value = " ";
-End
-
 // .SXC
 RegistryItem gid_Regitem_OpenOffice_SXC_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sxc\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -888,7 +863,7 @@ RegistryItem gid_Regitem_OpenOffice_STC_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".stc\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcTemplate.6";
     Value = " ";
 End
 
@@ -897,7 +872,7 @@ RegistryItem gid_Regitem_OpenOffice_DIF_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".dif\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -906,7 +881,7 @@ RegistryItem gid_Regitem_OpenOffice_DBF_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".dbf\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -915,7 +890,7 @@ RegistryItem gid_Regitem_OpenOffice_XLW_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".xlw\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -924,7 +899,7 @@ RegistryItem gid_Regitem_OpenOffice_RTF_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".rtf\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -933,7 +908,7 @@ RegistryItem gid_Regitem_OpenOffice_SLK_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".slk\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -942,7 +917,7 @@ RegistryItem gid_Regitem_OpenOffice_CSV_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".csv\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -951,7 +926,7 @@ RegistryItem gid_Regitem_OpenOffice_TXT_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".txt\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -960,7 +935,7 @@ RegistryItem gid_Regitem_OpenOffice_HTM_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".htm\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -969,7 +944,7 @@ RegistryItem gid_Regitem_OpenOffice_HTML_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".html\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -978,7 +953,7 @@ RegistryItem gid_Regitem_OpenOffice_WK1_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".wk1\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -987,7 +962,7 @@ RegistryItem gid_Regitem_OpenOffice_WKS_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".wks\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -996,7 +971,7 @@ RegistryItem gid_Regitem_OpenOffice_123_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".123\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
@@ -1005,16 +980,18 @@ RegistryItem gid_Regitem_OpenOffice_XML_OpenWith_Calc
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".xml\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Calc_Bin;
-    Name = "opendocument.CalcDocument.1";
+    Name = "soffice.StarCalcDocument.6";
     Value = " ";
 End
 
+// "FileAssociations" entries
+
 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_Prg_Calc_Bin;
     Name = ".stc";
-    Value = "opendocument.CalcDocument.1";
+    Value = "soffice.StarCalcTemplate.6";
     Styles = ();
 End
 
@@ -1023,7 +1000,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".dif";
-    Value = "opendocument.CalcDocument.1";
+    Value = "soffice.StarCalcDocument.6";
     Styles = ();
 End
 
@@ -1032,7 +1009,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".dbf";
-    Value = "opendocument.CalcDocument.1";
+    Value = "soffice.StarCalcDocument.6";
     Styles = ();
 End
 
@@ -1041,7 +1018,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".slk";
-    Value = "opendocument.CalcDocument.1";
+    Value = "soffice.StarCalcDocument.6";
     Styles = ();
 End
 
@@ -1050,7 +1027,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".csv";
-    Value = "opendocument.CalcDocument.1";
+    Value = "soffice.StarCalcDocument.6";
     Styles = ();
 End
 
@@ -1059,7 +1036,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".xlw";
-    Value = "opendocument.CalcDocument.1";
+    Value = "soffice.StarCalcDocument.6";
     Styles = ();
 End
 
@@ -1068,7 +1045,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".wk1";
-    Value = "opendocument.CalcDocument.1";
+    Value = "soffice.StarCalcDocument.6";
     Styles = ();
 End
 
@@ -1077,7 +1054,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".wks";
-    Value = "opendocument.CalcDocument.1";
+    Value = "soffice.StarCalcDocument.6";
     Styles = ();
 End
 
@@ -1086,10 +1063,11 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Calc_Bin;
     Name = ".123";
-    Value = "opendocument.CalcDocument.1";
+    Value = "soffice.StarCalcDocument.6";
     Styles = ();
 End
 
+
 RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Scalc_Exe
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\Microsoft\Windows\CurrentVersion\App Paths\scalc.exe";
@@ -1114,11 +1092,11 @@ REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( stc )
 
 // registering the mso file types
 
-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 )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Xls,  gid_Module_Prg_Calc_Bin, xls,  XLS,  MS_EXCEL_WORKSHEET_OLD, 29, scalc.exe, open, Calc )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsx, gid_Module_Prg_Calc_Bin, xlsx, XLSX, MS_EXCEL_WORKSHEET, 29, scalc.exe, open, Calc )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsm, gid_Module_Prg_Calc_Bin, xlsm, XLSM, MS_EXCEL_WORKSHEET, 29, scalc.exe, open, Calc )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsb, gid_Module_Prg_Calc_Bin, xlsb, XLSB, MS_EXCEL_WORKSHEET, 29, scalc.exe, open, Calc )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xlt,  gid_Module_Prg_Calc_Bin, xlt,  XLT,  MS_EXCEL_TEMPLATE_OLD, 30, scalc.exe, new, Calc )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltx, gid_Module_Prg_Calc_Bin, xltx, XLTX, MS_EXCEL_TEMPLATE, 30, scalc.exe, new, Calc )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltm, gid_Module_Prg_Calc_Bin, xltm, XLTM, MS_EXCEL_TEMPLATE, 30, scalc.exe, new, Calc )
 
diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp
index 013f2cfaa9b9..0ecb21536613 100755..100644
--- a/scp2/source/draw/registryitem_draw.scp
+++ b/scp2/source/draw/registryitem_draw.scp
@@ -313,7 +313,7 @@ RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
     Subkey = "soffice.StarDrawDocument.6\shell\open\command";
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\sdraw.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Shell_Print_Command
@@ -410,7 +410,7 @@ RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "soffice.StarDrawTemplate.6\shell\open\command";
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\sdraw.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_Shell_Print_Command
@@ -682,13 +682,6 @@ RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell_New_Command
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
-// RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell_Open_Command
-//     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-//     ModuleID = gid_Module_Prg_Draw_Bin;
-//     Subkey = "opendocument.DrawDocument.1\shell\open\command";
-//     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
-// End
-
 RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
@@ -837,7 +830,7 @@ RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.DrawTemplate.1\shell\open\command";
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\sdraw.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell_Print_Command
@@ -879,7 +872,7 @@ RegistryItem gid_Regitem_OpenOffice_SXD_OpenWith_Draw
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sxd\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Name = "opendocument.DrawDocument.1";
+    Name = "soffice.StarDrawDocument.6";
     Value = " ";
 End
 
@@ -888,10 +881,11 @@ RegistryItem gid_Regitem_OpenOffice_STD_OpenWith_Draw
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".std\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Draw_Bin;
-    Name = "opendocument.DrawDocument.1";
+    Name = "soffice.StarDrawDocument.6";
     Value = " ";
 End
 
+
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Otg
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
@@ -906,7 +900,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Draw_Bin;
     Name = ".std";
-    Value = "opendocument.DrawDocument.1";
+    Value = "soffice.StarDrawTemplate.6";
     Styles = ();
 End
 
diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp
index cf4ba3ccbcb6..689dcd7e1526 100755..100644
--- a/scp2/source/impress/registryitem_impress.scp
+++ b/scp2/source/impress/registryitem_impress.scp
@@ -347,7 +347,7 @@ RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
     Subkey = "soffice.StarImpressDocument.6\shell\open\command";
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\simpress.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Shell_Print_Command
@@ -424,7 +424,7 @@ RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "soffice.StarImpressTemplate.6\shell\open\command";
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\simpress.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_Shell_Print_Command
@@ -731,13 +731,6 @@ RegistryItem gid_Regitem_Openoffice_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 = "opendocument.ImpressDocument.1\shell\open\command";
-//     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
-// End
-
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
@@ -866,7 +859,7 @@ RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.ImpressTemplate.1\shell\open\command";
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\simpress.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell_Print_Command
@@ -908,7 +901,7 @@ RegistryItem gid_Regitem_OpenOffice_SXI_OpenWith_Impress
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sxi\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Name = "opendocument.ImpressDocument.1";
+    Name = "soffice.StarImpressDocument.6";
     Value = " ";
 End
 
@@ -917,7 +910,7 @@ RegistryItem gid_Regitem_OpenOffice_STI_OpenWith_Impress
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sti\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Name = "opendocument.ImpressDocument.1";
+    Name = "soffice.StarImpressDocument.6";
     Value = " ";
 End
 
@@ -926,7 +919,7 @@ RegistryItem gid_Regitem_OpenOffice_SXD_OpenWith_Impress
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sxd\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Impress_Bin;
-    Name = "opendocument.ImpressDocument.1";
+    Name = "soffice.StarImpressDocument.6";
     Value = " ";
 End
 
@@ -954,7 +947,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Impress_Bin;
     Name = ".sti";
-    Value = "opendocument.ImpressDocument.1";
+    Value = "soffice.StarImpressDocument.6";
     Styles = ();
 End
 
@@ -982,10 +975,10 @@ REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sti )
 
 // registering the mso file types
 
-CONDITIONAL_REGISTER_DOC_EXTENSION( Ppt,  gid_Module_Prg_Impress_Bin, ppt,  PPT,  MS_POWERPOINT_PRESENTATION_OLD, 7, simpress.exe, open, Impress )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Pps,  gid_Module_Prg_Impress_Bin, pps,  PPS,  MS_POWERPOINT_SHOW, 7, simpress.exe, open, Impress )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Pptx, gid_Module_Prg_Impress_Bin, pptx, PPTX, MS_POWERPOINT_PRESENTATION, 7, simpress.exe, open, Impress )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Pptm, gid_Module_Prg_Impress_Bin, pptm, PPTM, MS_POWERPOINT_PRESENTATION, 7, simpress.exe, open, Impress )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Pot,  gid_Module_Prg_Impress_Bin, pot,  POT,  MS_POWERPOINT_TEMPLATE_OLD, 8, simpress.exe, new, Impress )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Potx, gid_Module_Prg_Impress_Bin, potx, POTX, MS_POWERPOINT_TEMPLATE, 8, simpress.exe, new, Impress )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Potm, gid_Module_Prg_Impress_Bin, potm, POTM, MS_POWERPOINT_TEMPLATE, 8, simpress.exe, new, Impress )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Ppt,  gid_Module_Prg_Impress_Bin, ppt,  PPT,  MS_POWERPOINT_PRESENTATION_OLD, 33, simpress.exe, open, Impress )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Pps,  gid_Module_Prg_Impress_Bin, pps,  PPS,  MS_POWERPOINT_SHOW, 33, simpress.exe, open, Impress )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Pptx, gid_Module_Prg_Impress_Bin, pptx, PPTX, MS_POWERPOINT_PRESENTATION, 33, simpress.exe, open, Impress )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Pptm, gid_Module_Prg_Impress_Bin, pptm, PPTM, MS_POWERPOINT_PRESENTATION, 33, simpress.exe, open, Impress )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Pot,  gid_Module_Prg_Impress_Bin, pot,  POT,  MS_POWERPOINT_TEMPLATE_OLD, 34, simpress.exe, new, Impress )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Potx, gid_Module_Prg_Impress_Bin, potx, POTX, MS_POWERPOINT_TEMPLATE, 34, simpress.exe, new, Impress )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Potm, gid_Module_Prg_Impress_Bin, potm, POTM, MS_POWERPOINT_TEMPLATE, 34, simpress.exe, new, Impress )
diff --git a/scp2/source/math/registryitem_math.scp b/scp2/source/math/registryitem_math.scp
index a1c71702fc42..2fa941c0b4ed 100755..100644
--- a/scp2/source/math/registryitem_math.scp
+++ b/scp2/source/math/registryitem_math.scp
@@ -346,7 +346,7 @@ RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
     Subkey = "soffice.StarMathDocument.6\shell\open\command";
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\smath.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Shell_Print_Command
@@ -600,13 +600,6 @@ RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Shell_New_Command
     Value = "\"<progpath>\program\soffice.exe\" -n \"%1\"";
 End
 
-// RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Shell_Open_Command
-//     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-//     ModuleID = gid_Module_Prg_Math_Bin;
-//     Subkey = "opendocument.MathDocument.1\shell\open\command";
-//     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
-// End
-
 RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
@@ -645,7 +638,7 @@ RegistryItem gid_Regitem_OpenOffice_SXM_OpenWith_Math
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sxm\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Math_Bin;
-    Name = "opendocument.MathDocument.1";
+    Name = "soffice.StarMathDocument.6";
     Value = " ";
 End
 
@@ -654,7 +647,7 @@ RegistryItem gid_Regitem_OpenOffice_MML_OpenWith_Math
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".mml\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Math_Bin;
-    Name = "opendocument.MathDocument.1";
+    Name = "soffice.StarMathDocument.6";
     Value = " ";
 End
 
diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp
index 04162a200ccf..5d8673ef9855 100644
--- a/scp2/source/ooo/registryitem_ooo.scp
+++ b/scp2/source/ooo/registryitem_ooo.scp
@@ -140,13 +140,6 @@ RegistryItem gid_Regitem_Soffice_Starconfigfile_6
     REG_VALUE_LNG(SO60_CONFIGFILE)
 End
 
-RegistryItem gid_Regitem_Soffice_Starconfigfile_6_Defaulticon
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    ModuleID = gid_Module_Root;
-    Subkey = "soffice.StarConfigFile.6\DefaultIcon";
-    Value = "<progpath>\program\soffice.exe,17";
-End
-
 RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Soffice_Exe
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\Microsoft\Windows\CurrentVersion\App Paths\soffice.exe";
diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp
index b6497f889630..646e014782c2 100755..100644
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -346,7 +346,7 @@ RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Subkey = "soffice.StarWriterDocument.6\shell\open\command";
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\swriter.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Shell_Print_Command
@@ -416,7 +416,7 @@ RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "soffice.StarWriterGlobalDocument.6\shell\open\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\swriter.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6_Shell_Print_Command
@@ -486,7 +486,7 @@ RegistryItem gid_Regitem_Soffice_Starwritertemplate_6_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "soffice.StarWriterTemplate.6\shell\open\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\swriter.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Soffice_Starwritertemplate_6_Shell_Print_Command
@@ -838,13 +838,6 @@ RegistryItem gid_Regitem_Openoffice_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 = "opendocument.WriterDocument.1\shell\open\command";
-//     Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
-// End
-
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
@@ -982,7 +975,7 @@ RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.WriterTemplate.1\shell\open\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\swriter.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell_Print_Command
@@ -1106,7 +1099,7 @@ RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.WriterGlobalDocument.1\shell\open\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\swriter.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell_Print_Command
@@ -1222,7 +1215,7 @@ RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell_Open_Command
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "opendocument.WriterWebTemplate.1\shell\open\command";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Value = "\"<progpath>\program\soffice.exe\" -o \"%1\"";
+    Value = "\"<progpath>\program\swriter.exe\" -o \"%1\"";
 End
 
 RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell_Print_Command
@@ -1272,7 +1265,7 @@ RegistryItem gid_Regitem_OpenOffice_SXW_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sxw\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
+    Name = "soffice.StarWriterDocument.6";
     Value = " ";
 End
 
@@ -1281,7 +1274,7 @@ RegistryItem gid_Regitem_OpenOffice_STW_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".stw\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
+    Name = "soffice.StarWriterTemplate.6";
     Value = " ";
 End
 
@@ -1290,7 +1283,7 @@ RegistryItem gid_Regitem_OpenOffice_TXT_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".txt\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
+    Name = "soffice.StarWriterDocument.6";
     Value = " ";
 End
 
@@ -1299,7 +1292,7 @@ RegistryItem gid_Regitem_OpenOffice_HTM_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".htm\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterWebDocument.1";
+    Name = "soffice.StarWriterDocument.6";
     Value = " ";
 End
 
@@ -1308,7 +1301,7 @@ RegistryItem gid_Regitem_OpenOffice_HTML_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".html\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterWebDocument.1";
+    Name = "soffice.StarWriterDocument.6";
     Value = " ";
 End
 
@@ -1317,7 +1310,7 @@ RegistryItem gid_Regitem_OpenOffice_XML_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".xml\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
+    Name = "soffice.StarWriterDocument.6";
     Value = " ";
 End
 
@@ -1326,7 +1319,7 @@ RegistryItem gid_Regitem_OpenOffice_WPD_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".wpd\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
+    Name = "soffice.StarWriterDocument.6";
     Value = " ";
 End
 
@@ -1335,25 +1328,7 @@ RegistryItem gid_Regitem_OpenOffice_HWP_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".hwp\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
-    Value = " ";
-End
-
-// .OTH
-RegistryItem gid_Regitem_OpenOffice_OTH_OpenWith_Writer
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".oth\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
-    Value = " ";
-End
-
-// .ODM
-RegistryItem gid_Regitem_OpenOffice_ODM_OpenWith_Writer
-    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
-    Subkey = ".odm\OpenWithProgIDs";
-    ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
+    Name = "soffice.StarWriterDocument.6";
     Value = " ";
 End
 
@@ -1362,10 +1337,11 @@ RegistryItem gid_Regitem_OpenOffice_SXG_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = ".sxg\OpenWithProgIDs";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = "opendocument.WriterDocument.1";
+    Name = "soffice.StarWriterGlobalDocument.6";
     Value = " ";
 End
 
+
 RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Ott
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
@@ -1380,7 +1356,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".stw";
-    Value = "opendocument.WriterDocument.1";
+    Value = "soffice.StarWriterDocument.6";
     Styles = ();
 End
 
@@ -1389,7 +1365,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".txt";
-    Value = "opendocument.WriterDocument.1";
+    Value = "soffice.StarWriterDocument.6";
     Styles = ();
 End
 
@@ -1398,7 +1374,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".htm";
-    Value = "opendocument.WriterWebDocument.1";
+    Value = "soffice.StarWriterDocument.6";
     Styles = ();
 End
 
@@ -1407,7 +1383,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".html";
-    Value = "opendocument.WriterWebDocument.1";
+    Value = "soffice.StarWriterDocument.6";
     Styles = ();
 End
 
@@ -1416,7 +1392,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".xml";
-    Value = "opendocument.WriterDocument.1";
+    Value = "soffice.StarWriterDocument.6";
     Styles = ();
 End
 
@@ -1425,7 +1401,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".wpd";
-    Value = "opendocument.WriterDocument.1";
+    Value = "soffice.StarWriterDocument.6";
     Styles = ();
 End
 
@@ -1434,33 +1410,33 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
     Name = ".hwp";
-    Value = "opendocument.WriterDocument.1";
+    Value = "soffice.StarWriterDocument.6";
     Styles = ();
 End
 
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Oth
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Sxg
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = ".oth";
-    Value = "opendocument.WriterDocument.1";
+    Name = ".sxg";
+    Name = "soffice.StarWriterGlobalDocument.6";
     Styles = ();
 End
 
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Odm
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Oth
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = ".odm";
+    Name = ".oth";
     Value = "opendocument.WriterDocument.1";
     Styles = ();
 End
 
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Sxg
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Odm
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
     Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
     ModuleID = gid_Module_Prg_Wrt_Bin;
-    Name = ".sxg";
+    Name = ".odm";
     Value = "opendocument.WriterDocument.1";
     Styles = ();
 End
@@ -1494,11 +1470,11 @@ REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxg )
 // registering the mso file types
 // CONDITIONAL_REGISTER_DOC_EXTENSION(name,modid,                 key,  cond, disp_name,        icon_id, app, default, dox_type)
 
-CONDITIONAL_REGISTER_DOC_EXTENSION( Doc,  gid_Module_Prg_Wrt_Bin, doc,  DOC,  MS_WORD_DOCUMENT_OLD, 1, swriter.exe, open, Writer )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Docx, gid_Module_Prg_Wrt_Bin, docx, DOCX, MS_WORD_DOCUMENT, 1, swriter.exe, open, Writer )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Docm, gid_Module_Prg_Wrt_Bin, docm, DOCM, MS_WORD_DOCUMENT, 1, swriter.exe, open, Writer )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Dot,  gid_Module_Prg_Wrt_Bin, dot,  DOT,  MS_WORD_TEMPLATE_OLD, 2, swriter.exe, new, Writer )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Dotx, gid_Module_Prg_Wrt_Bin, dotx, DOTX, MS_WORD_TEMPLATE, 2, swriter.exe, new, Writer )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Dotm, gid_Module_Prg_Wrt_Bin, dotm, DOTM, MS_WORD_TEMPLATE, 2, swriter.exe, new, Writer )
-CONDITIONAL_REGISTER_DOC_EXTENSION( Rtf,  gid_Module_Prg_Wrt_Bin, rtf,  RTF,  MS_RTF_DOCUMENT, 1, swriter.exe, open, Writer )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Doc,  gid_Module_Prg_Wrt_Bin, doc,  DOC,  MS_WORD_DOCUMENT_OLD, 27, swriter.exe, open, Writer )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Docx, gid_Module_Prg_Wrt_Bin, docx, DOCX, MS_WORD_DOCUMENT, 27, swriter.exe, open, Writer )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Docm, gid_Module_Prg_Wrt_Bin, docm, DOCM, MS_WORD_DOCUMENT, 27, swriter.exe, open, Writer )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dot,  gid_Module_Prg_Wrt_Bin, dot,  DOT,  MS_WORD_TEMPLATE_OLD, 28, swriter.exe, new, Writer )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dotx, gid_Module_Prg_Wrt_Bin, dotx, DOTX, MS_WORD_TEMPLATE, 28, swriter.exe, new, Writer )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dotm, gid_Module_Prg_Wrt_Bin, dotm, DOTM, MS_WORD_TEMPLATE, 28, swriter.exe, new, Writer )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Rtf,  gid_Module_Prg_Wrt_Bin, rtf,  RTF,  MS_RTF_DOCUMENT, 27, swriter.exe, open, Writer )