diff options
Diffstat (limited to 'scp2')
64 files changed, 467 insertions, 3135 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 4d8f0b3903be..48a1ae148777 100755..100644 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -501,7 +501,17 @@ End ModuleID = modid; \ Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \ Name = STRING(CONCAT2(.,key)); \ - Value = STRING(CONCAT3(opendocument.,doc_type,Document.1)); \ + Value = STRING(CONCAT3(soffice.Star,doc_type,Document.6)); \ + Styles = (); \ + End + +#define REGISTRY_ENTRY_TEMPLATE_CAPABILITIES(name,modid,key,doc_type) \ + RegistryItem CONCAT2(gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_,name) \ + ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \ + ModuleID = modid; \ + Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \ + Name = STRING(CONCAT2(.,key)); \ + Value = STRING(CONCAT3(soffice.Star,doc_type,Template.6)); \ Styles = (); \ End @@ -518,6 +528,19 @@ End REGISTRY_ENTRY_PRINTTO_CMD(name,modid,app) \ REGISTRY_ENTRY_CAPABILITIES(name,modid,key,doc_type) \ +#define CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION(name,modid,key,cond,disp_name,icon_id,app,default,doc_type) \ + CONDITIONAL_MODULE_ENTRY(name,modid) \ + REGISTRY_ENTRY_OPEN_WITH(name,cond,doc_type,modid,key) \ + CONDITIONAL_REGISTRY_ENTRY_EXT(name,cond,key) \ + REGISTRY_ENTRY_DOC(name,modid,disp_name) \ + REGISTRY_ENTRY_ICON(name,modid,icon_id) \ + REGISTRY_ENTRY_SHELL(name,default,modid) \ + REGISTRY_ENTRY_NEW_CMD(name,modid,app) \ + REGISTRY_ENTRY_OPEN_CMD(name,modid,app) \ + REGISTRY_ENTRY_PRINT_CMD(name,modid,app) \ + REGISTRY_ENTRY_PRINTTO_CMD(name,modid,app) \ + REGISTRY_ENTRY_TEMPLATE_CAPABILITIES(name,modid,key,doc_type) \ + // --------------------------------------- #define REGISTER_PROPERTY_HANDLER_FOR_EXTENSION(extension) \ diff --git a/scp2/macros/macro.pl b/scp2/macros/macro.pl index 4f44da084a69..d9d1420bdc73 100644 --- a/scp2/macros/macro.pl +++ b/scp2/macros/macro.pl @@ -60,6 +60,7 @@ write_DIR_ISOLANGUAGE_ALL_LANG(); write_DIR_ISOLANGUAGE_ALL_LANG_LPROJ(); write_DIR_IDENT_ALL_LANG(); write_EXTRA_ALL_LANG(); +write_EXTRA_ALL_LANG_BUT_EN_US(); write_EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(); write_EXTRA_IDENT_ALL_LANG(); write_RESFILE_ALL_LANG(); @@ -134,14 +135,29 @@ sub write_DIR_IDENT_ALL_LANG sub write_EXTRA_ALL_LANG { - print OUTFILE "#define EXTRA_ALL_LANG(name) "; + print OUTFILE "#define EXTRA_ALL_LANG(name,ext) "; foreach $lang (@completelangiso) { - print OUTFILE "\\\n\tName ($lang) = EXTRAFILENAME(name,_$lang)"; + print OUTFILE "\\\n\tName ($lang) = CONFIGLANGFILENAME(name,_$lang,ext)"; print OUTFILE "; " if ( $lang ne $completelangiso[$#completelangiso]); } print OUTFILE "\n\n"; } +sub write_EXTRA_ALL_LANG_BUT_EN_US +{ + print OUTFILE "#define EXTRA_ALL_LANG_BUT_EN_US(name,ext) "; + my $first = 1; + foreach $lang (@completelangiso) { + if ($lang ne "en-US") { + print OUTFILE "; " unless $first; + $first = 0; + print OUTFILE + "\\\n\tName ($lang) = CONFIGLANGFILENAME(name,_$lang,ext)"; + } + } + print OUTFILE "\n\n"; +} + sub write_EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG { my $first = 1; diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp index 9edecfdd536a..3d209912479c 100644 --- a/scp2/source/base/file_base.scp +++ b/scp2/source/base/file_base.scp @@ -79,38 +79,9 @@ File gid_File_Help_Sdatabase_Zip Patchfiles = (); End -File gid_File_Registry_Spool_Oo_Setup_Base_Xcu +File gid_File_Share_Registry_Base_Xcd TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Setup; - Name = "/registry/spool/org/openoffice/Setup-base.xcu"; + Dir = gid_Dir_Share_Registry; + Name = "base.xcd"; End - -File gid_File_Registry_Spool_Oo_Common_Base_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common; - Name = "/registry/spool/org/openoffice/Office/Common-base.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Database_Types_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_database_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Database_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_database_filters.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Database_Others_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Misc; - Name = "/registry/spool/fcfg_database_others.xcu"; -End - diff --git a/scp2/source/base/module_base.scp b/scp2/source/base/module_base.scp index b620b49beab1..dc4d76fcf5d1 100644 --- a/scp2/source/base/module_base.scp +++ b/scp2/source/base/module_base.scp @@ -43,10 +43,7 @@ Module gid_Module_Prg_Base_Bin Default = YES; Styles = (HIDDEN_ROOT); Files = ( - gid_File_Registry_Spool_Oo_Setup_Base_Xcu,gid_File_Registry_Spool_Oo_Common_Base_Xcu - ,gid_File_Registry_Spool_Oo_TypeDetection_Database_Types_Xcu - ,gid_File_Registry_Spool_Oo_TypeDetection_Database_Filters_Xcu - ,gid_File_Registry_Spool_Oo_TypeDetection_Database_Others_Xcu + gid_File_Share_Registry_Base_Xcd ,gid_File_Lib_Abp ,gid_File_Lib_Dbp ,gid_File_Lib_Dbu diff --git a/scp2/source/binfilter/file_binfilter.scp b/scp2/source/binfilter/file_binfilter.scp index d4f89e589d8f..be66b907a25d 100644 --- a/scp2/source/binfilter/file_binfilter.scp +++ b/scp2/source/binfilter/file_binfilter.scp @@ -28,127 +28,13 @@ #include "macros.inc" - -File gid_File_Registry_Spool_Oo_TypeDetection_Chart_Bf_Types_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_chart_bf_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Chart_Bf_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_chart_bf_filters.xcu"; -End - - -File gid_File_Registry_Spool_Oo_TypeDetection_Calc_Bf_Types_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_calc_bf_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Calc_Bf_Filters_Xcu +File gid_File_Share_Registry_Binfilter_Xcd TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_calc_bf_filters.xcu"; + Dir = gid_Dir_Share_Registry; + Name = "binfilter.xcd"; End - -File gid_File_Registry_Spool_Oo_TypeDetection_Draw_Bf_Types_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_draw_bf_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Draw_Bf_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_draw_bf_filters.xcu"; -End - - -File gid_File_Registry_Spool_Oo_TypeDetection_Global_Bf_Types_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_global_bf_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Global_Bf_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_global_bf_filters.xcu"; -End - - -File gid_File_Registry_Spool_Oo_TypeDetection_Impress_Bf_Types_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_impress_bf_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Impress_Bf_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_impress_bf_filters.xcu"; -End - - -File gid_File_Registry_Spool_Oo_TypeDetection_Math_Bf_Types_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_math_bf_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Math_Bf_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_math_bf_filters.xcu"; -End - - -File gid_File_Registry_Spool_Oo_TypeDetection_Web_Bf_Types_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_web_bf_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Web_Bf_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_web_bf_filters.xcu"; -End - - -File gid_File_Registry_Spool_Oo_TypeDetection_Writer_Bf_Types_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_writer_bf_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Writer_Bf_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_writer_bf_filters.xcu"; -End - - File gid_Starregistry_Legacy_Binfilters_Rdb TXT_FILE_BODY; Name = "legacy_binfilters.rdb"; diff --git a/scp2/source/binfilter/module_binfilter.scp b/scp2/source/binfilter/module_binfilter.scp index 8200b4575495..d7cba78f6101 100644 --- a/scp2/source/binfilter/module_binfilter.scp +++ b/scp2/source/binfilter/module_binfilter.scp @@ -34,22 +34,7 @@ Module gid_Module_Optional_Binfilter InstallOrder = "1100"; ParentID = gid_Module_Optional; Default = YES; - Files = (gid_File_Registry_Spool_Oo_TypeDetection_Chart_Bf_Types_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Chart_Bf_Filters_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Calc_Bf_Types_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Calc_Bf_Filters_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Draw_Bf_Types_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Draw_Bf_Filters_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Global_Bf_Types_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Global_Bf_Filters_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Impress_Bf_Types_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Impress_Bf_Filters_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Math_Bf_Types_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Math_Bf_Filters_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Web_Bf_Types_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Web_Bf_Filters_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Writer_Bf_Types_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Writer_Bf_Filters_Xcu, + Files = (gid_File_Share_Registry_Binfilter_Xcd, gid_Starregistry_Legacy_Binfilters_Rdb, gid_File_Lib_Bf_Go, gid_File_Lib_Bf_Sch, 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/file_calc.scp b/scp2/source/calc/file_calc.scp index 173a3a358863..aaba3cd6c2ab 100644 --- a/scp2/source/calc/file_calc.scp +++ b/scp2/source/calc/file_calc.scp @@ -38,21 +38,22 @@ End STD_UNO_LIB_FILE( gid_File_Lib_Analysis, analysis) -File gid_File_Oo_Office_Dataaccess_Calc_Xcu +File gid_File_Share_Registry_Calc_Xcd TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers; - Name = "/registry/spool/DataAccess/calc.xcu"; + Dir = gid_Dir_Share_Registry; + Name = "calc.xcd"; End + 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) @@ -64,13 +65,6 @@ STD_RES_FILE( gid_File_Res_Date, date) STD_RES_FILE( gid_File_Res_Sc, sc ) -File gid_File_Registry_Spool_Oo_Office_Embedding_Calc_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Embedding; - Name = "/registry/spool/org/openoffice/Office/Embedding-calc.xcu"; -End - File gid_File_Help_Scalc_Zip Dir = gid_Dir_Help_Isolanguage; ARCHIVE_TXT_FILE_BODY; @@ -87,69 +81,6 @@ File gid_File_Share_Config_Sofficecfg_Calc_Menubar_Xml Name = "/uiconfig/scalc/menubar/menubar.xml"; End */ -File gid_File_Oo_Office_Ui_Calccommands_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/CalcCommands.xcs"; -End - -File gid_File_Oo_Office_Ui_Calccommands_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/CalcCommands.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Calc_UISort_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_UISort; - Name = "/registry/spool/org/openoffice/TypeDetection/UISort-calc.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Calc_Types_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_calc_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Calc_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_calc_filters.xcu"; -End - -File gid_File_Registry_Spool_Oo_Common_Calc_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common; - Name = "/registry/spool/org/openoffice/Office/Common-calc.xcu"; -End - -File gid_File_Registry_Spool_Oo_Setup_Calc_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Setup; - Name = "/registry/spool/org/openoffice/Setup-calc.xcu"; -End - -File gid_File_Oo_Office_Ui_Calcwindowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/CalcWindowState.xcs"; -End - -File gid_File_Oo_Office_Ui_Calcwindowstate_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu"; -End - File gid_File_Exe_Scalc BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; diff --git a/scp2/source/calc/module_calc.scp b/scp2/source/calc/module_calc.scp index bbb61d1fc241..0c26c3a7a78b 100644 --- a/scp2/source/calc/module_calc.scp +++ b/scp2/source/calc/module_calc.scp @@ -42,11 +42,9 @@ Module gid_Module_Prg_Calc_Bin Minimal = YES; Default = YES; Styles = (HIDDEN_ROOT); - Files = (gid_File_Oo_Office_Dataaccess_Calc_Xcu,gid_File_Lib_Calc,gid_File_Lib_Sc,gid_File_Lib_Scui,gid_File_Lib_Scfilt,gid_File_Lib_Scd,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg,gid_File_Share_Config_Sofficecfg_Calc_Menubar_Xml, + Files = (gid_File_Share_Registry_Calc_Xcd,gid_File_Lib_Calc,gid_File_Lib_Sc,gid_File_Lib_Scui,gid_File_Lib_Scfilt,gid_File_Lib_Scd,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg,gid_File_Share_Config_Sofficecfg_Calc_Menubar_Xml, gid_File_Lib_Solver,gid_File_Lib_Lpsolve, - gid_File_Oo_Office_Ui_Calccommands_Xcs,gid_File_Oo_Office_Ui_Calccommands_Xcu,gid_File_Oo_Office_Ui_Calcwindowstate_Xcs, - gid_File_Registry_Spool_Oo_Common_Calc_Xcu,gid_File_Registry_Spool_Oo_Setup_Calc_Xcu, gid_File_Registry_Spool_Oo_Office_Embedding_Calc_Xcu, - gid_File_Oo_Office_Ui_Calcwindowstate_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Calc_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Calc_Filters_Xcu, gid_File_Tmp_Userinstall_Calc_Inf); + gid_File_Tmp_Userinstall_Calc_Inf); End // Module gid_Module_Prg_Calc_Help @@ -91,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 31742152cee1..efc71ac73f63 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 @@ -879,7 +872,7 @@ 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 +881,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 +890,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 +899,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 +908,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 +917,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 +926,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 +935,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 +944,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 +953,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 +962,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 +971,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 +980,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 +989,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 +998,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 +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 = ".dif"; - Value = "opendocument.CalcDocument.1"; + Value = "soffice.StarCalcDocument.6"; Styles = (); End @@ -1032,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 = ".dbf"; - Value = "opendocument.CalcDocument.1"; + Value = "soffice.StarCalcDocument.6"; Styles = (); End @@ -1041,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 = ".slk"; - Value = "opendocument.CalcDocument.1"; + Value = "soffice.StarCalcDocument.6"; Styles = (); End @@ -1050,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 = ".csv"; - Value = "opendocument.CalcDocument.1"; + Value = "soffice.StarCalcDocument.6"; Styles = (); End @@ -1059,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 = ".xlw"; - Value = "opendocument.CalcDocument.1"; + Value = "soffice.StarCalcDocument.6"; Styles = (); End @@ -1068,7 +1063,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 +1072,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 +1081,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 +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, 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_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/canvas/canvascommons.scp b/scp2/source/canvas/canvascommons.scp index be8214b5593f..f095eff9f23e 100644 --- a/scp2/source/canvas/canvascommons.scp +++ b/scp2/source/canvas/canvascommons.scp @@ -27,19 +27,6 @@ #include "macros.inc" -File gid_File_Oo_Office_Canvas_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Canvas.xcs"; -End -File gid_File_Oo_Office_Canvas_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/Canvas.xcu"; -End - STD_LIB_FILE(gid_File_Lib_CppCanvas, cppcanvas) STD_LIB_FILE(gid_File_Lib_CanvasTools, canvastools) diff --git a/scp2/source/crashrep/file_crashrep_dynamic.scp b/scp2/source/crashrep/file_crashrep.scp index f92f93f0b1d8..f92f93f0b1d8 100644 --- a/scp2/source/crashrep/file_crashrep_dynamic.scp +++ b/scp2/source/crashrep/file_crashrep.scp diff --git a/scp2/source/crashrep/file_crashrep_static.scp b/scp2/source/crashrep/file_crashrep_static.scp deleted file mode 100644 index ba5c65087d79..000000000000 --- a/scp2/source/crashrep/file_crashrep_static.scp +++ /dev/null @@ -1,54 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "macros.inc" - -// crashreporter files -// crash_report_with_gtk.bin is statically built -// it exists only for Unix - -#ifndef MACOSX - -File gid_File_Bin_Crashreport_With_Gtk - BIN_FILE_BODY; - Name = "crash_report_with_gtk.bin"; - Dir = gid_Dir_Program; - Styles = (PACKED); -End - -#endif - -#ifndef MACOSX - -File gid_File_Aliases_Pangox - TXT_FILE_BODY; - Name = "pangox.aliases"; - Dir = gid_Dir_Program; - Styles = (PACKED); -End - -#endif diff --git a/scp2/source/crashrep/makefile.mk b/scp2/source/crashrep/makefile.mk index 17c7584b9bb2..5e8101488270 100644 --- a/scp2/source/crashrep/makefile.mk +++ b/scp2/source/crashrep/makefile.mk @@ -42,7 +42,7 @@ TARGETTYPE=CUI SCP_PRODUCT_TYPE=osl PARFILES = \ - file_crashrep_dynamic.par + file_crashrep.par .ENDIF # "$(ENABLE_CRASHDUMP)" != "" diff --git a/scp2/source/draw/file_draw.scp b/scp2/source/draw/file_draw.scp index 2278301e6a70..357e01f3cc00 100644 --- a/scp2/source/draw/file_draw.scp +++ b/scp2/source/draw/file_draw.scp @@ -27,11 +27,11 @@ #include "macros.inc" -File gid_File_Registry_Spool_Oo_Office_Embedding_Draw_Xcu +File gid_File_Share_Registry_Draw_Xcd TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Embedding; - Name = "/registry/spool/org/openoffice/Office/Embedding-draw.xcu"; + Dir = gid_Dir_Share_Registry; + Name = "draw.xcd"; End File gid_File_Help_Sdraw_Zip @@ -62,53 +62,3 @@ File gid_File_Share_Config_Sofficecfg_Draw_Menubar_Xml Name = "/uiconfig/sdraw/menubar/menubar.xml"; End */ - -File gid_File_Registry_Spool_Oo_TypeDetection_Draw_UISort_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_UISort; - Name = "/registry/spool/org/openoffice/TypeDetection/UISort-draw.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Draw_Types_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_draw_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Draw_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_draw_filters.xcu"; -End - -File gid_File_Registry_Spool_Oo_Common_Draw_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common; - Name = "/registry/spool/org/openoffice/Office/Common-draw.xcu"; -End - -File gid_File_Registry_Spool_Oo_Setup_Draw_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Setup; - Name = "/registry/spool/org/openoffice/Setup-draw.xcu"; -End - -File gid_File_Oo_Office_Ui_Drawwindowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/DrawWindowState.xcs"; -End - -File gid_File_Oo_Office_Ui_Drawwindowstate_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu"; -End - diff --git a/scp2/source/draw/module_draw.scp b/scp2/source/draw/module_draw.scp index 824b694e74b0..3226e08ea559 100644 --- a/scp2/source/draw/module_draw.scp +++ b/scp2/source/draw/module_draw.scp @@ -43,10 +43,8 @@ Module gid_Module_Prg_Draw_Bin Default = YES; Styles = (HIDDEN_ROOT); Files = (gid_File_Extra_Urldesktop_Draw,gid_File_Extra_Urlnew_Draw,gid_File_Extra_Urlstart_Draw,gid_File_Extra_Urltasks_Draw,gid_File_Share_Config_Sofficecfg_Draw_Menubar_Xml, - gid_File_Registry_Spool_Oo_Common_Draw_Xcu,gid_File_Registry_Spool_Oo_Setup_Draw_Xcu, - gid_File_Oo_Office_Ui_Drawwindowstate_Xcs,gid_File_Oo_Office_Ui_Drawwindowstate_Xcu, - gid_File_Registry_Spool_Oo_Office_Embedding_Draw_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Draw_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Draw_Filters_Xcu, gid_File_Tmp_Userinstall_Draw_Inf); + gid_File_Share_Registry_Draw_Xcd, + gid_File_Tmp_Userinstall_Draw_Inf); End // Module gid_Module_Prg_Draw_Help 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/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/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp index fefe57df96e2..9d10261843d2 100644 --- a/scp2/source/gnome/file_gnome.scp +++ b/scp2/source/gnome/file_gnome.scp @@ -48,6 +48,15 @@ File gid_File_Lib_Gnomevfs End #endif +#if (defined ENABLE_GNOMEVFS && defined ENABLE_LOCKDOWN) || defined ENABLE_GIO +File gid_File_Share_Registry_Gnome_Xcd + TXT_FILE_BODY; + Styles = (PACKED); + Dir = gid_Dir_Share_Registry; + Name = "gnome.xcd"; +End +#endif + #ifdef ENABLE_GCONF File gid_File_Lib_Gconfbe TXT_FILE_BODY; diff --git a/scp2/source/gnome/makefile.mk b/scp2/source/gnome/makefile.mk index a7f9b2a7cdf6..185915353a5a 100644 --- a/scp2/source/gnome/makefile.mk +++ b/scp2/source/gnome/makefile.mk @@ -45,6 +45,10 @@ SCP_PRODUCT_TYPE=osl SCPDEFS+=-DENABLE_GCONF .ENDIF +.IF "$(ENABLE_LOCKDOWN)" == "YES" +SCPDEFS+=-DENABLE_LOCKDOWN +.ENDIF + .IF "$(ENABLE_GNOMEVFS)" != "" SCPDEFS+=-DENABLE_GNOMEVFS .ENDIF diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp index 8f87492cbb47..f9df5c8969a1 100644 --- a/scp2/source/gnome/module_gnome.scp +++ b/scp2/source/gnome/module_gnome.scp @@ -27,15 +27,6 @@ #include "macros.inc" -#ifdef ENABLE_GIO -File gid_File_Registry_Spool_Oo_Ucb_Configuration_GIOContentProvider_Xcu - TXT_FILE_BODY; - Dir = gid_Dir_Share_Registry_Modules_Oo_Ucb_Configuration; - Name = "/registry/spool/org/openoffice/ucb/Configuration-gio.xcu"; - Styles = (PACKED,SCPZIP_REPLACE); -End -#endif - Module gid_Module_Optional_Gnome ParentID = gid_Module_Optional; Default = YES; @@ -54,11 +45,14 @@ Module gid_Module_Optional_Gnome gid_File_Lib_Gnomevfs, gid_File_Bin_Gnome_Set_Default_Application, #endif #ifdef ENABLE_GIO - gid_File_Lib_GIO, gid_File_Registry_Spool_Oo_Ucb_Configuration_GIOContentProvider_Xcu + gid_File_Lib_GIO, #endif #ifdef ENABLE_GCONF gid_File_Lib_Gconfbe #endif +#if (defined ENABLE_GNOMEVFS && defined ENABLE_LOCKDOWN) || defined ENABLE_GIO + gid_File_Share_Registry_Gnome_Xcd +#endif ); End diff --git a/scp2/source/graphicfilter/file_graphicfilter.scp b/scp2/source/graphicfilter/file_graphicfilter.scp index b8d90c9a6ada..2cd0f53f9e56 100644 --- a/scp2/source/graphicfilter/file_graphicfilter.scp +++ b/scp2/source/graphicfilter/file_graphicfilter.scp @@ -27,32 +27,11 @@ #include "macros.inc" -File gid_File_Registry_Spool_Oo_TypeDetection_ImpressGraphics_Types_Xcu +File gid_File_Share_Registry_Graphicfilter_Xcd TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_impressgraphics_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_ImpressGraphics_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_impressgraphics_filters.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_DrawGraphics_Types_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_drawgraphics_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_DrawGraphics_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_drawgraphics_filters.xcu"; + Dir = gid_Dir_Share_Registry; + Name = "graphicfilter.xcd"; End STD_UNO_LIB_FILE( gid_File_Lib_Flash, flash ) diff --git a/scp2/source/graphicfilter/module_graphicfilter.scp b/scp2/source/graphicfilter/module_graphicfilter.scp index eb4f92a55485..d5d99969fd64 100644 --- a/scp2/source/graphicfilter/module_graphicfilter.scp +++ b/scp2/source/graphicfilter/module_graphicfilter.scp @@ -34,6 +34,5 @@ Module gid_Module_Optional_Grfflt ParentID = gid_Module_Optional; Default = YES; Files = (gid_File_Lib_Svg, gid_File_Lib_Flash, - gid_File_Registry_Spool_Oo_TypeDetection_ImpressGraphics_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_ImpressGraphics_Filters_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_DrawGraphics_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_DrawGraphics_Filters_Xcu); + gid_File_Share_Registry_Graphicfilter_Xcd); End diff --git a/scp2/source/impress/file_impress.scp b/scp2/source/impress/file_impress.scp index e93cc421ba06..00dde2ca9162 100644 --- a/scp2/source/impress/file_impress.scp +++ b/scp2/source/impress/file_impress.scp @@ -37,11 +37,11 @@ File gid_File_Lib_Animcore PACKED_UNO_LIB_FILE_BODY; End -File gid_File_Registry_Spool_Oo_Office_Embedding_Impress_Xcu +File gid_File_Share_Registry_Impress_Xcd TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Embedding; - Name = "/registry/spool/org/openoffice/Office/Embedding-impress.xcu"; + Dir = gid_Dir_Share_Registry; + Name = "impress.xcd"; End File gid_File_Help_Simpress_Zip @@ -74,55 +74,6 @@ File gid_File_Share_Config_Sofficecfg_Impress_Menubar_Xml End */ -File gid_File_Registry_Spool_Oo_TypeDetection_Impress_UISort_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_UISort; - Name = "/registry/spool/org/openoffice/TypeDetection/UISort-impress.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Impress_Types_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_impress_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Impress_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_impress_filters.xcu"; -End - -File gid_File_Registry_Spool_Oo_Common_Impress_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common; - Name = "/registry/spool/org/openoffice/Office/Common-impress.xcu"; -End - -File gid_File_Registry_Spool_Oo_Setup_Impress_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Setup; - Name = "/registry/spool/org/openoffice/Setup-impress.xcu"; -End - -File gid_File_Oo_Office_Ui_Impresswindowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/ImpressWindowState.xcs"; -End - -File gid_File_Oo_Office_Ui_Impresswindowstate_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu"; -End - // configuration files for custom animation effects File gid_File_Share_Config_Sofficecfg_Impress_Effects_Xml @@ -138,17 +89,3 @@ File gid_File_Share_Config_Sofficecfg_Impress_Transitions_Xml Dir = gid_Dir_Share_Config_Sofficecfg_Simpress; Name = "transitions.xml"; End - -File gid_File_Oo_Office_Ui_Effects_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/Effects.xcs"; -End - -File gid_File_Oo_Office_Ui_Effects_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/Effects.xcu"; -End diff --git a/scp2/source/impress/module_impress.scp b/scp2/source/impress/module_impress.scp index 84fcb713a4e8..1682b88d051f 100644 --- a/scp2/source/impress/module_impress.scp +++ b/scp2/source/impress/module_impress.scp @@ -43,11 +43,9 @@ Module gid_Module_Prg_Impress_Bin Default = YES; Styles = (HIDDEN_ROOT); Files = (gid_File_Extra_Urldesktop_Impress,gid_File_Extra_Urlnew_Impress,gid_File_Extra_Urlstart_Impress,gid_File_Extra_Urltasks_Impress,gid_File_Lib_Placeware, - gid_File_Registry_Spool_Oo_Common_Impress_Xcu,gid_File_Registry_Spool_Oo_Setup_Impress_Xcu, - gid_File_Oo_Office_Ui_Impresswindowstate_Xcs,gid_File_Oo_Office_Ui_Impresswindowstate_Xcu, + gid_File_Share_Registry_Impress_Xcd, gid_File_Lib_Animcore,gid_File_Share_Config_Sofficecfg_Impress_Effects_Xml, gid_File_Share_Config_Sofficecfg_Impress_Transitions_Xml, - gid_File_Oo_Office_Ui_Effects_Xcs, gid_File_Oo_Office_Ui_Effects_Xcu, gid_File_Registry_Spool_Oo_Office_Embedding_Impress_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Impress_Filters_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Impress_Types_Xcu, gid_File_Tmp_Userinstall_Impress_Inf); + gid_File_Tmp_Userinstall_Impress_Inf); End // Module gid_Module_Prg_Impress_Help @@ -79,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/module_ogltrans.scp b/scp2/source/impress/module_ogltrans.scp index b0f872a644c4..06fbb4bfcc1a 100644 --- a/scp2/source/impress/module_ogltrans.scp +++ b/scp2/source/impress/module_ogltrans.scp @@ -31,7 +31,7 @@ Module gid_Module_Optional_OGLTrans PackageInfo = "packinfo_office.txt"; MOD_NAME_DESC(MODULE_OPTIONAL_OGLTRANS); ParentID = gid_Module_Optional; - Files = ( gid_File_Lib_OpenGLTransitions, gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml, gid_File_Registry_Spool_Oo_Office_Impress_OGLTrans_Xcu ); + Files = ( gid_File_Lib_OpenGLTransitions, gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml, gid_File_Share_Registry_Ogltrans_Xcd ); Minimal = NO; Default = NO; End @@ -55,9 +55,9 @@ File gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml Name = "transitions-ogl.xml"; End -File gid_File_Registry_Spool_Oo_Office_Impress_OGLTrans_Xcu +File gid_File_Share_Registry_Ogltrans_Xcd TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Impress; - Name = "registry/spool/org/openoffice/Office/Impress-ogltrans.xcu"; + Dir = gid_Dir_Share_Registry; + Name = "ogltrans.xcd"; End diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp index cf4ba3ccbcb6..cce7f1d85ad3 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_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/javafilter/file_javafilter.scp b/scp2/source/javafilter/file_javafilter.scp index 89135ebe37f4..d7a902dbf00f 100644 --- a/scp2/source/javafilter/file_javafilter.scp +++ b/scp2/source/javafilter/file_javafilter.scp @@ -49,46 +49,25 @@ End #endif -File gid_File_Registry_Spool_Oo_TypeDetection_Palm_Types_Xcu +File gid_File_Share_Registry_Palm_Xcd TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_palm_types.xcu"; + Dir = gid_Dir_Share_Registry; + Name = "palm.xcd"; End -File gid_File_Registry_Spool_Oo_TypeDetection_Palm_Filters_Xcu +File gid_File_Share_Registry_Pocketexcel_Xcd TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_palm_filters.xcu"; + Dir = gid_Dir_Share_Registry; + Name = "pocketexcel.xcd"; End -File gid_File_Registry_Spool_Oo_TypeDetection_PocketWord_Types_Xcu +File gid_File_Share_Registry_Pocketword_Xcd TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_pocketword_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_PocketWord_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_pocketword_filters.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_PocketExcel_Types_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_pocketexcel_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_PocketExcel_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_pocketexcel_filters.xcu"; + Dir = gid_Dir_Share_Registry; + Name = "pocketword.xcd"; End #ifdef SOLAR_JAVA diff --git a/scp2/source/javafilter/module_javafilter.scp b/scp2/source/javafilter/module_javafilter.scp index f9b0f5c42a99..dd69d014caf7 100644 --- a/scp2/source/javafilter/module_javafilter.scp +++ b/scp2/source/javafilter/module_javafilter.scp @@ -60,7 +60,7 @@ End Module gid_Module_Optional_Javafilter_Palm_Aportisdoc MOD_NAME_DESC(MODULE_OPTIONAL_JAVAFILTER_PALM_APORTISDOC); ParentID = gid_Module_Optional_Javafilter_Palm; - Files = ( gid_File_Jar_Aportisdoc, gid_File_Registry_Spool_Oo_TypeDetection_Palm_Filters_Xcu, gid_File_Registry_Spool_Oo_TypeDetection_Palm_Types_Xcu ); + Files = ( gid_File_Jar_Aportisdoc, gid_File_Share_Registry_Palm_Xcd ); Sortkey = "100"; Minimal = NO; Default = NO; @@ -96,7 +96,7 @@ Module gid_Module_Optional_Javafilter_Pocketpc_Pocket_Word MOD_NAME_DESC(MODULE_OPTIONAL_JAVAFILTER_POCKETPC_POCKET_WORD); ParentID = gid_Module_Optional_Javafilter_Pocketpc; Sortkey = "100"; - Files = ( gid_File_Lib_Xmergesync,gid_File_Jar_Pocketword,gid_File_Registry_Spool_Oo_TypeDetection_PocketWord_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_PocketWord_Filters_Xcu, gid_File_Tmp_Userinstall_Pocketpcword_Inf ); + Files = ( gid_File_Lib_Xmergesync,gid_File_Jar_Pocketword, gid_File_Share_Registry_Pocketword_Xcd, gid_File_Tmp_Userinstall_Pocketpcword_Inf ); Minimal = NO; Default = NO; Styles (en-US) = (); @@ -111,7 +111,7 @@ Module gid_Module_Optional_Javafilter_Pocketpc_Pocket_Excel MOD_NAME_DESC(MODULE_OPTIONAL_JAVAFILTER_POCKETPC_POCKET_EXCEL); ParentID = gid_Module_Optional_Javafilter_Pocketpc; Sortkey = "200"; - Files = ( gid_File_Lib_Xmergesync,gid_File_Jar_Pexcel,gid_File_Registry_Spool_Oo_TypeDetection_PocketExcel_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_PocketExcel_Filters_Xcu, gid_File_Tmp_Userinstall_Pocketpcexcel_Inf ); + Files = ( gid_File_Lib_Xmergesync,gid_File_Jar_Pexcel, gid_File_Share_Registry_Pocketexcel_Xcd, gid_File_Tmp_Userinstall_Pocketpcexcel_Inf ); Minimal = NO; Default = NO; Styles (en-US) = (); diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp index e42c801849c3..4da9f1a23bbc 100644 --- a/scp2/source/math/file_math.scp +++ b/scp2/source/math/file_math.scp @@ -43,11 +43,11 @@ STD_UNO_LIB_FILE( gid_File_Lib_Smd , smd) STD_RES_FILE( gid_File_Res_Sm, sm ) -File gid_File_Registry_Spool_Oo_Office_Embedding_Math_Xcu +File gid_File_Share_Registry_Math_Xcd TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Embedding; - Name = "/registry/spool/org/openoffice/Office/Embedding-math.xcu"; + Dir = gid_Dir_Share_Registry; + Name = "math.xcd"; End File gid_File_Help_Smath_Zip @@ -78,67 +78,3 @@ File gid_File_Share_Config_Sofficecfg_Math_Menubar_Xml Name = "/uiconfig/smath/menubar/menubar.xml"; End */ - -File gid_File_Oo_Office_Ui_Mathcommands_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/MathCommands.xcs"; -End - -File gid_File_Oo_Office_Ui_Mathcommands_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/MathCommands.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Math_UISort_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_UISort; - Name = "/registry/spool/org/openoffice/TypeDetection/UISort-math.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Math_Types_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_math_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Math_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_math_filters.xcu"; -End - -File gid_File_Registry_Spool_Oo_Common_Math_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common; - Name = "/registry/spool/org/openoffice/Office/Common-math.xcu"; -End - -File gid_File_Registry_Spool_Oo_Setup_Math_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Setup; - Name = "/registry/spool/org/openoffice/Setup-math.xcu"; -End - -File gid_File_Oo_Office_Ui_Mathwindowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/MathWindowState.xcs"; -End - -File gid_File_Oo_Office_Ui_Mathwindowstate_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/MathWindowState.xcu"; -End - diff --git a/scp2/source/math/module_math.scp b/scp2/source/math/module_math.scp index 4724c5791b4a..e9c084ba928d 100644 --- a/scp2/source/math/module_math.scp +++ b/scp2/source/math/module_math.scp @@ -43,10 +43,8 @@ Module gid_Module_Prg_Math_Bin Default = YES; Styles = (HIDDEN_ROOT); Files = (gid_File_Html_W3c_Ipr,gid_File_Lib_Sm,gid_File_Lib_Smd,gid_File_Extra_Urlmore_Math,gid_File_Extra_Urlnew_Math,gid_File_Extra_Urltasks_Math, - gid_File_Oo_Office_Ui_Mathcommands_Xcs,gid_File_Oo_Office_Ui_Mathcommands_Xcu,gid_File_Oo_Office_Ui_Mathwindowstate_Xcs - gid_File_Registry_Spool_Oo_Common_Math_Xcu, gid_File_Registry_Spool_Oo_Setup_Math_Xcu, - gid_File_Oo_Office_Ui_Mathwindowstate_Xcu, gid_File_Registry_Spool_Oo_Office_Embedding_Math_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Math_Types_Xcu,gid_File_Registry_Spool_Oo_TypeDetection_Math_Filters_Xcu, gid_File_Tmp_Userinstall_Math_Inf); + gid_File_Share_Registry_Math_Xcd, + gid_File_Tmp_Userinstall_Math_Inf); End // Module gid_Module_Prg_Math_Help diff --git a/scp2/source/math/registryitem_math.scp b/scp2/source/math/registryitem_math.scp index a1c71702fc42..b87e5b940356 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,18 +647,18 @@ 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 -// RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Mml -// ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; -// Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; -// ModuleID = gid_Module_Prg_Math_Bin; -// Name = ".mml"; -// Value = "opendocument.MathDocument.1"; -// Styles = (); -// End +RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Mml + ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; + Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; + ModuleID = gid_Module_Prg_Math_Bin; + Name = ".mml"; + Value = "soffice.StarMathDocument.6"; + Styles = (); +End RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Smath_Exe ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; 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/onlineupdate/file_onlineupdate.scp b/scp2/source/onlineupdate/file_onlineupdate.scp index 44cc9615a6e8..e33eb6fa35c7 100644 --- a/scp2/source/onlineupdate/file_onlineupdate.scp +++ b/scp2/source/onlineupdate/file_onlineupdate.scp @@ -29,18 +29,11 @@ SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Updchk , updchk.uno ) -File gid_File_Registry_Spool_Oo_Office_Addons_Onlineupdate_Xcu +File gid_File_Share_Registry_Onlineupdate_Xcd TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Addons; - Name = "/registry/spool/org/openoffice/Office/Addons/Addons-onlineupdate.xcu"; -End - -File gid_File_Registry_Spool_Oo_Office_Jobs_Onlineupdate_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Jobs; - Name = "/registry/spool/org/openoffice/Office/Jobs/Jobs-onlineupdate.xcu"; + Dir = gid_Dir_Share_Registry; + Name = "onlineupdate.xcd"; End #if defined LINUX || defined SOLARIS diff --git a/scp2/source/onlineupdate/module_onlineupdate.scp b/scp2/source/onlineupdate/module_onlineupdate.scp index af3d8eabfd6e..6685450774f2 100644 --- a/scp2/source/onlineupdate/module_onlineupdate.scp +++ b/scp2/source/onlineupdate/module_onlineupdate.scp @@ -34,6 +34,5 @@ Module gid_Module_Optional_Onlineupdate ParentID = gid_Module_Optional; Default = YES; Styles = (DONTSHOWINUSERINSTALL); - Files = (gid_File_Lib_Updchk, gid_File_Registry_Spool_Oo_Office_Addons_Onlineupdate_Xcu, gid_File_Registry_Spool_Oo_Office_Jobs_Onlineupdate_Xcu, gid_File_Bin_UnpackUpdate); - Dirs = (gid_Dir_Share_Registry_Modules_Oo_Office_Addons, gid_Dir_Share_Registry_Modules_Oo_Office_Jobs); + Files = (gid_File_Lib_Updchk, gid_File_Share_Registry_Onlineupdate_Xcd, gid_File_Bin_UnpackUpdate); End diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index ecf1b2adb051..f2f305181786 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -47,20 +47,6 @@ Module gid_Module_Root_Brand gid_Brand_Dir_Share_Uno_Packages, gid_Brand_Dir_Share_Uno_Packages_Cache, gid_Brand_Dir_Share_Registry, - gid_Brand_Dir_Share_Registry_Data, - gid_Brand_Dir_Share_Registry_Data_Org, - gid_Brand_Dir_Share_Registry_Data_Org_Openoffice, - gid_Brand_Dir_Share_Registry_Data_Org_Openoffice_Office, - gid_Brand_Dir_Share_Registry_Modules, - gid_Brand_Dir_Share_Registry_Modules_Org, - gid_Brand_Dir_Share_Registry_Modules_Oo, - gid_Brand_Dir_Share_Registry_Modules_Oo_Inet, - gid_Brand_Dir_Share_Registry_Modules_Oo_Office, - gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Common, - gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Jobs, - gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Ui, - gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Writer, - gid_Brand_Dir_Share_Registry_Modules_Oo_Setup, gid_Brand_Dir_Share_Xdg); Files = (gid_Brand_File_BasisLink, gid_Brand_File_Bin_Crashreport, @@ -97,12 +83,9 @@ Module gid_Module_Root_Brand gid_Brand_File_Msvcm80crt_Manifest, gid_Brand_File_Lib_Npsoplugin, gid_Brand_File_Lib_Subscrib_C05, - gid_Brand_File_Oo_Office_Compatibility_Xcu, - gid_Brand_File_Registry_Spool_Oo_Setup_Brand_Xcu, - gid_Brand_File_Registry_Spool_Oo_Office_Common_Brand_Xcu, - gid_Brand_File_Registry_Spool_Oo_Office_Ui_Brand_Xcu, + gid_Brand_File_Share_Registry_Brand_Xcd, + gid_Brand_File_Share_Registry_O5oo_Xcd gid_Brand_File_Script_Unopkg, - gid_Brand_File_Share_Registry_Modules_Oo_Office_Jobs_Registration, gid_Brand_File_Share_Xdg_Base, gid_Brand_File_Share_Xdg_Calc, gid_Brand_File_Share_Xdg_Draw, @@ -145,9 +128,8 @@ Module gid_Module_Langpack_Brand_Template gid_Brand_File_License_License_Html, gid_Brand_File_Readme_Readme, gid_Brand_File_Readme_Readme_Html, - gid_Brand_File_Registry_Spool_Oo_Office_Common_Cjk_Xcu, - gid_Brand_File_Registry_Spool_Oo_Office_Common_Korea_Xcu, - gid_Brand_File_Registry_Spool_Oo_Office_Writer_Cjk_Xcu, + gid_Brand_File_Share_Registry_Cjk_Xcd, + gid_Brand_File_Share_Registry_Korea_Xcd, gid_Brand_File_Txt_License, gid_Brand_File_Txt_License_Html, gid_Brand_File_Txt_Readme, @@ -250,71 +232,6 @@ Directory gid_Brand_Dir_Share_Registry DosName = "registry"; End -Directory gid_Brand_Dir_Share_Registry_Data - ParentID = gid_Brand_Dir_Share_Registry; - HostName = "data"; -End - -Directory gid_Brand_Dir_Share_Registry_Data_Org - ParentID = gid_Brand_Dir_Share_Registry_Data; - HostName = "org"; -End - -Directory gid_Brand_Dir_Share_Registry_Data_Org_Openoffice - ParentID = gid_Brand_Dir_Share_Registry_Data_Org; - HostName = "openoffice"; -End - -Directory gid_Brand_Dir_Share_Registry_Data_Org_Openoffice_Office - ParentID = gid_Brand_Dir_Share_Registry_Data_Org_Openoffice; - HostName = "Office"; -End - -Directory gid_Brand_Dir_Share_Registry_Modules - ParentID = gid_Brand_Dir_Share_Registry; - HostName = "modules"; -End - -Directory gid_Brand_Dir_Share_Registry_Modules_Org - ParentID = gid_Brand_Dir_Share_Registry_Modules; - HostName = "org"; -End - -Directory gid_Brand_Dir_Share_Registry_Modules_Oo - ParentID = gid_Brand_Dir_Share_Registry_Modules_Org; - HostName = "openoffice"; -End - -Directory gid_Brand_Dir_Share_Registry_Modules_Oo_Inet - ParentID = gid_Brand_Dir_Share_Registry_Modules_Oo; - HostName = "Inet"; -End - -Directory gid_Brand_Dir_Share_Registry_Modules_Oo_Office - ParentID = gid_Brand_Dir_Share_Registry_Modules_Oo; - HostName = "Office"; -End - -Directory gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Common - ParentID = gid_Brand_Dir_Share_Registry_Modules_Oo_Office; - HostName = "Common"; -End - -Directory gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Ui - ParentID = gid_Brand_Dir_Share_Registry_Modules_Oo_Office; - HostName = "UI"; -End - -Directory gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Writer - ParentID = gid_Brand_Dir_Share_Registry_Modules_Oo_Office; - HostName = "Writer"; -End - -Directory gid_Brand_Dir_Share_Registry_Modules_Oo_Setup - ParentID = gid_Brand_Dir_Share_Registry_Modules_Oo; - HostName = "Setup"; -End - #if defined UNX && ! defined MACOSX Directory gid_Brand_Dir_Share_Xdg ParentID = gid_Brand_Dir_Share; @@ -551,59 +468,28 @@ File gid_Brand_File_Images_Brand_Zip Styles = (PACKED); End -File gid_Brand_File_Oo_Office_Compatibility_Xcu +File gid_Brand_File_Share_Registry_Brand_Xcd TXT_FILE_BODY; Styles = (PACKED, SCPZIP_REPLACE); - Dir = gid_Brand_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/Compatibility.xcu"; + Dir = gid_Brand_Dir_Share_Registry; + Name = "brand.xcd"; End -File gid_Brand_File_Registry_Spool_Oo_Office_Common_Brand_Xcu - TXT_FILE_BODY; - Styles = (PACKED, SCPZIP_REPLACE); - Dir = gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Common; - Name = "/registry/spool/org/openoffice/Office/Common-brand.xcu"; -End - -File gid_Brand_File_Registry_Spool_Oo_Office_Common_Cjk_Xcu +File gid_Brand_File_Share_Registry_Cjk_Xcd TXT_FILE_BODY; Styles = (PACKED,MAKE_LANG_SPECIFIC); - Dir = gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Common; - Name (ja) = "/registry/spool/org/openoffice/Office/Common-cjk.xcu"; - Name (ko) = "/registry/spool/org/openoffice/Office/Common-cjk.xcu"; - Name (zh-CN) = "/registry/spool/org/openoffice/Office/Common-cjk.xcu"; - Name (zh-TW) = "/registry/spool/org/openoffice/Office/Common-cjk.xcu"; + Dir = gid_Brand_Dir_Share_Registry; + Name (ja) = "cjk.xcd"; + Name (ko) = "cjk.xcd"; + Name (zh-CN) = "cjk.xcd"; + Name (zh-TW) = "cjk.xcd"; End -File gid_Brand_File_Registry_Spool_Oo_Office_Common_Korea_Xcu +File gid_Brand_File_Share_Registry_Korea_Xcd TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Common; - Name (ko) = "/registry/spool/org/openoffice/Office/Common-korea.xcu"; -End - -File gid_Brand_File_Registry_Spool_Oo_Office_Ui_Brand_Xcu - TXT_FILE_BODY; - Styles = (PACKED, SCPZIP_REPLACE); - Dir = gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Ui; - Name = "/registry/spool/org/openoffice/Office/UI-brand.xcu"; -End - -File gid_Brand_File_Registry_Spool_Oo_Office_Writer_Cjk_Xcu - TXT_FILE_BODY; - Styles = (PACKED,MAKE_LANG_SPECIFIC); - Dir = gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Writer; - Name (ja) = "/registry/spool/org/openoffice/Office/Writer-cjk.xcu"; - Name (ko) = "/registry/spool/org/openoffice/Office/Writer-cjk.xcu"; - Name (zh-CN) = "/registry/spool/org/openoffice/Office/Writer-cjk.xcu"; - Name (zh-TW) = "/registry/spool/org/openoffice/Office/Writer-cjk.xcu"; -End - -File gid_Brand_File_Registry_Spool_Oo_Setup_Brand_Xcu - TXT_FILE_BODY; - Styles = (PACKED, SCPZIP_REPLACE); - Dir = gid_Brand_Dir_Share_Registry_Modules_Oo_Setup; - Name = "/registry/spool/org/openoffice/Setup-brand.xcu"; + Dir = gid_Brand_Dir_Share_Registry; + Name (ko) = "korea.xcd"; End #if defined UNX && ! defined MACOSX @@ -878,7 +764,6 @@ ProfileItem gid_Brand_Profileitem_Bootstrap_Userinstall #else Value = "$SYSUSERCONFIG/.%LCONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION"; #endif - StandaloneValue = "$ORIGIN/.."; End ProfileItem gid_Brand_Profileitem_Soffice_UreBootstrap @@ -934,6 +819,15 @@ ProfileItem gid_Brand_Profileitem_Soffice_ProgressFrameColor_So Value = "${PROGRESSFRAMECOLOR}"; End +ProfileItem gid_Brand_Profileitem_Soffice_NativeProgress_So + ProfileID = gid_Brand_Profile_Soffice_Ini; + ModuleID = gid_Module_Root_Brand; + Section = "Bootstrap"; + Order = 6; + Key = "NativeProgress"; + Value = "${NATIVEPROGRESS}"; +End + #ifdef WNT ProfileItem gid_Brand_Profileitem_Soffice_Hideeula ProfileID = gid_Brand_Profile_Soffice_Ini; @@ -948,6 +842,20 @@ ProfileItem gid_Brand_Profileitem_Soffice_Hideeula End #endif +#ifdef WNT +ProfileItem gid_Brand_Profileitem_Soffice_Startlang + ProfileID = gid_Brand_Profile_Soffice_Ini; + ModuleID = gid_Module_Root_Brand; + Section = "Bootstrap"; + Order = 8; + Key = "STARTLANG"; + Value = "[STARTLANG]"; + Inifiletablekey = "STARTLANG"; + Inifiletableaction = "1"; + Styles = (INIFILETABLE); +End +#endif + ProfileItem gid_Brand_Profileitem_Version_Buildid ProfileID = gid_Brand_Profile_Version_Ini; ModuleID = gid_Module_Root_Brand; @@ -1328,22 +1236,6 @@ ProfileItem gid_Brand_Profileitem_Setup_Install End #endif -#ifdef ENABLE_SVCTAGS - -Directory gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Jobs - ParentID = gid_Brand_Dir_Share_Registry_Modules_Oo_Office; - HostName = "Jobs"; -End - -File gid_Brand_File_Share_Registry_Modules_Oo_Office_Jobs_Registration - TXT_FILE_BODY; - Styles = (PACKED, SCPZIP_REPLACE); - Dir = gid_Brand_Dir_Share_Registry_Modules_Oo_Office_Jobs; - Name = "/registry/spool/org/openoffice/Office/Jobs/Jobs-registration.xcu"; -End - -#endif - //TODO: This actually belongs into a module of its own: #if !defined SYSTEM_PYTHON File gid_Brand_File_Bin_Python diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp index b153f3bbf353..cc805f9e8288 100644 --- a/scp2/source/ooo/directory_ooo.scp +++ b/scp2/source/ooo/directory_ooo.scp @@ -174,56 +174,6 @@ Directory gid_Dir_User DosName = "presets"; End -Directory gid_Dir_User_Registry - ParentID = gid_Dir_User; - DosName = "registry"; -End - -Directory gid_Dir_User_Registry_Data - ParentID = gid_Dir_User_Registry; - DosName = "data"; -End - -Directory gid_Dir_User_Registry_Data_Org - ParentID = gid_Dir_User_Registry_Data; - DosName = "org"; -End - -Directory gid_Dir_User_Registry_Data_Org_Openoffice - ParentID = gid_Dir_User_Registry_Data_Org; - DosName = "openoffice"; -End - -Directory gid_Dir_User_Registry_Data_Org_Openoffice_Office - ParentID = gid_Dir_User_Registry_Data_Org_Openoffice; - DosName = "Office"; -End - -Directory gid_Dir_User_Registry_Data_Org_Openoffice_Office_Ui - ParentID = gid_Dir_User_Registry_Data_Org_Openoffice_Office; - DosName = "UI"; -End - -Directory gid_Dir_User_Registry_Data_Org_Openoffice_Office_Dataaccess - ParentID = gid_Dir_User_Registry_Data_Org_Openoffice_Office; - HostName = "DataAccess"; -End - -Directory gid_Dir_User_Registry_Data_Org_Openoffice_Office_OOoImprovement - ParentID = gid_Dir_User_Registry_Data_Org_Openoffice_Office; - DosName = "OOoImprovement"; -End - -Directory gid_Dir_User_Registry_Data_Org_Openoffice_Ucb - ParentID = gid_Dir_User_Registry_Data_Org_Openoffice; - DosName = "ucb"; -End - -Directory gid_Dir_User_Registry_Cache - ParentID = gid_Dir_User_Registry; - DosName = "cache"; -End - Directory gid_Dir_User_Xslt ParentID = gid_Dir_User; DosName = "xslt"; @@ -724,256 +674,11 @@ Directory gid_Dir_Share_Registry DosName = "registry"; End -Directory gid_Dir_Share_Registry_Schema - ParentID = gid_Dir_Share_Registry; - HostName = "schema"; -End - -Directory gid_Dir_Share_Registry_Schema_Org - ParentID = gid_Dir_Share_Registry_Schema; - HostName = "org"; -End - -Directory gid_Dir_Share_Registry_Schema_Org_Openoffice - ParentID = gid_Dir_Share_Registry_Schema_Org; - HostName = "openoffice"; -End - -Directory gid_Dir_Share_Registry_Schema_Org_Openoffice_Office - ParentID = gid_Dir_Share_Registry_Schema_Org_Openoffice; - HostName = "Office"; -End - -Directory gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui - ParentID = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - HostName = "UI"; -End - -Directory gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Dataaccess - ParentID = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - HostName = "DataAccess"; -End - -Directory gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_OOoImprovement - ParentID = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - HostName = "OOoImprovement"; -End - -Directory gid_Dir_Share_Registry_Schema_Org_Openoffice_Ucb - ParentID = gid_Dir_Share_Registry_Schema_Org_Openoffice; - HostName = "ucb"; -End - -Directory gid_Dir_Share_Registry_Schema_Org_Openoffice_Typedetection - ParentID = gid_Dir_Share_Registry_Schema_Org_Openoffice; - HostName = "TypeDetection"; -End - -Directory gid_Dir_Share_Registry_Ldap - ParentID = gid_Dir_Share_Registry; - HostName = "ldap"; -End - -Directory gid_Dir_Share_Registry_Data - ParentID = gid_Dir_Share_Registry; - HostName = "data"; -End - -Directory gid_Dir_Share_Registry_Data_Org - ParentID = gid_Dir_Share_Registry_Data; - HostName = "org"; -End - -Directory gid_Dir_Share_Registry_Data_Org_Openoffice - ParentID = gid_Dir_Share_Registry_Data_Org; - HostName = "openoffice"; -End - -Directory gid_Dir_Share_Registry_Data_Org_Openoffice_Office - ParentID = gid_Dir_Share_Registry_Data_Org_Openoffice; - HostName = "Office"; -End - -Directory gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui - ParentID = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - HostName = "UI"; -End - -Directory gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Dataaccess - ParentID = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - HostName = "DataAccess"; -End - -Directory gid_Dir_Share_Registry_Data_Org_Openoffice_Ucb - ParentID = gid_Dir_Share_Registry_Data_Org_Openoffice; - HostName = "ucb"; -End - -Directory gid_Dir_Share_Registry_Data_Org_Openoffice_Typedetection - ParentID = gid_Dir_Share_Registry_Data_Org_Openoffice; - HostName = "TypeDetection"; -End - Directory gid_Dir_Share_Registry_Res ParentID = gid_Dir_Share_Registry; HostName = "res"; End -Directory gid_Dir_Share_Registry_Res_Lang - ParentID = gid_Dir_Share_Registry_Res; - DIR_ISOLANGUAGE_ALL_LANG_2; -End - -Directory gid_Dir_Share_Registry_Res_Lang_Org - ParentID = gid_Dir_Share_Registry_Res_Lang; - HostName = "org"; -End - -Directory gid_Dir_Share_Registry_Res_Lang_Org_Openoffice - ParentID = gid_Dir_Share_Registry_Res_Lang_Org; - HostName = "openoffice"; -End - -Directory gid_Dir_Share_Registry_Res_Lang_Org_Openoffice_Office - ParentID = gid_Dir_Share_Registry_Res_Lang_Org_Openoffice; - HostName = "Office"; -End - -Directory gid_Dir_Share_Registry_Res_Lang_Org_Openoffice_Ucb - ParentID = gid_Dir_Share_Registry_Res_Lang_Org_Openoffice; - HostName = "ucb"; -End - -Directory gid_Dir_Share_Registry_Modules - ParentID = gid_Dir_Share_Registry; - HostName = "modules"; -End - -Directory gid_Dir_Share_Registry_Modules_Org - ParentID = gid_Dir_Share_Registry_Modules; - HostName = "org"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo - ParentID = gid_Dir_Share_Registry_Modules_Org; - HostName = "openoffice"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_Office - ParentID = gid_Dir_Share_Registry_Modules_Oo; - HostName = "Office"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_TypeDetection - ParentID = gid_Dir_Share_Registry_Modules_Oo; - HostName = "TypeDetection"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_TypeDetection_UISort - ParentID = gid_Dir_Share_Registry_Modules_Oo_TypeDetection; - HostName = "UISort"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_Ucb - ParentID = gid_Dir_Share_Registry_Modules_Oo; - HostName = "ucb"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_Ucb_Configuration - ParentID = gid_Dir_Share_Registry_Modules_Oo_Ucb; - HostName = "Configuration"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_Setup - ParentID = gid_Dir_Share_Registry_Modules_Oo; - HostName = "Setup"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_Office_Accelerators - ParentID = gid_Dir_Share_Registry_Modules_Oo_Office; - HostName = "Accelerators"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_Office_Paths - ParentID = gid_Dir_Share_Registry_Modules_Oo_Office; - HostName = "Paths"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_Office_Common - ParentID = gid_Dir_Share_Registry_Modules_Oo_Office; - HostName = "Common"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_Office_Writer - ParentID = gid_Dir_Share_Registry_Modules_Oo_Office; - HostName = "Writer"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_Office_Impress - ParentID = gid_Dir_Share_Registry_Modules_Oo_Office; - HostName = "Impress"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_Office_Linguistic - ParentID = gid_Dir_Share_Registry_Modules_Oo_Office; - HostName = "Linguistic"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_Office_Logging - ParentID = gid_Dir_Share_Registry_Modules_Oo_Office; - HostName = "Logging"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_Office_Embedding - ParentID = gid_Dir_Share_Registry_Modules_Oo_Office; - HostName = "Embedding"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_Office_Scripting - ParentID = gid_Dir_Share_Registry_Modules_Oo_Office; - HostName = "Scripting"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_Office_Addons - ParentID = gid_Dir_Share_Registry_Modules_Oo_Office; - HostName = "Addons"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_Office_Jobs - ParentID = gid_Dir_Share_Registry_Modules_Oo_Office; - HostName = "Jobs"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter - ParentID = gid_Dir_Share_Registry_Modules_Oo_TypeDetection; - HostName = "Filter"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_TypeDetection_GraphicFilter - ParentID = gid_Dir_Share_Registry_Modules_Oo_TypeDetection; - HostName = "GraphicFilter"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types - ParentID = gid_Dir_Share_Registry_Modules_Oo_TypeDetection; - HostName = "Types"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Misc - ParentID = gid_Dir_Share_Registry_Modules_Oo_TypeDetection; - HostName = "Misc"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess - ParentID = gid_Dir_Share_Registry_Modules_Oo_Office; - HostName = "DataAccess"; -End - -Directory gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers - ParentID = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess; - HostName = "Drivers"; -End - Directory gid_Dir_Autotext ParentID = gid_Dir_Share; DosName = "autotext"; diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp index 2a5905b27d00..dbea12eee10c 100644 --- a/scp2/source/ooo/file_extra_ooo.scp +++ b/scp2/source/ooo/file_extra_ooo.scp @@ -38,7 +38,7 @@ File gid_File_Extra_Autotextshare_Lang Dir = gid_Dir_Autotext_Language; USER_FILE_BODY; Styles = (ARCHIVE, DONT_OVERWRITE); - EXTRA_ALL_LANG(autotextshare); + EXTRA_ALL_LANG(autotextshare,zip); End File gid_File_Extra_Autotextuser @@ -305,7 +305,7 @@ File gid_File_Extra_Palettes_Lang Dir = gid_Dir_User_Config; USER_FILE_BODY; Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE); - EXTRA_ALL_LANG(palettes); + EXTRA_ALL_LANG(palettes,zip); End File gid_File_Extra_Poll_Asp @@ -354,14 +354,14 @@ File gid_File_Extra_Tpllayoutimpr_Lang Dir = gid_Dir_Template_Layout; TXT_FILE_BODY; Styles = (ARCHIVE, DONT_OVERWRITE); - EXTRA_ALL_LANG(tpllayoutimpr); + EXTRA_ALL_LANG(tpllayoutimpr,zip); End File gid_File_Extra_Tplpresntimpr_Lang Dir = gid_Dir_Template_Presnt; TXT_FILE_BODY; Styles = (ARCHIVE, DONT_OVERWRITE); - EXTRA_ALL_LANG(tplpresntimpr); + EXTRA_ALL_LANG(tplpresntimpr,zip); End File gid_File_Extra_Tplwizbitmap @@ -375,7 +375,7 @@ File gid_File_Extra_Tplwizdesktop_Lang Dir = gid_Dir_Template_Internal; TXT_FILE_BODY; Styles = (ARCHIVE, DONT_OVERWRITE); - EXTRA_ALL_LANG(tplwizdesktop); + EXTRA_ALL_LANG(tplwizdesktop,zip); End File gid_File_Extra_Tplwizletter @@ -387,35 +387,35 @@ End File gid_File_Extra_Tplwizletter_Lang Dir = gid_Dir_Template_Wizard_Letter; ARCHIVE_TXT_FILE_BODY; - EXTRA_ALL_LANG(tplwizletter); + EXTRA_ALL_LANG(tplwizletter,zip); End File gid_File_Extra_Tplwizfax_Lang Dir = gid_Dir_Template_Wizard_Fax; TXT_FILE_BODY; Styles = (ARCHIVE, DONT_OVERWRITE); - EXTRA_ALL_LANG(tplwizfax); + EXTRA_ALL_LANG(tplwizfax,zip); End File gid_File_Extra_Tplwizagenda_Lang Dir = gid_Dir_Template_Wizard_Agenda; TXT_FILE_BODY; Styles = (ARCHIVE, DONT_OVERWRITE); - EXTRA_ALL_LANG(tplwizagenda); + EXTRA_ALL_LANG(tplwizagenda,zip); End File gid_File_Extra_Tplwizreport_Lang Dir = gid_Dir_Template_Wizard_Report; TXT_FILE_BODY; Styles = (ARCHIVE, DONT_OVERWRITE); - EXTRA_ALL_LANG(tplwizreport); + EXTRA_ALL_LANG(tplwizreport,zip); End File gid_File_Extra_Tplwizstyles_Lang Dir = gid_Dir_Template_Wizard_Styles; TXT_FILE_BODY; Styles = (ARCHIVE, DONT_OVERWRITE); - EXTRA_ALL_LANG(tplwizstyles); + EXTRA_ALL_LANG(tplwizstyles,zip); End File gid_File_Extra_Webcast_Asp @@ -441,5 +441,5 @@ File gid_File_Extra_Wordbook_Lang Dir = gid_Dir_Wordbook_Language; TXT_FILE_BODY; Styles = (ARCHIVE, DONT_OVERWRITE); - EXTRA_ALL_LANG(wordbook); + EXTRA_ALL_LANG(wordbook,zip); End diff --git a/scp2/source/ooo/file_improvement.scp b/scp2/source/ooo/file_improvement.scp index 8dbd452f361d..224d26de6a0d 100644 --- a/scp2/source/ooo/file_improvement.scp +++ b/scp2/source/ooo/file_improvement.scp @@ -28,20 +28,11 @@ #include "macros.inc" #if defined(BUILD_SPECIAL) -File gid_File_Share_Registry_Modules_Oo_Office_Logging_Improvement +File gid_File_Share_Registry_Oooimprovement_Xcd TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Logging; - Name = "/registry/spool/org/openoffice/Office/Logging/Logging-oooimprovement.xcu"; -End -#endif - -#if defined(BUILD_SPECIAL) -File gid_File_Share_Registry_Modules_Oo_Office_Jobs_Improvement - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Jobs; - Name = "/registry/spool/org/openoffice/Office/Jobs/Jobs-oooimprovement.xcu"; + Dir = gid_Dir_Share_Registry; + Name = "oooimprovement.xcd"; End #endif diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 9b0da10d5238..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 @@ -36,22 +36,10 @@ End #endif #if ((defined(WNT)) || (defined(LINUX)) || ((defined(SOLARIS)) && (defined(SPARC)))|| defined(NETBSD) ) STD_UNO_LIB_FILE( gid_File_Lib_Adabas, adabas) -File gid_File_Oo_Office_Dataaccess_Adabas_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers; - Name = "/registry/spool/DataAccess/adabas.xcu"; -End #endif #if defined(WNT) STD_UNO_LIB_FILE( gid_File_Lib_Ado, ado) -File gid_File_Oo_Office_Dataaccess_Ado_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers; - Name = "/registry/spool/DataAccess/ado.xcu"; -End #endif STD_UNO_LIB_FILE( gid_File_Lib_Basctl, basctl) @@ -96,41 +84,7 @@ File gid_File_Lib_Cached1 #endif End -File gid_File_Lib_Configmgr2 - TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; - Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX - Name = STRING(CONCAT2(configmgr2.uno,UNXSUFFIX)); - #else - Name = "configmgr2.uno.dll"; - #endif -End - -File gid_File_Lib_Sysmgr1 - TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; - Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX - Name = STRING(CONCAT2(sysmgr1.uno,UNXSUFFIX)); - #else - Name = "sysmgr1.uno.dll"; - #endif -End - -File gid_File_Lib_Behelper - TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; - Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX - Name = STRING(CONCAT2(behelper.uno,UNXSUFFIX)); - #else - Name = "behelper.uno.dll"; - #endif -End +SPECIAL_UNO_LIB_FILE(gid_File_Lib_Configmgr, configmgr) #ifdef WITH_LDAP File gid_File_Lib_Ldapbe2 @@ -290,12 +244,6 @@ STD_UNO_LIB_FILE( gid_File_Lib_Dbmm, dbmm) STD_UNO_LIB_FILE( gid_File_Lib_Dbacfg, dbacfg) STD_UNO_LIB_FILE( gid_File_Lib_Dbase2, dbase ) -File gid_File_Oo_Office_Dataaccess_Dbase_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers; - Name = "/registry/spool/DataAccess/dbase.xcu"; -End STD_LIB_FILE( gid_File_Lib_Dbfile , file) STD_LIB_FILE( gid_File_Lib_Odbcbase,odbcbase) @@ -498,12 +446,6 @@ End #ifdef UNX #ifdef ENABLE_KAB -File gid_File_Oo_Office_Dataaccess_Kab_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers; - Name = "/registry/spool/DataAccess/kab.xcu"; -End File gid_File_Lib_Kab_1 TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT); @@ -522,12 +464,6 @@ End #endif #ifdef MACOSX -File gid_File_Oo_Office_Dataaccess_Macab_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers; - Name = "/registry/spool/DataAccess/macab.xcu"; -End File gid_File_Lib_Macab_1 TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT); @@ -546,12 +482,6 @@ End #endif // #ifdef ENABLE_KAB #ifdef ENABLE_EVOAB2 -File gid_File_Oo_Office_Dataaccess_Evoab2_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers; - Name = "/registry/spool/DataAccess/evoab2.xcu"; -End STD_UNO_LIB_FILE( gid_File_Lib_Evoab , evoab) @@ -581,12 +511,6 @@ File gid_File_Lib_Filterconfig1 Name = SPECIAL_NAME(filterconfig1); End -File gid_File_Oo_Office_Dataaccess_Flat_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers; - Name = "/registry/spool/DataAccess/flat.xcu"; -End STD_UNO_LIB_FILE( gid_File_Lib_Flat, flat) #ifdef WNT @@ -729,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 @@ -753,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 @@ -859,22 +783,10 @@ End #ifdef SOLAR_JAVA STD_UNO_LIB_FILE( gid_File_Lib_Jdbc, jdbc) -File gid_File_Oo_Office_Dataaccess_Jdbc_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers; - Name = "/registry/spool/DataAccess/jdbc.xcu"; -End #endif #ifdef SOLAR_JAVA -File gid_File_Oo_Office_Dataaccess_Hsqldb_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers; - Name = "/registry/spool/DataAccess/hsqldb.xcu"; -End File gid_File_Lib_Hsqldb_2 TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT); @@ -1004,17 +916,6 @@ End #if !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA) && !defined(MACOSX) // #i91209# -File gid_File_Oo_Office_Dataaccess_Mozab_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers; -#ifdef WNT - Name = "/registry/spool/DataAccess/mozab.xcu"; -#else - Name = "/registry/spool/DataAccess/mozab2.xcu"; -#endif -End - STD_UNO_LIB_FILE(gid_File_Lib_Mozab,mozab) STD_LIB_FILE(gid_File_Lib_Mozabdrv,mozabdrv) @@ -1148,25 +1049,7 @@ End #endif STD_UNO_LIB_FILE(gid_File_Lib_Mysql,mysql) -File gid_File_Oo_Office_Dataaccess_Mysql_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers; - Name = "/registry/spool/DataAccess/mysql.xcu"; -End STD_UNO_LIB_FILE(gid_File_Lib_Odbc,odbc) -File gid_File_Oo_Office_Dataaccess_Odbc_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_DataAccess_Drivers; - Name = "/registry/spool/DataAccess/odbc.xcu"; -End - -File gid_File_Registry_Drivers_Zip - Dir = gid_Dir_Share_Registry_Res_Lang; - ARCHIVE_TXT_FILE_BODY; - EXTRA_ALL_LANG(fcfg_drivers); -End // STD_LIB_FILE( gid_File_Lib_Ofa , ofa) @@ -1442,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 @@ -1498,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) @@ -1507,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 @@ -1654,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 @@ -1815,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 @@ -1826,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 d2277ad48b9f..19a15f7fcc11 100644..100755 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -1144,969 +1144,36 @@ End #endif -File gid_File_Oo_Inet_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice; - Name = "/registry/schema/org/openoffice/Inet.xcs"; -End - -File gid_File_Oo_Inet_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice; - Name = "/registry/data/org/openoffice/Inet.xcu"; -End - -File gid_File_Oo_Office_Addons_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Addons.xcs"; -End - -File gid_File_Oo_Office_Ui_Basicidecommands_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/BasicIDECommands.xcs"; -End - -File gid_File_Oo_Office_Ui_Basicidecommands_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu"; -End - -File gid_File_Oo_Office_Ui_Windowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/WindowState.xcs"; -End - -File gid_File_Oo_Office_Ui_Basicidewindowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/BasicIDEWindowState.xcs"; -End - -File gid_File_Oo_Office_Ui_Basicidewindowstate_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu"; -End - -File gid_File_Oo_Office_Ui_Bibliographycommands_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/BibliographyCommands.xcs"; -End - -File gid_File_Oo_Office_Ui_Bibliographycommands_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/BibliographyCommands.xcu"; -End - -File gid_File_Oo_Office_Ui_Bibliographywindowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/BibliographyWindowState.xcs"; -End - -/* -File gid_File_Oo_Office_Ui_Bibliographywindowstate_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/BibliographyWindowState.xcu"; -End -*/ -File gid_File_Oo_Office_Calc_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Calc.xcs"; -End - -File gid_File_Oo_Office_Calc_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/Calc.xcu"; -End - -File gid_File_Oo_Office_CalcAddIns_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/CalcAddIns.xcs"; -End - -File gid_File_Oo_Office_Chart_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Chart.xcs"; -End - -File gid_File_Oo_Office_Ui_Chartcommands_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/ChartCommands.xcs"; -End - -File gid_File_Oo_Office_Ui_Chartcommands_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/ChartCommands.xcu"; -End - -File gid_File_Oo_Office_Ui_Chartwindowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/ChartWindowState.xcs"; -End - -File gid_File_Oo_Office_Ui_Chartwindowstate_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/ChartWindowState.xcu"; -End - -File gid_File_Oo_Office_Commands_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Commands.xcs"; -End - -File gid_File_Oo_Office_Ui_Commands_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/Commands.xcs"; -End - -File gid_File_Oo_Office_Ui_Category_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/Category.xcs"; -End - -File gid_File_Oo_Office_Ui_Drawimpresscommands_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/DrawImpressCommands.xcs"; -End - -File gid_File_Oo_Office_Ui_Drawimpresscommands_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu"; -End - -File gid_File_Oo_Office_Ui_Genericcategories_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/GenericCategories.xcs"; -End - -File gid_File_Oo_Office_Ui_Genericcategories_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/GenericCategories.xcu"; -End - -File gid_File_Oo_Office_Common_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Common.xcs"; -End - -File gid_File_Oo_Office_Histories_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Histories.xcs"; -End - -File gid_File_Oo_Office_Ui_WindowContentFactories_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/WindowContentFactories.xcs"; -End - -File gid_File_Oo_Office_Extendedcolorscheme_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/ExtendedColorScheme.xcs"; -End - -File gid_File_Oo_Office_Paths_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Paths.xcs"; -End - -File gid_File_Oo_Office_Logging_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Logging.xcs"; -End - -File gid_File_Oo_Office_OOoImprovement_Settings_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_OOoImprovement; - Name = "/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs"; -End - -File gid_File_Oo_Office_OptionsDialog_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/OptionsDialog.xcs"; -End - -File gid_File_Oo_Office_Recovery_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Recovery.xcs"; -End - -File gid_File_Oo_Office_Histories_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/Histories.xcu"; -End - -File gid_File_Oo_Office_Common_Xcu - TXT_FILE_BODY; - Styles = (PACKED,SCPZIP_REPLACE); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/Common.xcu"; -End - -File gid_File_Oo_Office_Accelerators_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Accelerators.xcs"; -End - -File gid_File_Oo_Office_Accelerators_Xcu +File gid_File_Share_Registry_Main_Xcd TXT_FILE_BODY; Styles = (PACKED, SCPZIP_REPLACE); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/Accelerators.xcu"; -End - -File gid_File_Oo_Office_Paths_Xcu - TXT_FILE_BODY; - Styles = (PACKED, SCPZIP_REPLACE); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/Paths.xcu"; -End - -File gid_File_Oo_Office_Logging_Xcu - TXT_FILE_BODY; - Styles = (PACKED, SCPZIP_REPLACE); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/Logging.xcu"; -End - -File gid_File_Oo_Office_Views_Xcu - TXT_FILE_BODY; - Styles = (PACKED, SCPZIP_REPLACE); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/Views.xcu"; -End - -File gid_File_Oo_Office_Compatibility_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Compatibility.xcs"; -End - -File gid_File_Oo_Office_Ui_Controller_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/Controller.xcs"; -End - -File gid_File_Oo_Office_Ui_Controller_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/Controller.xcu"; -End - -File gid_File_Oo_Office_Dataaccess_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/DataAccess.xcs"; -End - -File gid_File_Oo_Office_Dataaccess_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/DataAccess.xcu"; -End - -File gid_File_Oo_Office_Dataaccess_Drivers_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Dataaccess; - Name = "/registry/schema/org/openoffice/Office/DataAccess/Drivers.xcs"; -End - -File gid_File_Oo_Office_Ui_Dbucommands_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/DbuCommands.xcs"; -End - -File gid_File_Oo_Office_Ui_Dbucommands_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/DbuCommands.xcu"; -End - -File gid_File_Oo_Office_Ui_Basewindowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/BaseWindowState.xcs"; -End - -File gid_File_Oo_Office_Ui_Basewindowstate_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/BaseWindowState.xcu"; -End - -File gid_File_Oo_Office_Ui_Dbtablewindowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/DbTableWindowState.xcs"; -End - -File gid_File_Oo_Office_Ui_Dbtablewindowstate_xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/DbTableWindowState.xcu"; -End - -File gid_File_Oo_Office_Ui_Dbbrowserwindowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/DbBrowserWindowState.xcs"; -End - -File gid_File_Oo_Office_Ui_Dbbrowserwindowstate_xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/DbBrowserWindowState.xcu"; -End - - -File gid_File_Oo_Office_Ui_Dbtabledatawindowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/DbTableDataWindowState.xcs"; -End - -File gid_File_Oo_Office_Ui_Dbtabledatawindowstate_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/DbTableDataWindowState.xcu"; -End - - -File gid_File_Oo_Office_Ui_Dbquerywindowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/DbQueryWindowState.xcs"; -End - -File gid_File_Oo_Office_Ui_Dbquerywindowstate_xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/DbQueryWindowState.xcu"; -End - -File gid_File_Oo_Office_Ui_Dbrelationwindowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/DbRelationWindowState.xcs"; -End - -File gid_File_Oo_Office_Ui_Dbrelationwindowstate_xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/DbRelationWindowState.xcu"; -End - -File gid_File_Oo_Office_Draw_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Draw.xcs"; -End - -File gid_File_Oo_Office_Events_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Events.xcs"; -End - -File gid_File_Oo_Office_ExtensionManager_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/ExtensionManager.xcs"; -End - -File gid_File_Oo_Office_ExtensionManager_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/ExtensionManager.xcu"; -End - -File gid_File_Oo_Office_Ui_Factories_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/Factories.xcs"; -End - -File gid_File_Oo_Office_Ui_Factories_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/Factories.xcu"; -End - -File gid_File_Oo_Office_Embedding_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/Embedding.xcu"; -End - -File gid_File_Registry_Spool_Oo_Office_Embedding_Chart_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Embedding; - Name = "/registry/spool/org/openoffice/Office/Embedding-chart.xcu"; -End - -File gid_File_Oo_Office_Ui_Genericcommands_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/GenericCommands.xcs"; -End - -File gid_File_Oo_Office_Ui_Genericcommands_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/GenericCommands.xcu"; -End - -File gid_File_Oo_Office_Ui_GlobalSettings_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/GlobalSettings.xcs"; -End - -File gid_File_Oo_Office_Impress_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Impress.xcs"; -End - -File gid_File_Oo_Office_Impress_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/Impress.xcu"; -End - -File gid_File_Oo_Office_Java_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Java.xcs"; -End - -File gid_File_Oo_Office_Jobs_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Jobs.xcs"; -End - -File gid_File_Oo_Office_Jobs_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/Jobs.xcu"; -End - -File gid_File_Oo_Office_Labels_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Labels.xcs"; -End - -File gid_File_Oo_Office_Labels_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/Labels.xcu"; -End - -File gid_File_Oo_Office_Linguistic_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Linguistic.xcs"; -End - -File gid_File_Oo_Office_Math_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Math.xcs"; -End - -File gid_File_Oo_Office_Math_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/Math.xcu"; -End - -File gid_File_Oo_Office_TabBrowse_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/TabBrowse.xcs"; -End - -File gid_File_Oo_Office_Protocolhandler_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/ProtocolHandler.xcs"; -End - -File gid_File_Oo_Office_Protocolhandler_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/ProtocolHandler.xcu"; -End - -File gid_File_Oo_Office_Scripting_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Scripting.xcs"; + Dir = gid_Dir_Share_Registry; + Name = "main.xcd"; End -File gid_File_Oo_Office_Scripting_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/Scripting.xcu"; -End - -File gid_File_Oo_Office_Security_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Security.xcs"; -End - -File gid_File_Oo_Office_Security_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/Security.xcu"; -End - -File gid_File_Oo_Office_Sfx_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/SFX.xcs"; -End - -File gid_File_Oo_Office_Sfx_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/SFX.xcu"; -End - -File gid_File_Oo_Office_Ui_Startmodulecommands_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/StartModuleCommands.xcs"; -End - -File gid_File_Oo_Office_Ui_Startmodulecommands_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/StartModuleCommands.xcu"; -End - -File gid_File_Oo_Office_Ui_Startmodulewindowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/StartModuleWindowState.xcs"; -End - -File gid_File_Oo_Office_Ui_Startmodulewindowstate_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/StartModuleWindowState.xcu"; -End - -File gid_File_Oo_Office_Substitution_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Substitution.xcs"; -End - -File gid_File_Oo_Office_Ui_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/UI.xcs"; -End - -File gid_File_Oo_Office_Ui_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/UI.xcu"; -End - -File gid_File_Oo_Office_Views_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Views.xcs"; -End - -File gid_File_Oo_Office_Writer_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Writer.xcs"; -End - -File gid_File_Oo_Office_Writer_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/Writer.xcu"; -End - -File gid_File_Oo_Office_WebWizard_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/WebWizard.xcs"; -End - -File gid_File_Oo_Office_WebWizard_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/WebWizard.xcu"; -End - -File gid_File_Oo_Office_FormWizard_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/FormWizard.xcs"; -End - -File gid_File_Oo_Office_FormWizard_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/FormWizard.xcu"; -End - - -File gid_File_Oo_Office_TableWizard_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/TableWizard.xcs"; -End - -File gid_File_Oo_Office_TableWizard_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office; - Name = "/registry/data/org/openoffice/Office/TableWizard.xcu"; -End - - -File gid_File_Oo_Office_Writerweb_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/WriterWeb.xcs"; -End - -File gid_File_Oo_Office_TypeDetection_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/TypeDetection.xcs"; -End - -File gid_File_Oo_Office_Embedding_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office; - Name = "/registry/schema/org/openoffice/Office/Embedding.xcs"; -End - -File gid_File_Oo_Setup_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice; - Name = "/registry/schema/org/openoffice/Setup.xcs"; -End - -File gid_File_Oo_Setup_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice; - Name = "/registry/data/org/openoffice/Setup.xcu"; -End - -File gid_File_Oo_Setup_Start_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Setup; - Name = "/registry/spool/org/openoffice/Setup-start.xcu"; -End - -File gid_File_Oo_Firststartwizard_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice; - Name = "/registry/schema/org/openoffice/FirstStartWizard.xcs"; -End - -File gid_File_Oo_Firststartwizard_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice; - Name = "/registry/data/org/openoffice/FirstStartWizard.xcu"; -End - -File gid_File_Oo_System_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice; - Name = "/registry/schema/org/openoffice/System.xcs"; -End - -File gid_File_Oo_Typedetection_Filter_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Typedetection; - Name = "/registry/schema/org/openoffice/TypeDetection/Filter.xcs"; -End - -File gid_File_Oo_Typedetection_Graphicfilter_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Typedetection; - Name = "/registry/schema/org/openoffice/TypeDetection/GraphicFilter.xcs"; -End - -File gid_File_Oo_Typedetection_Misc_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Typedetection; - Name = "/registry/schema/org/openoffice/TypeDetection/Misc.xcs"; -End - -File gid_File_Oo_Typedetection_Types_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Typedetection; - Name = "/registry/schema/org/openoffice/TypeDetection/Types.xcs"; -End - -File gid_File_Oo_Typedetection_UISort_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Typedetection; - Name = "/registry/schema/org/openoffice/TypeDetection/UISort.xcs"; -End - -File gid_File_Oo_TypeDetection_UISort_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Typedetection; - Name = "/registry/data/org/openoffice/TypeDetection/UISort.xcu"; -End - -File gid_File_Oo_Ucb_Configuration_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Ucb; - Name = "/registry/schema/org/openoffice/ucb/Configuration.xcs"; -End - -File gid_File_Oo_Ucb_InteractionHandler_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Ucb; - Name = "/registry/schema/org/openoffice/ucb/InteractionHandler.xcs"; -End - -File gid_File_Oo_Ucb_Configuration_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Ucb; - Name = "/registry/data/org/openoffice/ucb/Configuration.xcu"; -End - -File gid_File_Oo_Ucb_Hierarchy_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Ucb; - Name = "/registry/schema/org/openoffice/ucb/Hierarchy.xcs"; -End - -File gid_File_Oo_Ucb_Store_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Ucb; - Name = "/registry/schema/org/openoffice/ucb/Store.xcs"; -End - -File gid_File_Oo_Userprofile_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice; - Name = "/registry/schema/org/openoffice/UserProfile.xcs"; -End - -File gid_File_Oo_Userprofile_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice; - Name = "/registry/data/org/openoffice/UserProfile.xcu"; -End - -File gid_File_Oo_Vcl_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice; - Name = "/registry/schema/org/openoffice/VCL.xcs"; -End - -File gid_File_Oo_Vcl_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice; - Name = "/registry/data/org/openoffice/VCL.xcu"; -End +#ifdef WNT -File gid_File_Oo_Ldap_Xcs +File gid_File_Share_Registry_Forcedefault_Xcd TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice; - Name = "/registry/schema/org/openoffice/LDAP.xcs"; + Styles = (PACKED, SCPZIP_REPLACE, SET_OFFICE_LANGUAGE); + Dir = gid_Dir_Share_Registry; + Name = "forcedefault.xcd"; End +#endif -File gid_File_Oo_Ldap_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice; - Name = "/registry/data/org/openoffice/LDAP.xcu.sample"; -End - -File gid_File_Oo_Ldap_Attr_Map +File gid_File_Oo_Ldap_Xcd_Sample TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Ldap; - Name = "/registry/schema/oo-ldap-attr.map"; + Dir = gid_Dir_Share_Registry; + Name = "oo-ldap.xcd.sample"; End -File gid_File_Oo_AD_Ldap_Attr_Map +File gid_File_Oo_Ad_Ldap_Xcd_Sample TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Ldap; - Name = "/registry/schema/oo-ad-ldap-attr.map"; + Dir = gid_Dir_Share_Registry; + Name = "oo-ad-ldap.xcd.sample"; End File gid_File_Rdb_Offapi @@ -2135,141 +1202,43 @@ End #endif File gid_File_Registry_Lang - Dir = gid_Dir_Share_Registry_Res_Lang; - ARCHIVE_TXT_FILE_BODY; - EXTRA_ALL_LANG(registry); -End - -File gid_File_Registry_Filter_Zip - Dir = gid_Dir_Share_Registry_Res_Lang; - ARCHIVE_TXT_FILE_BODY; - EXTRA_ALL_LANG(fcfg_langpack); -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Base_Types_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_base_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Base_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_base_filters.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Base_Others_Xcu + Dir = gid_Dir_Share_Registry_Res; TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Misc; - Name = "/registry/spool/fcfg_base_others.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Chart_Types_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_chart_types.xcu"; + EXTRA_ALL_LANG_BUT_EN_US(registry,xcd); End -File gid_File_Registry_Spool_Oo_TypeDetection_Chart_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_chart_filters.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Chart_Others_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Misc; - Name = "/registry/spool/fcfg_chart_others.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_InternalGraphics_Types_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_internalgraphics_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_InternalGraphics_Filters_Xcu +File gid_File_Registry_Filter_Zip + Dir = gid_Dir_Share_Registry_Res; TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_GraphicFilter; - Name = "/registry/spool/fcfg_internalgraphics_filters.xcu"; + EXTRA_ALL_LANG(fcfg_langpack,xcd); End File gid_File_Registry_Spool_Langpack_Lang TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Setup; - FILE_ALL_LANG_LETTER(/registry/spool/Langpack-,xcu); + Dir = gid_Dir_Share_Registry; + FILE_ALL_LANG_LETTER(Langpack-,xcd); End -File gid_File_Registry_Spool_Oo_Accelerators_System_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Accelerators; -#ifdef QUARTZ - Name = "/registry/spool/org/openoffice/Office/Accelerators-macosx.xcu"; -#else - Name = "/registry/spool/org/openoffice/Office/Accelerators-unxwnt.xcu"; -#endif -End - -File gid_File_Oo_Office_Paths_System_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Paths; -#ifdef MACOSX - Name = "/registry/spool/org/openoffice/Office/Paths-macosx.xcu"; -#else - Name = "/registry/spool/org/openoffice/Office/Paths-unxwnt.xcu"; -#endif -End - -File gid_File_Registry_Spool_Oo_Common_System_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common; -#ifdef WNT - Name = "/registry/spool/org/openoffice/Office/Common-wnt.xcu"; -#elif defined QUARTZ - Name = "/registry/spool/org/openoffice/Office/Common-macosx.xcu"; -#else - Name = "/registry/spool/org/openoffice/Office/Common-unx.xcu"; -#endif -End - -File gid_File_Registry_Spool_Oo_Common_Ctl_Xcu +File gid_File_Share_Registry_Ctl_Xcd TXT_FILE_BODY; Styles = (PACKED,MAKE_LANG_SPECIFIC); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common; - Name (th) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; - Name (hi-IN) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; - Name (pa-IN) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; - Name (ta-IN) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; - Name (gu-IN) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; - Name (ar) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; - Name (he) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; - Name (lo) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; - Name (dz) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; - Name (km) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; - Name (gu-IN) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; - Name (or) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; - Name (ne) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; - Name (fa) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; - Name (my) = "/registry/spool/org/openoffice/Office/Common-ctl.xcu"; -End - -File gid_File_Registry_Spool_Oo_Office_Writer_PyMailMerge_Xcu - TXT_FILE_BODY; - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Writer; - Name = "/registry/spool/org/openoffice/Office/Writer-javamail.xcu"; - Styles = (PACKED); + Dir = gid_Dir_Share_Registry; + Name (th) = "ctl.xcd"; + Name (hi-IN) = "ctl.xcd"; + Name (pa-IN) = "ctl.xcd"; + Name (ta-IN) = "ctl.xcd"; + Name (gu-IN) = "ctl.xcd"; + Name (ar) = "ctl.xcd"; + Name (he) = "ctl.xcd"; + Name (lo) = "ctl.xcd"; + Name (dz) = "ctl.xcd"; + Name (km) = "ctl.xcd"; + Name (gu-IN) = "ctl.xcd"; + Name (or) = "ctl.xcd"; + Name (ne) = "ctl.xcd"; + Name (fa) = "ctl.xcd"; + Name (my) = "ctl.xcd"; End File gid_File_Scripts_Beanshell @@ -2719,28 +1688,6 @@ File gid_Starregistry_Services_Rdb JavaServicesURLPrefix = "vnd.sun.star.expand:$OOO_BASE_DIR/program/classes/"; End -#if defined(UNX) && !defined(QUARTZ) - -File gid_File_Registry_Spool_Oo_Office_Common_UseOOoFileDialogs_Xcu - TXT_FILE_BODY; - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common; - Name = "/registry/spool/org/openoffice/Office/Common-UseOOoFileDialogs.xcu"; - Styles = (PACKED,SCPZIP_REPLACE); -End - -#endif - -#ifdef WNT - -File gid_File_Registry_Spool_Oo_Office_Linguistic_Forcedefaultlanguage_Xcu - TXT_FILE_BODY; - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Linguistic; - Name = "/registry/spool/org/openoffice/Office/Linguistic-ForceDefaultLanguage.xcu"; - Styles = (PACKED,SCPZIP_REPLACE,SET_OFFICE_LANGUAGE); -End - -#endif - #ifdef LINUX File gid_File_Dat_Root3 TXT_FILE_BODY; @@ -2817,7 +1764,7 @@ File gid_File_InfoPlist_Lang Dir = gid_Dir_Bundle_Contents_Resources_Lang; ARCHIVE_TXT_FILE_BODY; Styles = (ARCHIVE); - EXTRA_ALL_LANG(InfoPlist); + EXTRA_ALL_LANG(InfoPlist,zip); End #endif @@ -2924,25 +1871,11 @@ File gid_File_ImagesClassic8_Zip Styles = (PACKED); End -File gid_File_Registry_Spool_Oo_Office_Linguistic_Lingucomponent_Spellchecker_Xcu +File gid_File_Share_Registry_Lingucomponent_Xcd TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Linguistic; - Name = "/registry/data/org/openoffice/Office/Linguistic-lingucomponent-spellchecker.xcu"; -End - -File gid_File_Registry_Spool_Oo_Office_Linguistic_Lingucomponent_Hyphenator_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Linguistic; - Name = "/registry/data/org/openoffice/Office/Linguistic-lingucomponent-hyphenator.xcu"; -End - -File gid_File_Registry_Spool_Oo_Office_Linguistic_Lingucomponent_Thesaurus_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Linguistic; - Name = "/registry/data/org/openoffice/Office/Linguistic-lingucomponent-thesaurus.xcu"; + Dir = gid_Dir_Share_Registry; + Name = "lingucomponent.xcd"; End // Dictionary extensions @@ -3167,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 @@ -3176,7 +2109,7 @@ End File gid_File_Extension_Dictionary_Sr Dir = gid_Brand_Dir_Share_Extension_Install; Name = "dict-sr.oxt"; - Styles = (PACKED); + Styles = (PACKED, FORCELANGUAGEPACK); UnixRights = 444; End #endif diff --git a/scp2/source/ooo/folderitem_ooo.ulf b/scp2/source/ooo/folderitem_ooo.ulf index 25443ea9253d..93d938531abe 100644 --- a/scp2/source/ooo/folderitem_ooo.ulf +++ b/scp2/source/ooo/folderitem_ooo.ulf @@ -32,4 +32,4 @@ en-US = "From Template" en-US = "Open Document" [STR_FI_TOOLTIP_SOFFICE] -en-US = "The office productivity suite compatible to the open and standardized ODF document format. Supported by Sun Microsystems." +en-US = "The office productivity suite compatible to the open and standardized ODF document format. Supported by Oracle." 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/makefile.mk b/scp2/source/ooo/makefile.mk index 5258c40c8c02..0777febdc869 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -41,10 +41,6 @@ TARGETTYPE=CUI SCPDEFS+=-D_MSC .ENDIF -.IF "$(ENABLE_CRASHDUMP)"!="" -SCPDEFS+=-DENABLE_CRASHDUMP -.ENDIF - .IF "$(BUILD_SPECIAL)"!="" SCPDEFS+=-DBUILD_SPECIAL .ENDIF diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 1e27f8ffa9bd..bd0182f95c49 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -170,13 +170,11 @@ Module gid_Module_Root_Files_4 gid_File_Lib_Dba, gid_File_Lib_Dbacfg, gid_File_Lib_Dbase2, - gid_File_Oo_Office_Dataaccess_Dbase_Xcu, gid_File_Lib_Dbaxml, gid_File_Lib_Dbt, gid_File_Lib_Dbfile, gid_File_Lib_Drawinglayer, gid_File_Lib_Editeng, - gid_File_Oo_Office_Dataaccess_Flat_Xcu, gid_File_Lib_Flat, gid_File_Lib_For, gid_File_Lib_Forui, @@ -270,16 +268,13 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Index_Data, gid_File_Lib_Textconv_Dict, gid_File_Lib_Basprov, - gid_File_Lib_Behelper, - gid_File_Lib_Configmgr2, + gid_File_Lib_Configmgr, gid_File_Lib_Crypto, gid_File_Lib_Dlgprov, gid_File_Lib_Stringresource, gid_File_Lib_Ldapbe2, gid_File_Lib_Comphelper2, - gid_File_Lib_Sysmgr1, gid_File_Lib_Adabas, - gid_File_Oo_Office_Dataaccess_Adabas_Xcu, gid_File_Lib_Cached1, gid_File_Lib_Curl, gid_File_Lib_Db, @@ -287,11 +282,8 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Embobj, gid_File_Lib_Emboleobj, gid_File_Lib_Evoab_2, - gid_File_Oo_Office_Dataaccess_Evoab_Xcu, gid_File_Lib_Kab_1, - gid_File_Oo_Office_Dataaccess_Kab_Xcu, gid_File_Lib_Kab_Drv_1, - gid_File_Oo_Office_Dataaccess_Macab_Xcu, gid_File_Lib_Macab_1, gid_File_Lib_Macab_Drv_1, gid_File_Lib_Evtatt, @@ -313,19 +305,14 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Localedata_Es, gid_File_Lib_Localedata_Euro, gid_File_Lib_Localedata_Others, - gid_File_Oo_Office_Dataaccess_Hsqldb_Xcu, gid_File_Lib_Hsqldb_2, gid_File_Lib_Jdbc, - gid_File_Oo_Office_Dataaccess_Jdbc_Xcu, gid_File_Lib_Mcnttype, - gid_File_Oo_Office_Dataaccess_Mozab_Xcu, gid_File_Lib_Mozab_2, gid_File_Lib_Mozabdrv, gid_File_Lib_Mozbootstrap, gid_File_Lib_Mysql, - gid_File_Oo_Office_Dataaccess_Mysql_Xcu, gid_File_Lib_Odbc, - gid_File_Oo_Office_Dataaccess_Odbc_Xcu, gid_File_Lib_Officebean, gid_File_Lib_Openssl, gid_File_Lib_Package2, @@ -386,7 +373,6 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Stdc_5, gid_File_Lib_Accessbridge, gid_File_Lib_Ado, - gid_File_Oo_Office_Dataaccess_Ado_Xcu, gid_File_Lib_Dl, gid_File_Lib_Dnd, gid_File_Lib_Dtrans, @@ -634,150 +620,10 @@ Module gid_Module_Root_Files_6 gid_File_Mod_Style, gid_File_Mod_Table, gid_File_Mod_Text, - gid_File_Oo_Ldap_Attr_Map, - gid_File_Oo_AD_Ldap_Attr_Map, - gid_File_Oo_Inet_Xcs, - gid_File_Oo_Inet_Xcu, - gid_File_Oo_Office_Addons_Xcs, - gid_File_Oo_Office_OOoImprovement_Settings_Xcs, - gid_File_Oo_Office_Ui_Basicidecommands_Xcs, - gid_File_Oo_Office_Ui_Basicidecommands_Xcu, - gid_File_Oo_Office_Ui_Windowstate_Xcs, - gid_File_Oo_Office_Ui_Basicidewindowstate_Xcs, - gid_File_Oo_Office_Ui_Basicidewindowstate_Xcu, - gid_File_Oo_Office_Ui_Bibliographycommands_Xcs, - gid_File_Oo_Office_Ui_Bibliographycommands_Xcu, - gid_File_Oo_Office_Ui_Bibliographywindowstate_Xcs, - gid_File_Oo_Office_Calc_Xcs, - gid_File_Oo_Office_Calc_Xcu, - gid_File_Oo_Office_CalcAddIns_Xcs, - gid_File_Oo_Office_Chart_Xcs, - gid_File_Oo_Office_Ui_Chartcommands_Xcs, - gid_File_Oo_Office_Ui_Chartcommands_Xcu, - gid_File_Oo_Office_Ui_Chartwindowstate_Xcs, - gid_File_Oo_Office_Ui_Chartwindowstate_Xcu, - gid_File_Oo_Office_Commands_Xcs, - gid_File_Oo_Office_Ui_Commands_Xcs, - gid_File_Oo_Office_Ui_Category_Xcs, - gid_File_Oo_Office_Ui_Drawimpresscommands_Xcs, - gid_File_Oo_Office_Ui_Drawimpresscommands_Xcu, - gid_File_Oo_Office_Ui_Genericcategories_Xcs, - gid_File_Oo_Office_Ui_Genericcategories_Xcu, - gid_File_Oo_Office_Common_Xcs, - gid_File_Oo_Office_Common_Xcu, - gid_File_Oo_Office_Extendedcolorscheme_Xcs, - gid_File_Oo_Office_OptionsDialog_Xcs, - gid_File_Oo_Office_Recovery_Xcs, - gid_File_Oo_Office_Compatibility_Xcs, - gid_File_Oo_Office_Ui_Controller_Xcs, - gid_File_Oo_Office_Ui_Controller_Xcu, - gid_File_Oo_Office_Dataaccess_Xcs, - gid_File_Oo_Office_Dataaccess_Xcu, - gid_File_Oo_Office_Dataaccess_Drivers_Xcs, - gid_File_Oo_Office_Ui_Dbucommands_Xcs, - gid_File_Oo_Office_Ui_Dbucommands_Xcu, - gid_File_Oo_Office_Ui_Basewindowstate_Xcs, - gid_File_Oo_Office_Ui_Basewindowstate_Xcu, - gid_File_Oo_Office_Ui_Dbtablewindowstate_Xcs, - gid_File_Oo_Office_Ui_Dbtablewindowstate_xcu, - gid_File_Oo_Office_Ui_Dbbrowserwindowstate_Xcs, - gid_File_Oo_Office_Ui_Dbbrowserwindowstate_xcu, - gid_File_Oo_Office_Ui_Dbquerywindowstate_Xcs, - gid_File_Oo_Office_Ui_Dbquerywindowstate_xcu, - gid_File_Oo_Office_Ui_Dbrelationwindowstate_Xcs, - gid_File_Oo_Office_Ui_Dbrelationwindowstate_xcu, - gid_File_Oo_Office_Draw_Xcs, - gid_File_Oo_Office_Events_Xcs, - gid_File_Oo_Office_ExtensionManager_Xcs, - gid_File_Oo_Office_ExtensionManager_Xcu, - gid_File_Oo_Office_Ui_Factories_Xcs, - gid_File_Oo_Office_Ui_Factories_Xcu, - gid_File_Oo_Office_Embedding_Xcu, - gid_File_Oo_Office_Ui_Genericcommands_Xcs, - gid_File_Oo_Office_Ui_Genericcommands_Xcu, - gid_File_Oo_Office_Ui_GlobalSettings_Xcs, - gid_File_Oo_Office_Impress_Xcs, - gid_File_Oo_Office_Impress_Xcu, - gid_File_Oo_Office_Java_Xcs, - gid_File_Oo_Office_Jobs_Xcs, - gid_File_Oo_Office_Jobs_Xcu, - gid_File_Oo_Office_Labels_Xcs, - gid_File_Oo_Office_Labels_Xcu, - gid_File_Oo_Office_Linguistic_Xcs, - gid_File_Oo_Office_Math_Xcs, - gid_File_Oo_Office_Math_Xcu, - gid_File_Oo_Office_Protocolhandler_Xcs, - gid_File_Oo_Office_Protocolhandler_Xcu, - gid_File_Oo_Office_Scripting_Xcs, - gid_File_Oo_Office_Scripting_Xcu, - gid_File_Oo_Office_Security_Xcs, - gid_File_Oo_Office_Security_Xcu, - gid_File_Oo_Office_Sfx_Xcs, - gid_File_Oo_Office_Sfx_Xcu, - gid_File_Oo_Office_Ui_Startmodulecommands_Xcs, - gid_File_Oo_Office_Ui_Startmodulecommands_Xcu, - gid_File_Oo_Office_Ui_Startmodulewindowstate_Xcs, - gid_File_Oo_Office_Ui_Startmodulewindowstate_Xcu, - gid_File_Oo_Office_Substitution_Xcs, - gid_File_Oo_Office_Ui_Xcs, - gid_File_Oo_Office_Ui_Xcu, - gid_File_Oo_Office_Views_Xcs, - gid_File_Oo_Office_Writer_Xcs, - gid_File_Oo_Office_Writer_Xcu, - gid_File_Oo_Office_WebWizard_Xcs, - gid_File_Oo_Office_WebWizard_Xcu, - gid_File_Oo_Office_FormWizard_Xcs, - gid_File_Oo_Office_FormWizard_Xcu, - gid_File_Oo_Office_TableWizard_Xcs, - gid_File_Oo_Office_TableWizard_Xcu, - gid_File_Oo_Office_Writerweb_Xcs, - gid_File_Oo_Office_TypeDetection_Xcs, - gid_File_Oo_Office_Embedding_Xcs, - gid_File_Oo_Setup_Xcs, - gid_File_Oo_Setup_Xcu, - gid_File_Oo_Setup_Start_Xcu, - gid_File_Oo_Firststartwizard_Xcs, - gid_File_Oo_Firststartwizard_Xcu, - gid_File_Oo_System_Xcs, - gid_File_Oo_Typedetection_Filter_Xcs, - gid_File_Oo_Typedetection_Graphicfilter_Xcs, - gid_File_Oo_Typedetection_Misc_Xcs, - gid_File_Oo_Typedetection_Types_Xcs, - gid_File_Oo_Ucb_Configuration_Xcs, - gid_File_Oo_Ucb_Configuration_Xcu, - gid_File_Oo_Ucb_InteractionHandler_Xcs, - gid_File_Oo_Ucb_Hierarchy_Xcs, - gid_File_Oo_Ucb_Store_Xcs, - gid_File_Oo_Userprofile_Xcs, - gid_File_Oo_Userprofile_Xcu, - gid_File_Oo_Vcl_Xcs, - gid_File_Oo_Vcl_Xcu, - gid_File_Oo_Ldap_Xcs, - gid_File_Oo_Ldap_Xcu, - gid_File_Oo_Typedetection_UISort_Xcs, - gid_File_Oo_Office_Ui_Mathwindowstate_Xcs, - gid_File_Oo_Office_Views_Xcu, - gid_File_Oo_TypeDetection_UISort_Xcu, - gid_File_Registry_Spool_Oo_Office_Embedding_Chart_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Base_Types_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Base_Filters_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Base_Others_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Chart_Types_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Chart_Filters_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Chart_Others_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_InternalGraphics_Types_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_InternalGraphics_Filters_Xcu, - gid_File_Registry_Spool_Oo_Common_System_Xcu, - gid_File_Registry_Spool_Oo_Office_Common_UseOOoFileDialogs_Xcu, - gid_File_Registry_Spool_Oo_Dataaccess_Adabasdriver_Xcu, - gid_File_Registry_Spool_Oo_Writer_javamail_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_UISort_Writer_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Calc_UISort_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Draw_UISort_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Impress_UISort_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Math_UISort_Xcu, - gid_File_Registry_Spool_Oo_Office_Linguistic_Forcedefaultlanguage_Xcu, - gid_File_Registry_Spool_Oo_Office_Writer_PyMailMerge_Xcu, + gid_File_Oo_Ldap_Xcd_Sample, + gid_File_Oo_Ad_Ldap_Xcd_Sample, + gid_File_Share_Registry_Main_Xcd, + gid_File_Share_Registry_Forcedefault_Xcd, gid_File_Pymailmerge, gid_File_Xsl_Common_Measure_Conversion, gid_File_Xsl_Common_Math_Functions, @@ -928,11 +774,9 @@ Module gid_Module_Oo_Linguistic Styles = (HIDDEN_ROOT); Files = (gid_File_Lib_Spell, gid_File_Lib_Hunspell, - gid_File_Registry_Spool_Oo_Office_Linguistic_Lingucomponent_Spellchecker_Xcu, gid_File_Lib_Hyph, - gid_File_Registry_Spool_Oo_Office_Linguistic_Lingucomponent_Hyphenator_Xcu, gid_File_Lib_Lnth, - gid_File_Registry_Spool_Oo_Office_Linguistic_Lingucomponent_Thesaurus_Xcu); + gid_File_Share_Registry_Lingucomponent_Xcd); End #ifdef LINUX diff --git a/scp2/source/ooo/module_improvement.scp b/scp2/source/ooo/module_improvement.scp index 07c0aab47bf1..1380202f34e7 100644 --- a/scp2/source/ooo/module_improvement.scp +++ b/scp2/source/ooo/module_improvement.scp @@ -37,6 +37,6 @@ Module gid_Module_Oooimprovement ParentID = gid_Module_Root; Default = YES; Styles = (HIDDEN_ROOT); - Files = (gid_File_Share_Registry_Modules_Oo_Office_Jobs_Improvement, gid_File_Share_Registry_Modules_Oo_Office_Logging_Improvement, gid_File_Lib_Oooimprovement); + Files = (gid_File_Share_Registry_Oooimprovement_Xcd, gid_File_Lib_Oooimprovement); End #endif diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp index 2abbf1816edf..7ecd4747cdea 100755 --- a/scp2/source/ooo/module_lang_template.scp +++ b/scp2/source/ooo/module_lang_template.scp @@ -44,10 +44,9 @@ Module gid_Module_Langpack_Basis_Template gid_File_Extra_Wordbook, gid_File_Extra_Wordbook_Lang, gid_File_Registry_Filter_Zip, - gid_File_Registry_Drivers_Zip, gid_File_Registry_Lang, gid_File_Registry_Spool_Langpack_Lang, - gid_File_Registry_Spool_Oo_Common_Ctl_Xcu, + gid_File_Share_Registry_Ctl_Xcd, gid_File_InfoPlist_Lang); Dirs = (gid_Dir_Samples_Language); End diff --git a/scp2/source/ooo/module_systemint.scp b/scp2/source/ooo/module_systemint.scp index ea9faa7e765c..f02b5be04368 100644 --- a/scp2/source/ooo/module_systemint.scp +++ b/scp2/source/ooo/module_systemint.scp @@ -41,7 +41,7 @@ Module gid_Module_Optional_Systemintegration Styles = (SYSTEMMODULE,NOTRELOCATABLE,DONTSHOWINUSERINSTALL,INSTALLCANFAIL,USEFORCE); #endif #if (defined(LINUX)) || (defined(SOLARIS)) - PackageName = "%UNIXPRODUCTNAME-desktop-integration.tar.gz"; + PackageName = "${SYSTEMINTUNIXPACKAGENAME}-desktop-integration.tar.gz"; #else PackageName = ""; #endif diff --git a/scp2/source/ooo/profile_ooo.scp b/scp2/source/ooo/profile_ooo.scp index 502427e416c7..a2491045caf9 100644 --- a/scp2/source/ooo/profile_ooo.scp +++ b/scp2/source/ooo/profile_ooo.scp @@ -27,17 +27,6 @@ #include "macros.inc" -Profile gid_Profile_Configmgr_Ini - ModuleID = gid_Module_Root; - #ifdef UNX - Name = "configmgrrc"; - #else - Name = "configmgr.ini"; - #endif - Dir = gid_Dir_Program; - Styles = (NETWORK); -End - Profile gid_Profile_Uno_Ini ModuleID = gid_Module_Root; #ifdef UNX diff --git a/scp2/source/ooo/profileitem_ooo.scp b/scp2/source/ooo/profileitem_ooo.scp index 191a96a27634..ebd0b87fbabd 100644 --- a/scp2/source/ooo/profileitem_ooo.scp +++ b/scp2/source/ooo/profileitem_ooo.scp @@ -27,262 +27,6 @@ #include "macros.inc" -// for the configmgr - -ProfileItem gid_Profileitem_Configmgr_Cfg_Servertype - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 1; - Key = "CFG_ServerType"; - Value = "uno"; -End - - -ProfileItem gid_Profileitem_Configmgr_Bootstrap_Ini - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 2; - Key = "BootstrapFile"; - Value = "$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap); -End - -ProfileItem gid_Profileitem_Configmgr_Version_Ini - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 2; - Key = "VersionFile"; - Value = "$BRAND_BASE_DIR/program/" PROFILENAME(version); -End - - -ProfileItem gid_Profileitem_Configmgr_Uno_Ini - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 3; - Key = "UnoFile"; - #ifdef UNX - Value = "$ORIGIN/unorc"; - #else - Value = "$ORIGIN/uno.ini"; - #endif -End - - -ProfileItem gid_Profileitem_Configmgr_Baseinstallation - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 4; - Key = "BaseInstallation"; - Value = "${OOO_BASE_DIR}"; -End - - -ProfileItem gid_Profileitem_Configmgr_Userinstallation - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 5; - Key = "UserInstallation"; - Value = "${$BootstrapFile:UserInstallation}"; -End - -ProfileItem gid_Profileitem_Configmgr_Schemaversion - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 6; - Key = "CFG_SchemaVersion"; - Value = "${$VersionFile:buildid}"; -End - -ProfileItem gid_Profileitem_Configmgr_Localcfg_Schemadataurl - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 7; - Key = "CFG_SchemaDataUrl"; - Value = "$BaseInstallation/share/registry/schema ?$CFG_BrandLayerUrl/schema ?$CFG_UnoSharedPackages/schema ?$CFG_UnoUserPackages/schema"; -End - -ProfileItem gid_Profileitem_Configmgr_Localcfg_Defaultdataurl - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 8; - Key = "CFG_DefaultLayerUrls"; - Value = "$BaseInstallation/share/registry $CFG_UnoSharedPackages $CFG_UnoUserPackages"; -End - -ProfileItem gid_Profileitem_Configmgr_Cachedisposal - ProfileID =gid_Profile_Configmgr_Ini ; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 9; - Key = "CFG_CacheDisposeDelay"; - Value = "900"; -End - -ProfileItem gid_Profileitem_Configmgr_Cacheinterval - ProfileID = gid_Profile_Configmgr_Ini ; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 10; - Key = "CFG_CacheDisposeInterval"; - Value = "60"; -End - -ProfileItem gid_Profileitem_Configmgr_Cachewrite - ProfileID = gid_Profile_Configmgr_Ini ; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 11; - Key = "CFG_CacheWriteInterval"; - Value = "2"; -End - -ProfileItem gid_Profileitem_Configmgr_Localcfg_Userdataurl - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 12; - Key = "CFG_UserLayerUrl"; - Value = "$UserInstallation/user/registry"; -End - -ProfileItem gid_Profileitem_Configmgr_Localcfg_Cacheurl - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 13; - Key = "CFG_CacheUrl"; - Value = "$UserInstallation/user/registry/cache"; -End - -ProfileItem gid_Profileitem_Configmgr_Localcfg_Defaultlayerurl - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 14; - Key = "CFG_DefaultLayerUrl"; - Value = "$BaseInstallation/share/registry"; -End - -ProfileItem gid_Profileitem_Configmgr_Localcfg_Modulelayerurl - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 15; - Key = "CFG_ModuleLayerUrl"; - Value = "$CFG_DefaultLayerUrl/modules"; -End - -ProfileItem gid_Profileitem_Configmgr_Localcfg_Unosharedpackages - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 16; - Key = "CFG_UnoSharedPackages"; - Value = "${$UnoFile:UNO_SHARED_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/registry"; -End - -ProfileItem gid_Profileitem_Configmgr_Localcfg_Unouserpackages - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 17; - Key = "CFG_UnoUserPackages"; - Value = "${$UnoFile:UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/registry"; -End - -ProfileItem gid_Profileitem_Configmgr_Unocfg_BrandLayerUrl - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 18; - Key = "CFG_BrandLayerUrl"; - Value = "${BRAND_BASE_DIR}/share/registry"; -End - -ProfileItem gid_Profileitem_Configmgr_Unocfg_BrandLayerModulesUrl - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 19; - Key = "CFG_BrandLayerModulesUrl"; - Value = "$CFG_BrandLayerUrl/modules"; -End - -ProfileItem gid_Profileitem_Configmgr_Unocfg_Backendservice - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 20; - Key = "CFG_BackendService"; - Value = "com.sun.star.comp.configuration.backend.MultiStratumBackend"; -End - -ProfileItem gid_Profileitem_Configmgr_Localcfg_Schemasupplier - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 21; - Key = "CFG_SchemaSupplier"; - Value = "com.sun.star.comp.configuration.backend.LocalSchemaSupplier"; -End - -ProfileItem gid_Profileitem_Configmgr_Localcfg_Datasvc - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 22; - Key = "CFG_LocalDataSvc"; - Value = "com.sun.star.comp.configuration.backend.LocalStratum"; -End - -ProfileItem gid_Profileitem_Configmgr_Localcfg_Moduledatasvc - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 23; - Key = "CFG_LocalModuleDataSvc"; - Value = "com.sun.star.comp.configuration.backend.LocalMultiStratum"; -End - -ProfileItem gid_Profileitem_Configmgr_Localcfg_Resdatasvc - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 24; - Key = "CFG_LocalResDataSvc"; - Value = "com.sun.star.comp.configuration.backend.LocalResourceStratum"; -End - - -ProfileItem gid_Profileitem_Configmgr_Strata - ProfileID = gid_Profile_Configmgr_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 25; - Key = "CFG_Strata"; - Value = "${CFG_LocalDataSvc}:$CFG_DefaultLayerUrl;${CFG_LocalModuleDataSvc}:$CFG_ModuleLayerUrl;${CFG_LocalResDataSvc}:$CFG_DefaultLayerUrl;?${CFG_LocalDataSvc}:$CFG_BrandLayerUrl;?${CFG_LocalModuleDataSvc}:$CFG_BrandLayerModulesUrl;${CFG_LocalDataSvc}:$CFG_UnoSharedPackages;?com.sun.star.comp.configuration.backend.SystemIntegration:;${CFG_LocalDataSvc}:$CFG_UnoUserPackages;${CFG_LocalDataSvc}:$CFG_UserLayerUrl;"; -End - -ProfileItem gid_Profileitem_Configmgr_Ldapmappingurl - ProfileID = gid_Profile_Configmgr_Ini ; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 26; - Key = "CFG_LdapMappingUrl"; - Value = "$BaseInstallation/share/registry/ldap"; -End - -//end configmgr - ProfileItem gid_Profileitem_Setup_Uno_Java_Comppath ProfileID = gid_Profile_Setup_Ini; ModuleID = gid_Module_Root; @@ -404,13 +148,22 @@ ProfileItem gid_Profileitem_Soffice_ProgressPosition Value = "-1,-1"; End +ProfileItem gid_Profileitem_Soffice_NativeProgress + ProfileID = gid_Profile_Soffice_Ini; + ModuleID = gid_Module_Root; + Section = "Bootstrap"; + Order = 6; + Key = "NativeProgress"; + Value = "true"; +End + #ifdef WNT ProfileItem gid_Profileitem_Soffice_Hideeula ProfileID = gid_Profile_Soffice_Ini; ModuleID = gid_Module_Root; Section = "Bootstrap"; - Order = 7; + Order = 8; Key = "HideEula"; Value = "[HIDEEULA]"; Inifiletablekey = "HideEula"; diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp index 04162a200ccf..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_ @@ -140,13 +147,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/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/python/file_python.scp b/scp2/source/python/file_python.scp index e506801c7f74..1303bf59460f 100644 --- a/scp2/source/python/file_python.scp +++ b/scp2/source/python/file_python.scp @@ -118,11 +118,11 @@ End // Scripting Framework Python configuration settings -File gid_File_Registry_Spool_Oo_Scripting_Python_Xcu +File gid_File_Share_Registry_Pyuno_Xcd TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Scripting; - Name = "/registry/spool/org/openoffice/Office/Scripting-python.xcu"; + Dir = gid_Dir_Share_Registry; + Name = "pyuno.xcd"; End #ifndef SYSTEM_PYTHON diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp index 6e1ae9c40d34..3abeec2e3142 100644 --- a/scp2/source/python/module_python.scp +++ b/scp2/source/python/module_python.scp @@ -32,7 +32,7 @@ Module gid_Module_Optional_Pyuno MOD_NAME_DESC ( MODULE_OPTIONAL_PYTHON ); ParentID = gid_Module_Optional; Sortkey = "750"; - Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Officehelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So, gid_File_Lib_Python_So_Brand, gid_File_Py_Scriptprovider,gid_File_Py_Pythonscript,gid_File_Scripts_Python,gid_File_Registry_Spool_Oo_Scripting_Python_Xcu); + Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Officehelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So, gid_File_Lib_Python_So_Brand, gid_File_Py_Scriptprovider,gid_File_Py_Pythonscript,gid_File_Scripts_Python,gid_File_Share_Registry_Pyuno_Xcd); Minimal = NO; Default = YES; Styles = ( ); diff --git a/scp2/source/writer/file_writer.scp b/scp2/source/writer/file_writer.scp index c06fc9465d01..3d7c22b9e7a9 100644 --- a/scp2/source/writer/file_writer.scp +++ b/scp2/source/writer/file_writer.scp @@ -63,13 +63,6 @@ File gid_File_Exe_Sweb End #endif -File gid_File_Registry_Spool_Oo_Office_Embedding_Writer_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Embedding; - Name = "/registry/spool/org/openoffice/Office/Embedding-writer.xcu"; -End - File gid_File_Help_Swriter_Zip Dir = gid_Dir_Help_Isolanguage; ARCHIVE_TXT_FILE_BODY; @@ -99,164 +92,10 @@ File gid_File_Share_Config_Sofficecfg_Writerglobal_Menubar_Xml Name = "/uiconfig/sglobal/menubar/menubar.xml"; End */ -File gid_File_Oo_Office_Ui_Writercommands_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/WriterCommands.xcs"; -End - -File gid_File_Oo_Office_Ui_Writercommands_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/WriterCommands.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Writer_Types_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_writer_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Writer_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_writer_filters.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Web_Types_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_web_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Web_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_web_filters.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Global_Types_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_global_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_Global_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_global_filters.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_UISort_Writer_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_UISort; - Name = "/registry/spool/org/openoffice/TypeDetection/UISort-writer.xcu"; -End - -File gid_File_Registry_Spool_Oo_Common_Writer_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Office_Common; - Name = "/registry/spool/org/openoffice/Office/Common-writer.xcu"; -End - -File gid_File_Registry_Spool_Oo_Setup_Writer_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_Setup; - Name = "/registry/spool/org/openoffice/Setup-writer.xcu"; -End - -File gid_File_Oo_Office_Ui_Writerwindowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/WriterWindowState.xcs"; -End - -File gid_File_Oo_Office_Ui_Xformswindowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/XFormsWindowState.xcs"; -End - -File gid_File_Oo_Office_Ui_Writerformwindowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/WriterFormWindowState.xcs"; -End - -File gid_File_Oo_Office_Ui_Writerreportwindowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/WriterReportWindowState.xcs"; -End - -File gid_File_Oo_Office_Ui_Writerglobalwindowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/WriterGlobalWindowState.xcs"; -End - -File gid_File_Oo_Office_Ui_Writerwebwindowstate_Xcs - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Schema_Org_Openoffice_Office_Ui; - Name = "/registry/schema/org/openoffice/Office/UI/WriterWebWindowState.xcs"; -End - -File gid_File_Oo_Office_Ui_Writerwindowstate_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu"; -End -File gid_File_Oo_Office_Ui_Xformswindowstate_Xcu +File gid_File_Share_Registry_Writer_Xcd TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu"; + Dir = gid_Dir_Share_Registry; + Name = "writer.xcd"; End - -File gid_File_Oo_Office_Ui_Writerformwindowstate_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu"; -End - -File gid_File_Oo_Office_Ui_Writerreportwindowstate_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu"; -End - -File gid_File_Oo_Office_Ui_Writerglobalwindowstate_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu"; -End - -File gid_File_Oo_Office_Ui_Writerwebwindowstate_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Data_Org_Openoffice_Office_Ui; - Name = "/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu"; -End - diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp index 0e93dfeab35a..0d959dd3f86b 100644 --- a/scp2/source/writer/module_writer.scp +++ b/scp2/source/writer/module_writer.scp @@ -57,21 +57,7 @@ Module gid_Module_Prg_Wrt_Bin gid_File_Jar_Email, gid_File_Jar_Mail, gid_File_Jar_Activation, - gid_File_Oo_Office_Ui_Writercommands_Xcs, - gid_File_Oo_Office_Ui_Writercommands_Xcu, - gid_File_Registry_Spool_Oo_Common_Writer_Xcu, - gid_File_Registry_Spool_Oo_Setup_Writer_Xcu, - gid_File_Registry_Spool_Oo_Common_Dicooo_Xcu, - gid_File_Oo_Office_Ui_Writerwindowstate_Xcs, - gid_File_Oo_Office_Ui_Writerglobalwindowstate_Xcs, - gid_File_Oo_Office_Ui_Writerwebwindowstate_Xcs, - gid_File_Oo_Office_Ui_Writerwindowstate_Xcu, - gid_File_Oo_Office_Ui_Writerglobalwindowstate_Xcu, - gid_File_Oo_Office_Ui_Writerwebwindowstate_Xcu, - gid_File_Registry_Spool_Oo_Office_Embedding_Writer_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Writer_Types_Xcu, gid_File_Registry_Spool_Oo_TypeDetection_Writer_Filters_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Web_Types_Xcu, gid_File_Registry_Spool_Oo_TypeDetection_Web_Filters_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_Global_Types_Xcu, gid_File_Registry_Spool_Oo_TypeDetection_Global_Filters_Xcu, + gid_File_Share_Registry_Writer_Xcd, gid_File_Tmp_Userinstall_Wrt_Inf); End @@ -106,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 b6497f889630..8c3f0a5b82ad 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 @@ -1267,12 +1260,30 @@ RegistryItem gid_Regitem_OpenOffice_OTT_OpenWith_Writer 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"; + Value = " "; +End + // .SXW 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 +1292,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 +1301,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 +1310,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 +1319,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 +1328,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 +1337,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 +1346,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 +1355,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 +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 = ".stw"; - Value = "opendocument.WriterDocument.1"; + Value = "soffice.StarWriterDocument.6"; Styles = (); End @@ -1389,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 = ".txt"; - Value = "opendocument.WriterDocument.1"; + Value = "soffice.StarWriterDocument.6"; Styles = (); End @@ -1398,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 = ".htm"; - Value = "opendocument.WriterWebDocument.1"; + Value = "soffice.StarWriterDocument.6"; Styles = (); End @@ -1407,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 = ".html"; - Value = "opendocument.WriterWebDocument.1"; + Value = "soffice.StarWriterDocument.6"; Styles = (); End @@ -1416,7 +1410,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 +1419,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 +1428,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 +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, 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_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" diff --git a/scp2/source/xsltfilter/file_xsltfilter.scp b/scp2/source/xsltfilter/file_xsltfilter.scp index 735e55be8dd7..848b1c707ff7 100644 --- a/scp2/source/xsltfilter/file_xsltfilter.scp +++ b/scp2/source/xsltfilter/file_xsltfilter.scp @@ -27,18 +27,11 @@ #include "macros.inc" -File gid_File_Registry_Spool_Oo_TypeDetection_XSLT_Types_Xcu +File gid_File_Share_Registry_Xsltfilter_Xcd TXT_FILE_BODY; Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Types; - Name = "/registry/spool/fcfg_xslt_types.xcu"; -End - -File gid_File_Registry_Spool_Oo_TypeDetection_XSLT_Filters_Xcu - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter; - Name = "/registry/spool/fcfg_xslt_filters.xcu"; + Dir = gid_Dir_Share_Registry; + Name = "xsltfilter.xcd"; End File gid_File_Stw_Docbooktemplate diff --git a/scp2/source/xsltfilter/module_xsltfilter.scp b/scp2/source/xsltfilter/module_xsltfilter.scp index 0cc033ea6dde..7854ce70474f 100644 --- a/scp2/source/xsltfilter/module_xsltfilter.scp +++ b/scp2/source/xsltfilter/module_xsltfilter.scp @@ -43,8 +43,7 @@ Module gid_Module_Optional_Xsltfiltersamples gid_File_Xsl_Export_Xhtml_Master_Usability_Links, gid_File_Xsl_Export_Xhtml_Ooo2xhtml, gid_File_Xsl_Export_Xhtml_Table, - gid_File_Registry_Spool_Oo_TypeDetection_XSLT_Types_Xcu, - gid_File_Registry_Spool_Oo_TypeDetection_XSLT_Filters_Xcu ); + gid_File_Share_Registry_Xsltfilter_Xcd ); Minimal = NO; Default = NO; Styles = ( ); diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk index f62d0c0f2a91..1fed891823b6 100644 --- a/scp2/util/makefile.mk +++ b/scp2/util/makefile.mk @@ -172,7 +172,7 @@ SCP1FILES += \ .IF "$(ENABLE_CRASHDUMP)" != "" SCP1FILES += \ - file_crashrep_dynamic.par + file_crashrep.par .ENDIF SCP1FILES += \ @@ -325,7 +325,7 @@ SCP2FILES += \ .IF "$(ENABLE_CRASHDUMP)" != "" SCP2FILES += \ - file_crashrep_dynamic.par + file_crashrep.par .ENDIF SCP2FILES += \ |