sb121: merged in DEV300_m77

19 files changed, 107 insertions, 52 deletions

diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index 7b392f173378..aaba3cd6c2ab 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -49,11 +49,11 @@ STD_UNO_LIB_FILE( gid_File_Lib_Calc, calc)
 
 STD_UNO_LIB_FILE( gid_File_Lib_Date, date)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Sc, sc)
+STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sc, sc)
 
-STD_LIB_FILE( gid_File_Lib_Scui, scui)
+STD_LIB_FILE_PATCH( gid_File_Lib_Scui, scui)
 
-STD_LIB_FILE( gid_File_Lib_Scfilt, scfilt)
+STD_LIB_FILE_PATCH( gid_File_Lib_Scfilt, scfilt)
 
 STD_UNO_LIB_FILE( gid_File_Lib_Scd, scd)
 
diff --git a/scp2/source/calc/module_calc.scp b/scp2/source/calc/module_calc.scp
index 84ab326814ee..0c26c3a7a78b 100644
--- a/scp2/source/calc/module_calc.scp
+++ b/scp2/source/calc/module_calc.scp
@@ -89,4 +89,13 @@ Module gid_Module_Langpack_Calc_Template
              gid_File_Res_Solver);
 End
 
+Module gid_Module_Prg_Calc_MSO_Reg
+    ParentID = gid_Module_Prg_Calc;
+    Name = "gid_Module_Prg_Calc_MSO_Reg";
+    Description = "gid_Module_Prg_Calc_MSO_Reg";
+    Styles = (HIDDEN_ROOT);
+    Minimal = YES;
+    Default = YES;
+End
+
 #include "alllangmodules_calc.inc"
diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
index e2504579e0a0..efc71ac73f63 100644
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -1110,11 +1110,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, 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 )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Xls,  gid_Module_Prg_Calc_MSO_Reg, xls,  XLS,  MS_EXCEL_WORKSHEET_OLD, 29, scalc.exe, open, Calc )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsx, gid_Module_Prg_Calc_MSO_Reg, xlsx, XLSX, MS_EXCEL_WORKSHEET, 29, scalc.exe, open, Calc )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsm, gid_Module_Prg_Calc_MSO_Reg, xlsm, XLSM, MS_EXCEL_WORKSHEET, 29, scalc.exe, open, Calc )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsb, gid_Module_Prg_Calc_MSO_Reg, xlsb, XLSB, MS_EXCEL_WORKSHEET, 29, scalc.exe, open, Calc )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xlt,  gid_Module_Prg_Calc_MSO_Reg, xlt,  XLT,  MS_EXCEL_TEMPLATE_OLD, 30, scalc.exe, new, Calc )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltx, gid_Module_Prg_Calc_MSO_Reg, xltx, XLTX, MS_EXCEL_TEMPLATE, 30, scalc.exe, new, Calc )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltm, gid_Module_Prg_Calc_MSO_Reg, xltm, XLTM, MS_EXCEL_TEMPLATE, 30, scalc.exe, new, Calc )
 
diff --git a/scp2/source/calc/registryitem_calc.ulf b/scp2/source/calc/registryitem_calc.ulf
index 2f6e1e8eda9a..da0739ee1756 100644
--- a/scp2/source/calc/registryitem_calc.ulf
+++ b/scp2/source/calc/registryitem_calc.ulf
@@ -29,10 +29,10 @@
 en-US = "&New"
 
 [STR_REG_VAL_SO60_SPREADSHEET]
-en-US = "%PRODUCTNAME %SXWFORMATVERSION Spreadsheet"
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Spreadsheet"
 
 [STR_REG_VAL_SO60_CALC_TEMPLATE]
-en-US = "%PRODUCTNAME %SXWFORMATVERSION Spreadsheet Template"
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Spreadsheet Template"
 
 [STR_REG_VAL_OO_CALC]
 en-US = "OpenDocument Spreadsheet"
diff --git a/scp2/source/draw/registryitem_draw.ulf b/scp2/source/draw/registryitem_draw.ulf
index 46224625dfb8..7e6bce29fa21 100644
--- a/scp2/source/draw/registryitem_draw.ulf
+++ b/scp2/source/draw/registryitem_draw.ulf
@@ -29,10 +29,10 @@
 en-US = "&New"
 
 [STR_REG_VAL_SO60_DRAWING]
-en-US = "%PRODUCTNAME %SXWFORMATVERSION Drawing"
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Drawing"
 
 [STR_REG_VAL_SO60_DRAW_TEMPLATE]
-en-US = "%PRODUCTNAME %SXWFORMATVERSION Drawing Template"
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Drawing Template"
 
 [STR_REG_VAL_OO_DRAW]
 en-US = "OpenDocument Drawing"
diff --git a/scp2/source/impress/module_impress.scp b/scp2/source/impress/module_impress.scp
index 7f8bcb7c44f7..1682b88d051f 100644
--- a/scp2/source/impress/module_impress.scp
+++ b/scp2/source/impress/module_impress.scp
@@ -77,4 +77,13 @@ Module gid_Module_Langpack_Impress_Template
     Files = (gid_File_Help_Simpress_Zip);
 End
 
+Module gid_Module_Prg_Impress_MSO_Reg
+    ParentID = gid_Module_Prg_Impress;
+    Name = "gid_Module_Prg_Impress_MSO_Reg";
+    Description = "gid_Module_Prg_Impress_MSO_Reg";
+    Styles = (HIDDEN_ROOT);
+    Minimal = YES;
+    Default = YES;
+End
+
 #include "alllangmodules_impress.inc"
diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp
index 689dcd7e1526..cce7f1d85ad3 100644
--- a/scp2/source/impress/registryitem_impress.scp
+++ b/scp2/source/impress/registryitem_impress.scp
@@ -975,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, 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 )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Ppt,  gid_Module_Prg_Impress_MSO_Reg, ppt,  PPT,  MS_POWERPOINT_PRESENTATION_OLD, 33, simpress.exe, open, Impress )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Pps,  gid_Module_Prg_Impress_MSO_Reg, pps,  PPS,  MS_POWERPOINT_SHOW, 33, simpress.exe, open, Impress )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Pptx, gid_Module_Prg_Impress_MSO_Reg, pptx, PPTX, MS_POWERPOINT_PRESENTATION, 33, simpress.exe, open, Impress )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Pptm, gid_Module_Prg_Impress_MSO_Reg, pptm, PPTM, MS_POWERPOINT_PRESENTATION, 33, simpress.exe, open, Impress )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Pot,  gid_Module_Prg_Impress_MSO_Reg, pot,  POT,  MS_POWERPOINT_TEMPLATE_OLD, 34, simpress.exe, new, Impress )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Potx, gid_Module_Prg_Impress_MSO_Reg, potx, POTX, MS_POWERPOINT_TEMPLATE, 34, simpress.exe, new, Impress )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Potm, gid_Module_Prg_Impress_MSO_Reg, potm, POTM, MS_POWERPOINT_TEMPLATE, 34, simpress.exe, new, Impress )
diff --git a/scp2/source/impress/registryitem_impress.ulf b/scp2/source/impress/registryitem_impress.ulf
index 2b49957ea470..0221ab122d52 100644
--- a/scp2/source/impress/registryitem_impress.ulf
+++ b/scp2/source/impress/registryitem_impress.ulf
@@ -32,10 +32,10 @@ en-US = "&New"
 en-US = "Show"
 
 [STR_REG_VAL_SO60_PRESENT]
-en-US = "%PRODUCTNAME %SXWFORMATVERSION Presentation"
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Presentation"
 
 [STR_REG_VAL_SO60_IMPRESS_TEMPLATE]
-en-US = "%PRODUCTNAME %SXWFORMATVERSION Presentation Template"
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Presentation Template"
 
 [STR_REG_VAL_OO_PRESENT]
 en-US = "OpenDocument Presentation"
diff --git a/scp2/source/math/registryitem_math.ulf b/scp2/source/math/registryitem_math.ulf
index cee55d76d3c8..c7cfb663f369 100644
--- a/scp2/source/math/registryitem_math.ulf
+++ b/scp2/source/math/registryitem_math.ulf
@@ -29,7 +29,7 @@
 en-US = "&New"
 
 [STR_REG_VAL_SO60_FORMULA]
-en-US = "%PRODUCTNAME %SXWFORMATVERSION Formula"
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Formula"
 
 [STR_REG_VAL_OO_FORMULA]
 en-US = "OpenDocument Formula"
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 9be400ed2d39..f2f305181786 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -84,6 +84,7 @@ Module gid_Module_Root_Brand
              gid_Brand_File_Lib_Npsoplugin,
              gid_Brand_File_Lib_Subscrib_C05,
              gid_Brand_File_Share_Registry_Brand_Xcd,
+             gid_Brand_File_Share_Registry_O5oo_Xcd
              gid_Brand_File_Script_Unopkg,
              gid_Brand_File_Share_Xdg_Base,
              gid_Brand_File_Share_Xdg_Calc,
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 4a39b5da4978..400baaa5ef04 100755..100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1,5 +1,5 @@
-*************************************************************************
-*
+/*************************************************************************
+ *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
@@ -23,7 +23,7 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
-************************************************************************/
+ ************************************************************************/
 #include "macros.inc"
 
 #ifdef WNT
@@ -653,7 +653,7 @@ STD_LIB_FILE( gid_File_Lib_Fwi , fwi)
 File gid_File_Lib_Fwk
     Name = LIBNAME(fwk);
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
+    Styles = (PACKED,PATCH,UNO_COMPONENT);
     Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
 End
@@ -677,7 +677,7 @@ STD_LIB_FILE( gid_File_Lib_Helplinker, helplinker)
 
 File gid_File_Lib_I18npool
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
+    Styles = (PACKED,PATCH,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -1325,7 +1325,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Sf_Prothdlr, protocolhandler )
 File gid_File_Lib_Sfx
     Name = LIBNAME(sfx);
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
+    Styles = (PACKED,PATCH,UNO_COMPONENT);
     Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
 End
@@ -1381,7 +1381,7 @@ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1)
 STD_LIB_FILE( gid_File_Lib_Sts , sts)
 
 STD_UNO_LIB_FILE( gid_File_Lib_Svl, svl )
-STD_UNO_LIB_FILE( gid_File_Lib_Svtools, svt )
+STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Svtools, svt )
 
 STD_LIB_FILE( gid_File_Lib_Svx_Core, svxcore)
 STD_UNO_LIB_FILE( gid_File_Lib_Svx, svx)
@@ -1390,10 +1390,10 @@ STD_LIB_FILE( gid_File_Lib_Editeng, editeng)
 
 STD_LIB_FILE( gid_File_Lib_Msfilter, msfilter)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Sw , sw)
-STD_LIB_FILE( gid_File_Lib_Swui, swui)
+STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sw , sw)
+STD_LIB_FILE_PATCH( gid_File_Lib_Swui, swui)
 
-STD_LIB_FILE( gid_File_Lib_Msword, msword )
+STD_LIB_FILE_PATCH( gid_File_Lib_Msword, msword )
 
 #if ! defined UNX
 File gid_File_Lib_Sysdtrans
@@ -1537,7 +1537,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Xof , xof)
 File gid_File_Lib_Xo
     Name = LIBNAME(xo);
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
+    Styles = (PACKED,PATCH,UNO_COMPONENT);
     Dir = SCP2_OOO_BIN_DIR;
     RegistryID = gid_Starregistry_Services_Rdb;
 End
@@ -1698,7 +1698,7 @@ File gid_File_Lib_Openssl
     TXT_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
-  #ifdef WNT  
+  #ifdef WNT
     Name = "ssleay32.dll";
   #endif
 End
@@ -1709,7 +1709,7 @@ File gid_File_Lib_Crypto
     TXT_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
-    
+
 	#ifdef WNT
 	  Name = "libeay32.dll";
 	#endif
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 94f9bb6e4450..19a15f7fcc11 100755
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -2100,7 +2100,7 @@ End
 File gid_File_Extension_Dictionary_Sl
 	Dir = gid_Brand_Dir_Share_Extension_Install;
 	Name = "dict-sl.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK);
+	Styles = (PACKED, PATCH, FORCELANGUAGEPACK);
 	UnixRights = 444;
 End
 #endif
diff --git a/scp2/source/ooo/installation_ooo.scp b/scp2/source/ooo/installation_ooo.scp
index 8b045bb440c2..26bdc09eddd3 100644
--- a/scp2/source/ooo/installation_ooo.scp
+++ b/scp2/source/ooo/installation_ooo.scp
@@ -34,6 +34,7 @@ Installation gid_Installation_Ooo
     OOoBaseVersion = "${OOOBASEVERSION}";
     UserDirProductVersion = "${USERDIRPRODUCTVERSION}";
     JavaVersion = "${JAVAVERSION}";
+    SxwFormatName = "OpenOffice.org";
     SxwFormatVersion = "1.1";
     VendorName = "OpenOffice.org";
   #ifdef WNT
diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp
index 5d8673ef9855..47a053f225cd 100644
--- a/scp2/source/ooo/registryitem_ooo.scp
+++ b/scp2/source/ooo/registryitem_ooo.scp
@@ -34,11 +34,18 @@ RegistryItem gid_Regitem_Bau
     Value = "soffice.StarConfigFile.6";
 End
 
-RegistryItem gid_Regitem_AppID__df595024_3257_41b3_bcf1_a51515ad205e
+RegistryItem gid_Regitem_AppID__df595024_3257_41b3_bcf1_a51515ad205e_
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     Subkey = "AppID\{82154420-0FBF-11d4-8313-005004526AB4}";
     ModuleID = gid_Module_Root;
-    Value = "%PRODUCTNAME Service Manager";
+    Value = "%PRODUCTNAME Service Manager (Ver 1.0)";
+End
+
+RegistryItem gid_Regitem_AppID__df595024_3257_41b3_bcf1_a51515ad205e_soffice
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = "AppID\soffice.exe";
+    ModuleID = gid_Module_Root;
+    Value = "%PRODUCTNAME Service Manager (Ver 1.0)";
 End
 
 RegistryItem gid_Regitem_Clsid__3ecf78f0_B1_11d2_8ebe_005ad848af_
diff --git a/scp2/source/ooo/registryitem_ooo.ulf b/scp2/source/ooo/registryitem_ooo.ulf
index cbb57ef56d98..d37db89c113a 100644
--- a/scp2/source/ooo/registryitem_ooo.ulf
+++ b/scp2/source/ooo/registryitem_ooo.ulf
@@ -32,7 +32,7 @@ en-US = "&New"
 en-US = "&Install"
 
 [STR_REG_VAL_SO60_CONFIGFILE]
-en-US = "%PRODUCTNAME %SXWFORMATVERSION Configuration File"
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Configuration File"
 
 [STR_REG_VAL_SO50_TEMPLATE_OOO]
 en-US = "StarOffice 5.0 Template"
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index b69082b05cd5..9228b5cd711c 100755
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -51,7 +51,7 @@ WindowsCustomAction gid_Customaction_Regallmsdocdll
 	Source = "reg4allmsdoc.dll";
 	Target = "FindRegisteredExtensions";
 	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH", "CostFinalize");
+	Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH And _IsSetupTypeMin<>\"Custom\"", "CostFinalize");
 End
 
 WindowsCustomAction gid_Customaction_Regactivexdll1
@@ -516,3 +516,21 @@ WindowsCustomAction gid_Customaction_ShowSurvey
 	Inbinarytable = 1;
 	Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" and Not UPGRADINGPRODUCTCODE", "end");
 End
+
+WindowsCustomAction gid_Customaction_LookForRegisteredExtensions
+	Name = "LookForRegisteredExtensions";
+	Typ = "65";
+	Source = "reg4allmsdoc.dll";
+	Target = "LookForRegisteredExtensions";
+	Inbinarytable = 1;
+	Assignment1 = ("ControlEvent", "CustomSetup", "Next", "DoAction", "LookForRegisteredExtensions", "1", "2");
+End
+
+WindowsCustomAction gid_Customaction_RegisterSomeExtensions
+	Name = "RegisterSomeExtensions";
+	Typ = "65";
+	Source = "reg4allmsdoc.dll";
+	Target = "RegisterSomeExtensions";
+	Inbinarytable = 1;
+	Assignment1 = ("ControlEvent", "FileTypeDialog", "Next", "DoAction", "RegisterSomeExtensions", "1", "1");
+End
diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp
index 16928c8b25b9..0d959dd3f86b 100644
--- a/scp2/source/writer/module_writer.scp
+++ b/scp2/source/writer/module_writer.scp
@@ -92,5 +92,15 @@ Module gid_Module_Langpack_Writer_Template
              gid_File_Res_T602Filter);
 End
 
+Module gid_Module_Prg_Wrt_MSO_Reg
+    ParentID = gid_Module_Prg_Wrt;
+    Name = "gid_Module_Prg_Wrt_MSO_Reg";
+    Description = "gid_Module_Prg_Wrt_MSO_Reg";
+    Styles = (HIDDEN_ROOT);
+    Minimal = YES;
+    Default = YES;
+End
+
+
 #include "alllangmodules_writer.inc"
 
diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp
index a1233bb1792f..8c3f0a5b82ad 100644
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -1488,11 +1488,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, 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 )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Doc,  gid_Module_Prg_Wrt_MSO_Reg, doc,  DOC,  MS_WORD_DOCUMENT_OLD, 27, swriter.exe, open, Writer )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Docx, gid_Module_Prg_Wrt_MSO_Reg, docx, DOCX, MS_WORD_DOCUMENT, 27, swriter.exe, open, Writer )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Docm, gid_Module_Prg_Wrt_MSO_Reg, docm, DOCM, MS_WORD_DOCUMENT, 27, swriter.exe, open, Writer )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dot,  gid_Module_Prg_Wrt_MSO_Reg, dot,  DOT,  MS_WORD_TEMPLATE_OLD, 28, swriter.exe, new, Writer )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dotx, gid_Module_Prg_Wrt_MSO_Reg, dotx, DOTX, MS_WORD_TEMPLATE, 28, swriter.exe, new, Writer )
+CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dotm, gid_Module_Prg_Wrt_MSO_Reg, dotm, DOTM, MS_WORD_TEMPLATE, 28, swriter.exe, new, Writer )
+CONDITIONAL_REGISTER_DOC_EXTENSION( Rtf,  gid_Module_Prg_Wrt_MSO_Reg, rtf,  RTF,  MS_RTF_DOCUMENT, 27, swriter.exe, open, Writer )
 
diff --git a/scp2/source/writer/registryitem_writer.ulf b/scp2/source/writer/registryitem_writer.ulf
index ce8108ae572d..f353df21d9cc 100644
--- a/scp2/source/writer/registryitem_writer.ulf
+++ b/scp2/source/writer/registryitem_writer.ulf
@@ -29,13 +29,13 @@
 en-US = "&New"
 
 [STR_REG_VAL_SO60_TEXT]
-en-US = "%PRODUCTNAME %SXWFORMATVERSION Text Document"
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Text Document"
 
 [STR_REG_VAL_SO60_MASTERDOC]
-en-US = "%PRODUCTNAME %SXWFORMATVERSION Master Document"
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Master Document"
 
 [STR_REG_VAL_SO60_WRITER_TEMPLATE]
-en-US = "%PRODUCTNAME %SXWFORMATVERSION Text Document Template"
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Text Document Template"
 
 [STR_REG_VAL_OO_WRITER]
 en-US = "OpenDocument Text"