diff options
Diffstat (limited to 'scp2/source')
31 files changed, 150 insertions, 417 deletions
diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp index 5c50dd3b7af7..e2a8d364bb57 100644 --- a/scp2/source/base/file_base.scp +++ b/scp2/source/base/file_base.scp @@ -18,7 +18,7 @@ #include "macros.inc" -#if defined WITH_HELP +#if defined WITH_HELPPACKS File gid_File_Help_Sdatabase_Zip Dir = FILELIST_DIR; FILELIST_TXT_FILE_BODY_HELPPACK; diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp index 75cbbbc119b9..84ffb5bfe32a 100644 --- a/scp2/source/calc/file_calc.scp +++ b/scp2/source/calc/file_calc.scp @@ -25,7 +25,7 @@ File gid_File_Share_Registry_Calc_Xcd Name = "calc.xcd"; End -#if defined WITH_HELP +#if defined WITH_HELPPACKS File gid_File_Help_Scalc_Zip Dir = FILELIST_DIR; FILELIST_TXT_FILE_BODY_HELPPACK; diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp index ca0fc58921cd..b6cf9c3df5c3 100644 --- a/scp2/source/calc/registryitem_calc.scp +++ b/scp2/source/calc/registryitem_calc.scp @@ -588,7 +588,7 @@ RegistryItem gid_Regitem_sxc_KindMap Value = "document"; End -// new ods file extension +// new ods file extension RegistryItem gid_Regitem_Ods_PersistentHandler ParentID = PREDEFINED_HKEY_CLASSES_ROOT; @@ -854,7 +854,7 @@ RegistryItem gid_Regitem_fods_KindMap Value = "document"; End -// new ots file extension +// new ots file extension RegistryItem gid_Regitem_Ots_PersistentHandler ParentID = PREDEFINED_HKEY_CLASSES_ROOT; @@ -1252,6 +1252,7 @@ REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( stc ) // registering the mso file types +CONDITIONAL_REGISTER_DOC_EXTENSION( Xlr, gid_Module_Prg_Calc_MSO_Reg, xlr, XLR, MS_WORKS, 3, scalc.exe, open, Calc ) CONDITIONAL_REGISTER_DOC_EXTENSION( Xls, gid_Module_Prg_Calc_MSO_Reg, xls, XLS, MS_EXCEL_WORKSHEET_OLD, 3, scalc.exe, open, Calc ) CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsx, gid_Module_Prg_Calc_MSO_Reg, xlsx, XLSX, MS_EXCEL_WORKSHEET, 3, scalc.exe, open, Calc ) CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsm, gid_Module_Prg_Calc_MSO_Reg, xlsm, XLSM, MS_EXCEL_WORKSHEET, 3, scalc.exe, open, Calc ) @@ -1294,6 +1295,7 @@ End CONDITIONAL_REGISTER_DOC_EXTENSION( Uos, gid_Module_Prg_Calc_Other_Reg, uos, UOS, UNIFORM_OFFICE_FORMAT_SPREADSHEET, 3, scalc.exe, open, Calc ) CONDITIONAL_REGISTER_DOC_EXTENSION( Wb2, gid_Module_Prg_Calc_Other_Reg, wb2, WB2, QUATTROPRO_SPREADSHEET, 3, scalc.exe, open, Calc ) +CONDITIONAL_REGISTER_DOC_EXTENSION( Numbers, gid_Module_Prg_Calc_Other_Reg, numbers, NUMBERS, NUMBERS_SPREADSHEET, 3, scalc.exe, open, Calc ) // registering ms-excel URI scheme handler CONDITIONAL_REGISTER_URI_HANDLER( ms-excel, ms_excel, gid_Module_Prg_Calc_MSO_Reg, SELECT_EXCEL ) diff --git a/scp2/source/calc/registryitem_calc.ulf b/scp2/source/calc/registryitem_calc.ulf index fb115e6a2235..d3f7efbb14aa 100644 --- a/scp2/source/calc/registryitem_calc.ulf +++ b/scp2/source/calc/registryitem_calc.ulf @@ -52,3 +52,8 @@ en-US = "Uniform Office Format Spreadsheet" [STR_REG_VAL_QUATTROPRO_SPREADSHEET] en-US = "Lotus Quattro Pro Spreadsheet" +[STR_REG_VAL_NUMBERS_SPREADSHEET] +en-US = "Apple Numbers" + +[STR_REG_VAL_MS_WORKS] +en-US = "Microsoft Works Spreadsheet with Excel format" diff --git a/scp2/source/draw/file_draw.scp b/scp2/source/draw/file_draw.scp index 49d6d5dd40dc..93ca07b07af5 100644 --- a/scp2/source/draw/file_draw.scp +++ b/scp2/source/draw/file_draw.scp @@ -25,7 +25,7 @@ File gid_File_Share_Registry_Draw_Xcd Name = "draw.xcd"; End -#if defined WITH_HELP +#if defined WITH_HELPPACKS File gid_File_Help_Sdraw_Zip Dir = FILELIST_DIR; FILELIST_TXT_FILE_BODY_HELPPACK; diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp index 93cadcaa1ca5..515b55fb58f7 100644 --- a/scp2/source/draw/registryitem_draw.scp +++ b/scp2/source/draw/registryitem_draw.scp @@ -1092,6 +1092,8 @@ CONDITIONAL_REGISTER_DOC_EXTENSION( Tiff, gid_Module_Prg_Draw_Other_Reg, tiff, CONDITIONAL_REGISTER_DOC_EXTENSION( Xbm, gid_Module_Prg_Draw_Other_Reg, xbm, XBM, X_BITMAP, 5, sdraw.exe, open, Draw ) CONDITIONAL_REGISTER_DOC_EXTENSION( Xpm, gid_Module_Prg_Draw_Other_Reg, xpm, XPM, X_PIXMAP, 5, sdraw.exe, open, Draw ) CONDITIONAL_REGISTER_DOC_EXTENSION( PCD, gid_Module_Prg_Draw_Other_Reg, pcd, PCD, KODAK_PHOTO_CD_IMAGE, 5, sdraw.exe, open, Draw ) +CONDITIONAL_REGISTER_DOC_EXTENSION( Webp, gid_Module_Prg_Draw_Other_Reg, webp, WEBP, WEBP, 5, sdraw.exe, open, Draw ) +CONDITIONAL_REGISTER_DOC_EXTENSION( Pdf, gid_Module_Prg_Draw_Other_Reg, pdf, PDF, PDF, 5, sdraw.exe, open, Draw ) // registering ms-visio URI scheme handler CONDITIONAL_REGISTER_URI_HANDLER( ms-visio, ms_visio, gid_Module_Prg_Draw_MSO_Reg, SELECT_VISIO ) diff --git a/scp2/source/draw/registryitem_draw.ulf b/scp2/source/draw/registryitem_draw.ulf index f122dc7daf6d..5d1335bb8b25 100644 --- a/scp2/source/draw/registryitem_draw.ulf +++ b/scp2/source/draw/registryitem_draw.ulf @@ -115,3 +115,5 @@ en-US = "X Pixmap File" [STR_REG_VAL_KODAK_PHOTO_CD_IMAGE] en-US = "Kodak Photo CD Image File" +[STR_REG_VAL_PDF] +en-US = "PDF (Portable Document Format)" diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp index b7c01529cfff..4f7859695af3 100644 --- a/scp2/source/extensions/file_extensions.scp +++ b/scp2/source/extensions/file_extensions.scp @@ -48,19 +48,6 @@ End #endif -/* ** LanguageTool ** */ - -#ifdef WITH_EXTENSION_LANGUAGETOOL - -File gid_File_Oxt_LanguageTool - TXT_FILE_BODY; - Styles = (PACKED, FILELIST); - Dir = FILELIST_DIR; - Name = "LanguageTool.filelist"; -End - -#endif - /* ** Script provider for BeanShell ** */ #if defined ENABLE_JAVA && !defined WITHOUT_SCRIPTING_BEANSHELL diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp index 7c14cfeda594..7f8061f99857 100644 --- a/scp2/source/extensions/module_extensions.scp +++ b/scp2/source/extensions/module_extensions.scp @@ -61,22 +61,6 @@ Module gid_Module_Optional_Extensions_NumberText End #endif -/* ** ConvertTextToNumber ** */ - -#ifdef WITH_EXTENSION_CT2N - -#include "AutoInstall/extensions_ct2n" - -Module gid_Module_Optional_Extensions_CT2N - PackageInfo = "packinfo_extensions.txt"; - MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_CT2N); - ParentID = gid_Module_Optional_Extensions; - Files = (auto_extensions_ct2n_ALL); - Default = YES; - Styles = ( ); -End -#endif - /* ** NLPSolver ** */ #ifdef WITH_EXTENSION_NLPSOLVER @@ -91,20 +75,6 @@ Module gid_Module_Optional_Extensions_NLPSolver End #endif -/* ** LanguageTool ** */ - -#ifdef WITH_EXTENSION_LANGUAGETOOL -Module gid_Module_Optional_Extensions_LanguageTool - PackageInfo = "packinfo_extensions.txt"; - MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_LANGUAGETOOL); - ParentID = gid_Module_Optional_Extensions; - Files = ( - gid_File_Oxt_LanguageTool ); - Default = YES; - Styles = ( ); -End -#endif - /* ** Script provider for BeanShell ** */ #if defined ENABLE_JAVA && !defined WITHOUT_SCRIPTING_BEANSHELL diff --git a/scp2/source/extensions/module_extensions.ulf b/scp2/source/extensions/module_extensions.ulf index a5fb2238fabb..6218564c08f0 100644 --- a/scp2/source/extensions/module_extensions.ulf +++ b/scp2/source/extensions/module_extensions.ulf @@ -34,24 +34,12 @@ en-US = "Numbertext" [STR_DESC_MODULE_OPTIONAL_EXTENSIONS_NUMBERTEXT] en-US = "Provides the NUMBERTEXT/MONEYTEXT spreadsheet functions which convert numbers to localized text, e.g. '100' to 'hundred'." -[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_CT2N] -en-US = "Convert Text to Number" - -[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_CT2N] -en-US = "Convert Text to Number" - [STR_NAME_MODULE_OPTIONAL_EXTENSIONS_NLPSOLVER] en-US = "Solver for Nonlinear Programming" [STR_DESC_MODULE_OPTIONAL_EXTENSIONS_NLPSOLVER] en-US = "Solver for Nonlinear Programming" -[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_LANGUAGETOOL] -en-US = "LanguageTool Open Source language checker" - -[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_LANGUAGETOOL] -en-US = "LanguageTool Open Source language checker" - [STR_NAME_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_BEANSHELL] en-US = "Script provider for BeanShell" diff --git a/scp2/source/impress/file_impress.scp b/scp2/source/impress/file_impress.scp index f689c62f7b5f..bed62eede8ad 100644 --- a/scp2/source/impress/file_impress.scp +++ b/scp2/source/impress/file_impress.scp @@ -25,7 +25,7 @@ File gid_File_Share_Registry_Impress_Xcd Name = "impress.xcd"; End -#if defined WITH_HELP +#if defined WITH_HELPPACKS File gid_File_Help_Simpress_Zip Dir = FILELIST_DIR; FILELIST_TXT_FILE_BODY_HELPPACK; diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp index be9ba5fea5b9..c0b173dc2f04 100644 --- a/scp2/source/impress/registryitem_impress.scp +++ b/scp2/source/impress/registryitem_impress.scp @@ -1140,6 +1140,7 @@ End CONDITIONAL_REGISTER_DOC_EXTENSION( Uop, gid_Module_Prg_Impress_Other_Reg, uop, UOP, UNIFORM_OFFICE_FORMAT_PRESENTATION, 7, simpress.exe, open, Impress ) CONDITIONAL_REGISTER_DOC_EXTENSION( Cgm, gid_Module_Prg_Impress_Other_Reg, cgm, CGM, COMPUTER_GRAPHICS_METAFILE, 7, simpress.exe, open, Impress ) +CONDITIONAL_REGISTER_DOC_EXTENSION( Keynote, gid_Module_Prg_Impress_Other_Reg, key, KEY, KEYNOTE_PRESENTATION, 3, simpress.exe, open, Impress ) // registering ms-powerpoint URI scheme handler CONDITIONAL_REGISTER_URI_HANDLER( ms-powerpoint, ms_powerpoint, gid_Module_Prg_Impress_MSO_Reg, SELECT_POWERPOINT ) diff --git a/scp2/source/impress/registryitem_impress.ulf b/scp2/source/impress/registryitem_impress.ulf index e201da0b44a6..5f9adf1eab4e 100644 --- a/scp2/source/impress/registryitem_impress.ulf +++ b/scp2/source/impress/registryitem_impress.ulf @@ -55,3 +55,5 @@ en-US = "Uniform Office Format Presentation" [STR_REG_VAL_COMPUTER_GRAPHICS_METAFILE] en-US = "Computer Graphics Metafile" +[STR_REG_VAL_KEYNOTE_PRESENTATION] +en-US = "Apple Keynote" diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp index 12877b8f1eda..790873958261 100644 --- a/scp2/source/math/file_math.scp +++ b/scp2/source/math/file_math.scp @@ -25,7 +25,7 @@ File gid_File_Share_Registry_Math_Xcd Name = "math.xcd"; End -#if defined WITH_HELP +#if defined WITH_HELPPACKS File gid_File_Help_Smath_Zip Dir = FILELIST_DIR; FILELIST_TXT_FILE_BODY_HELPPACK; diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 5b8b907f2a9c..5da3647c2ced 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -498,32 +498,6 @@ ProfileItem gid_Brand_Profileitem_Version_Buildid Value = "<buildid>"; End -#ifdef WNT - -ProfileItem gid_Brand_Profileitem_Version_Productcode - ProfileID = gid_Brand_Profile_Version_Ini; - ModuleID = gid_Module_Root_Brand; - Section = "Version"; - Order = 8; - Key = "ProductCode"; - Value = "<productcode>"; -End - -#endif - -#ifdef WNT - -ProfileItem gid_Brand_Profileitem_Version_Upgradecode - ProfileID = gid_Brand_Profile_Version_Ini; - ModuleID = gid_Module_Root_Brand; - Section = "Version"; - Order = 9; - Key = "UpgradeCode"; - Value = "<upgradecode>"; -End - -#endif - ProfileItem gid_Brand_Profileitem_Version_Alllanguages ProfileID = gid_Brand_Profile_Version_Ini; ModuleID = gid_Module_Root_Brand; @@ -533,19 +507,6 @@ ProfileItem gid_Brand_Profileitem_Version_Alllanguages Value = "<alllanguages>"; End -#ifdef WNT - -ProfileItem gid_Brand_Profileitem_Version_Msiproductversion - ProfileID = gid_Brand_Profile_Version_Ini; - ModuleID = gid_Module_Root_Brand; - Section = "Version"; - Order = 14; - Key = "MsiProductVersion"; - Value = "<msiproductversion>"; -End - -#endif - ProfileItem gid_Brand_Profileitem_Version_Updateurl ProfileID = gid_Brand_Profile_Version_Ini; ModuleID = gid_Module_Root_Brand; @@ -816,56 +777,6 @@ ProfileItem gid_Brand_Profileitem_Redirect_Ure_Bootstrap End #endif -#ifdef WNT -ProfileItem gid_Brand_Profileitem_Setup_Alluserset - ProfileID = gid_Brand_Profile_Setup_Ini; - ModuleID = gid_Module_Root_Brand; - Section = "Bootstrap"; - Order = 4; - Key = "ALLUSERS"; - Value = "[ALLUSERS]"; - Inifiletablekey = "AllUsersSet"; - Inifiletableaction = "1"; - Styles = (INIFILETABLE); -End -#endif - -#ifdef WNT -ProfileItem gid_Brand_Profileitem_Setup_Findproduct - ProfileID = gid_Brand_Profile_Setup_Ini; - ModuleID = gid_Module_Root_Brand; - Section = "Bootstrap"; - Order = 5; - Key = "FINDPRODUCT"; - Value = "[FINDPRODUCT]"; - Inifiletablekey = "FindProductSet"; - Inifiletableaction = "1"; - Styles = (INIFILETABLE); -End -#endif - -#ifdef WNT -ProfileItem gid_Brand_Profileitem_Setup_Productcode - ProfileID = gid_Brand_Profile_Setup_Ini; - ModuleID = gid_Module_Root_Brand; - Section = "Bootstrap"; - Order = 6; - Key = "ProductCode"; - Value = "<productcode>"; -End -#endif - -#ifdef WNT -ProfileItem gid_Brand_Profileitem_Setup_Upgradecode - ProfileID = gid_Brand_Profile_Setup_Ini; - ModuleID = gid_Module_Root_Brand; - Section = "Bootstrap"; - Order = 7; - Key = "UpgradeCode"; - Value = "<upgradecode>"; -End -#endif - ProfileItem gid_Brand_Profileitem_Setup_Buildid ProfileID = gid_Brand_Profile_Setup_Ini; ModuleID = gid_Module_Root_Brand; @@ -874,59 +785,3 @@ ProfileItem gid_Brand_Profileitem_Setup_Buildid Key = "buildid"; Value = "<buildid>"; End - -#ifdef WNT -ProfileItem gid_Brand_Profileitem_Setup_Ureinstall - ProfileID = gid_Brand_Profile_Setup_Ini; - ModuleID = gid_Module_Root_Brand; - Section = "Bootstrap"; - Order = 4; - Key = "UREINSTALLLOCATION"; - Value = "[INSTALLLOCATION]URE\\"; - Inifiletablekey = "UreInstallLocation"; - Inifiletableaction = "1"; - Styles = (INIFILETABLE); -End -#endif - -#ifdef WNT -ProfileItem gid_Brand_Profileitem_Setup_Basisinstall - ProfileID = gid_Brand_Profile_Setup_Ini; - ModuleID = gid_Module_Root_Brand; - Section = "Bootstrap"; - Order = 4; - Key = "BASISINSTALLLOCATION"; - Value = "[INSTALLLOCATION]"; - Inifiletablekey = "BasisInstallLocation"; - Inifiletableaction = "1"; - Styles = (INIFILETABLE); -End -#endif - -#ifdef WNT -ProfileItem gid_Brand_Profileitem_Setup_Officeinstall - ProfileID = gid_Brand_Profile_Setup_Ini; - ModuleID = gid_Module_Root_Brand; - Section = "Bootstrap"; - Order = 4; - Key = "OFFICEINSTALLLOCATION"; - Value = "[INSTALLLOCATION]"; - Inifiletablekey = "OfficeInstallLocation"; - Inifiletableaction = "1"; - Styles = (INIFILETABLE); -End -#endif - -#ifdef WNT -ProfileItem gid_Brand_Profileitem_Setup_Install - ProfileID = gid_Brand_Profile_Setup_Ini; - ModuleID = gid_Module_Root_Brand; - Section = "Bootstrap"; - Order = 4; - Key = "INSTALLLOCATION"; - Value = "[INSTALLLOCATION]"; - Inifiletablekey = "InstallLocation"; - Inifiletableaction = "1"; - Styles = (INIFILETABLE); -End -#endif diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp index 1b8243e74979..53dbbe5eec52 100644 --- a/scp2/source/ooo/directory_ooo.scp +++ b/scp2/source/ooo/directory_ooo.scp @@ -285,6 +285,16 @@ Directory gid_Dir_Basic_SFDocuments DosName = "SFDocuments"; End +Directory gid_Dir_Basic_SFUnitTests + ParentID = gid_Dir_Basic; + DosName = "SFUnitTests"; +End + +Directory gid_Dir_Basic_SFWidgets + ParentID = gid_Dir_Basic; + DosName = "SFWidgets"; +End + Directory gid_Dir_Basic_Importwiz ParentID = gid_Dir_Basic; DosName = "ImportWizard"; @@ -554,39 +564,14 @@ Directory gid_Dir_Template_Common DosName = "common"; End -Directory gid_Dir_Template_Common_Educate - ParentID = gid_Dir_Template_Common; - DosName = "educate"; -End - -Directory gid_Dir_Template_Common_Finance - ParentID = gid_Dir_Template_Common; - DosName = "finance"; -End - -Directory gid_Dir_Template_Common_Forms - ParentID = gid_Dir_Template_Common; - DosName = "forms"; -End - Directory gid_Dir_Template_Common_Internal ParentID = gid_Dir_Template_Common; DosName = "internal"; End -Directory gid_Dir_Template_Common_Labels - ParentID = gid_Dir_Template_Common; - DosName = "labels"; -End - -Directory gid_Dir_Template_Common_Layout - ParentID = gid_Dir_Template_Common; - DosName = "layout"; -End - -Directory gid_Dir_Template_Common_Misc +Directory gid_Dir_Template_Common_Draw ParentID = gid_Dir_Template_Common; - DosName = "misc"; + DosName = "draw"; End Directory gid_Dir_Template_Common_Officorr diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 9bdeab03e702..f5573c3ab872 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -27,7 +27,7 @@ #include "macros.inc" -#if defined WITH_HELP +#if defined WITH_HELPPACKS File gid_File_Help_Common_Zip Dir = FILELIST_DIR; FILELIST_TXT_FILE_BODY_HELPPACK; @@ -357,6 +357,15 @@ End #endif #if defined WITH_MYSPELL_DICTS +File gid_File_Extension_Dictionary_Ckb + Dir = FILELIST_DIR; + Name = "Dictionary/dict-ckb.filelist"; + Styles = (PACKED, FORCELANGUAGEPACK, FILELIST); + TXT_FILE_BODY; +End +#endif + +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Cs Dir = FILELIST_DIR; Name = "Dictionary/dict-cs.filelist"; @@ -374,7 +383,7 @@ File gid_File_Extension_Dictionary_Da End #endif -#if defined WITH_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS && (!defined MPL_SUBSET || defined LINUX) File gid_File_Extension_Dictionary_De Dir = FILELIST_DIR; Name = "Dictionary/dict-de.filelist"; @@ -383,7 +392,7 @@ File gid_File_Extension_Dictionary_De End #endif -#if defined WITH_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS && (!defined MPL_SUBSET || defined LINUX) File gid_File_Extension_Dictionary_En Dir = FILELIST_DIR; Name = "Dictionary/dict-en.filelist"; @@ -429,6 +438,15 @@ End #endif #if defined WITH_MYSPELL_DICTS +File gid_File_Extension_Dictionary_Fa + Dir = FILELIST_DIR; + Name = "Dictionary/dict-fa.filelist"; + Styles = (PACKED, FORCELANGUAGEPACK, FILELIST); + TXT_FILE_BODY; +End +#endif + +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Fr Dir = FILELIST_DIR; Name = "Dictionary/dict-fr.filelist"; @@ -518,7 +536,7 @@ File gid_File_Extension_Dictionary_Is End #endif -#if defined WITH_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS && (!defined MPL_SUBSET || defined LINUX) File gid_File_Extension_Dictionary_It Dir = FILELIST_DIR; Name = "Dictionary/dict-it.filelist"; diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 904cea2420bd..cb8093987a17 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -22,59 +22,6 @@ #include "AutoInstall/ooo_images" #include "AutoInstall/ooobinarytable" -#ifdef AIX -#ifndef SYSTEM_CURL -Unixlink gid_Unixlink_File_Lib_Curl - BIN_FILE_BODY; - Dir = SCP2_OOO_BIN_DIR; - Name = STRING(CONCAT2(libcurl,UNXSUFFIX)); - Styles = (PACKED); - Target = STRING(CONCAT3(libcurl,UNXSUFFIX,.3)); -End -#endif -#ifndef SYSTEM_REDLAND -Unixlink gid_Unixlink_File_Lib_Raptor - BIN_FILE_BODY; - Dir = SCP2_OOO_BIN_DIR; - Name = STRING(CONCAT2(libraptor,UNXSUFFIX)); - Styles = (PACKED); - Target = STRING(CONCAT3(libraptor,UNXSUFFIX,.1)); -End - -Unixlink gid_Unixlink_File_Lib_Rasqal - BIN_FILE_BODY; - Dir = SCP2_OOO_BIN_DIR; - Name = STRING(CONCAT2(librasqal,UNXSUFFIX)); - Styles = (PACKED); - Target = STRING(CONCAT3(librasqal,UNXSUFFIX,.1)); -End - -Unixlink gid_Unixlink_File_Lib_Rdf - BIN_FILE_BODY; - Dir = SCP2_OOO_BIN_DIR; - Name = STRING(CONCAT2(librdf,UNXSUFFIX)); - Styles = (PACKED); - Target = STRING(CONCAT3(librdf,UNXSUFFIX,.0)); -End -#endif -#ifndef SYSTEM_LIBXSLT -Unixlink gid_Unixlink_File_Lib_Xslt - BIN_FILE_BODY; - Dir = SCP2_OOO_BIN_DIR; - Name = STRING(CONCAT2(libxslt,UNXSUFFIX)); - Styles = (PACKED); - Target = STRING(CONCAT3(libxslt,UNXSUFFIX,.1)); -End -Unixlink gid_Unixlink_File_Lib_eXslt - BIN_FILE_BODY; - Dir = SCP2_OOO_BIN_DIR; - Name = STRING(CONCAT2(libexslt,UNXSUFFIX)); - Styles = (PACKED); - Target = STRING(CONCAT3(libexslt,UNXSUFFIX,.0)); -End -#endif -#endif - Module gid_Module_Root_Files_Images PackageInfo = "packinfo_office.txt"; ParentID = gid_Module_Root; diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf index ecfedfb5c337..5b51e7fa9f64 100644 --- a/scp2/source/ooo/module_langpack.ulf +++ b/scp2/source/ooo/module_langpack.ulf @@ -52,6 +52,12 @@ en-US = "Frisian" [STR_DESC_MODULE_LANGPACK_FY] en-US = "Installs the Frisian user interface" +[STR_NAME_MODULE_LANGPACK_HY] +en-US = "Armenian" + +[STR_DESC_MODULE_LANGPACK_HY] +en-US = "Installs the Armenian user interface" + [STR_NAME_MODULE_LANGPACK_IT] en-US = "Italian" @@ -80,7 +86,7 @@ en-US = "Installs the Portuguese user interface" en-US = "Portuguese (Brazil)" [STR_DESC_MODULE_LANGPACK_PT_BR] -en-US = "Installs the Portuguese user interface" +en-US = "Installs the Brazilian Portuguese user interface" [STR_NAME_MODULE_LANGPACK_JA] en-US = "Japanese" diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp index 842b244b1670..a9540d9f6b47 100644 --- a/scp2/source/ooo/module_ooo.scp +++ b/scp2/source/ooo/module_ooo.scp @@ -32,12 +32,6 @@ Module gid_Module_Root gid_Starregistry_Services_Rdb, auto_ooo_ALL, auto_ooobinarytable_ALL, - gid_Unixlink_File_Lib_Curl, - gid_Unixlink_File_Lib_Raptor, - gid_Unixlink_File_Lib_Rasqal, - gid_Unixlink_File_Lib_Rdf, - gid_Unixlink_File_Lib_Xslt, - gid_Unixlink_File_Lib_eXslt, GID_FILE_LIB_WPD, gid_File_Lib_Cli_Oootypes_Assembly, gid_File_Lib_Policy_Cli_Oootypes_Assembly, @@ -98,12 +92,6 @@ Module gid_Module_Root gid_File_Share_Registry_Forcedefault_Xcd, gid_File_Extra_Fontunxpsprint, gid_File_Extra_Fontunxafm); - Unixlinks = (gid_Unixlink_File_Lib_Curl, - gid_Unixlink_File_Lib_Raptor, - gid_Unixlink_File_Lib_Rasqal, - gid_Unixlink_File_Lib_Rdf, - gid_Unixlink_File_Lib_Xslt, - gid_Unixlink_File_Lib_eXslt); End Module gid_Module_Prg @@ -236,6 +224,17 @@ Module gid_Module_Root_Extension_Dictionary_Ca Styles = (); End +Module gid_Module_Root_Extension_Dictionary_Ckb + MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_CKB ); + Files = (gid_File_Extension_Dictionary_Ckb); + InstallOrder = "2000"; + Sortkey = "525"; + Spellcheckerlanguage = "ckb"; + PackageInfo = "packinfo_office.txt"; + ParentID = gid_Module_Dictionaries; + Styles = (); +End + Module gid_Module_Root_Extension_Dictionary_Cs MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_CS ); Files = (gid_File_Extension_Dictionary_Cs); @@ -324,6 +323,17 @@ Module gid_Module_Root_Extension_Dictionary_Et Styles = (); End +Module gid_Module_Root_Extension_Dictionary_Fa + MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_FA ); + Files = (gid_File_Extension_Dictionary_Fa); + InstallOrder = "2000"; + Sortkey = "658"; + Spellcheckerlanguage = "fa"; + PackageInfo = "packinfo_office.txt"; + ParentID = gid_Module_Dictionaries; + Styles = (); +End + Module gid_Module_Root_Extension_Dictionary_Fr MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_FR ); Files = (gid_File_Extension_Dictionary_Fr); diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf index 95ccd76fca38..f6b94dd637e3 100644 --- a/scp2/source/ooo/module_ooo.ulf +++ b/scp2/source/ooo/module_ooo.ulf @@ -100,6 +100,12 @@ en-US = "Catalan" [STR_DESC_MODULE_EXTENSION_DICTIONARY_CA] en-US = "Catalan spelling dictionary, hyphenation rules, and thesaurus" +[STR_NAME_MODULE_EXTENSION_DICTIONARY_CKB] +en-US = "Central Kurdish" + +[STR_DESC_MODULE_EXTENSION_DICTIONARY_CKB] +en-US = "Central Kurdish spelling dictionary" + [STR_NAME_MODULE_EXTENSION_DICTIONARY_CS] en-US = "Czech" @@ -148,6 +154,12 @@ en-US = "Estonian" [STR_DESC_MODULE_EXTENSION_DICTIONARY_ET] en-US = "Estonian spelling dictionary, and hyphenation rules" +[STR_NAME_MODULE_EXTENSION_DICTIONARY_FA] +en-US = "Persian" + +[STR_DESC_MODULE_EXTENSION_DICTIONARY_FA] +en-US = "Persian Spell Checking Dictionary" + [STR_NAME_MODULE_EXTENSION_DICTIONARY_FR] en-US = "French" diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 30e06e4942f9..e36fb7215d2e 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -27,58 +27,6 @@ Directory gid_Dir_Ure_Share_Misc End #endif -// Public Dynamic Libraries: - -#ifdef AIX -Unixlink gid_Unixlink_File_Dl_Cppu - BIN_FILE_BODY; - Dir = SCP2_URE_DL_DIR; - Name = SCP2_URE_DL_UNO_NORMAL("cppu"); - Styles = (PACKED); - Target = SCP2_URE_DL_UNO_VER("cppu", "3"); -End -#endif - -#ifdef AIX -Unixlink gid_Unixlink_File_Dl_Cppuhelper - BIN_FILE_BODY; - Dir = SCP2_URE_DL_DIR; - Name = SCP2_URE_DL_UNO_COMID_NORMAL("cppuhelper"); - Styles = (PACKED); - Target = SCP2_URE_DL_UNO_COMID_VER("cppuhelper", "3"); -End -#endif - -#ifdef AIX -Unixlink gid_Unixlink_File_Dl_PurpEnvHelper - BIN_FILE_BODY; - Dir = SCP2_URE_DL_DIR; - Name = SCP2_URE_DL_UNO_COMID_NORMAL("purpenvhelper"); - Styles = (PACKED); - Target = SCP2_URE_DL_UNO_COMID_VER("purpenvhelper", "3"); -End -#endif - -#ifdef AIX -Unixlink gid_Unixlink_File_Dl_Sal - BIN_FILE_BODY; - Dir = SCP2_URE_DL_DIR; - Name = SCP2_URE_DL_UNO_NORMAL("sal"); - Styles = (PACKED); - Target = SCP2_URE_DL_UNO_VER("sal", "3"); -End -#endif - -#ifdef AIX -Unixlink gid_Unixlink_File_Dl_Salhelper - BIN_FILE_BODY; - Dir = SCP2_URE_DL_DIR; - Name = SCP2_URE_DL_UNO_COMID_NORMAL("salhelper"); - Styles = (PACKED); - Target = SCP2_URE_DL_UNO_COMID_VER("salhelper", "3"); -End -#endif - // Private Dynamic Libraries: #if defined _MSC_VER && ! defined _ARM64_ @@ -220,16 +168,6 @@ End #endif -#ifdef AIX -Unixlink gid_Unixlink_File_Dl_Libxml2 - BIN_FILE_BODY; - Dir = SCP2_URE_DL_DIR; - Name = SCP2_URE_DL_NORMAL("xml2"); - Styles = (PACKED); - Target = SCP2_URE_DL_VER("xml2", "2"); -End -#endif - // Public Miscellaneous Files: File gid_File_Misc_TypesRdb @@ -282,19 +220,8 @@ Module gid_Module_Root_Ure_Hidden gid_File_Lib_Cli_Cppuhelper_Assembly, gid_File_Lib_Policy_Cli_Cppuhelper_Assembly, gid_File_Lib_Policy_Cli_Cppuhelper_Config, - gid_Unixlink_File_Dl_Cppu, - gid_Unixlink_File_Dl_Cppuhelper, - gid_Unixlink_File_Dl_PurpEnvHelper, - gid_Unixlink_File_Dl_Sal, - gid_Unixlink_File_Dl_Salhelper, gid_File_Misc_TypesRdb, gid_File_Misc_ServicesRdb); - Unixlinks = (gid_Unixlink_File_Dl_Sal, - gid_Unixlink_File_Dl_Salhelper, - gid_Unixlink_File_Dl_Cppu, - gid_Unixlink_File_Dl_Cppuhelper, - gid_Unixlink_File_Dl_PurpEnvHelper, - gid_Unixlink_File_Dl_Libxml2); End // Windows Registry: diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp index 75ccf2b8d09d..3fe7af2b978b 100644 --- a/scp2/source/ooo/vc_redist.scp +++ b/scp2/source/ooo/vc_redist.scp @@ -18,16 +18,27 @@ #include "macros.inc" -#if defined(WITH_VC142_REDIST) +#if defined(WITH_VC_REDIST) +#if WITH_VC_REDIST == 143 + #define WINDOWS_X64_MERGEMODULE gid_MergeModule_Microsoft_VC143_CRT_x64 + #define WINDOWS_X64_MERGEMODULE_FILE "Microsoft_VC143_CRT_x64.msm" + #define WINDOWS_X86_MERGEMODULE gid_MergeModule_Microsoft_VC143_CRT_x86 + #define WINDOWS_X86_MERGEMODULE_FILE "Microsoft_VC143_CRT_x86.msm" +#elif WITH_VC_REDIST == 142 #define WINDOWS_X64_MERGEMODULE gid_MergeModule_Microsoft_VC142_CRT_x64 #define WINDOWS_X64_MERGEMODULE_FILE "Microsoft_VC142_CRT_x64.msm" #define WINDOWS_X86_MERGEMODULE gid_MergeModule_Microsoft_VC142_CRT_x86 #define WINDOWS_X86_MERGEMODULE_FILE "Microsoft_VC142_CRT_x86.msm" -#elif defined(WITH_VC141_REDIST) +#elif WITH_VC_REDIST == 141 #define WINDOWS_X64_MERGEMODULE gid_MergeModule_Microsoft_VC141_CRT_x64 #define WINDOWS_X64_MERGEMODULE_FILE "Microsoft_VC141_CRT_x64.msm" #define WINDOWS_X86_MERGEMODULE gid_MergeModule_Microsoft_VC141_CRT_x86 #define WINDOWS_X86_MERGEMODULE_FILE "Microsoft_VC141_CRT_x86.msm" +#else + // The next string will result in "malformed par file" error, terminating build as expected. + // Possibly a new version of CRT was enabled in configure.ac, but not handled here yet? + error: unknown VC redist version WITH_VC_REDIST. Check configure.ac +#endif #endif #if defined(WINDOWS_X86_MERGEMODULE) diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp index 116b437b1ed3..576daceeaf2a 100644 --- a/scp2/source/ooo/windowscustomaction_ooo.scp +++ b/scp2/source/ooo/windowscustomaction_ooo.scp @@ -16,26 +16,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "config_features.h" #include "macros.inc" -WindowsCustomAction gid_Customaction_RenamePrgFolder - Name = "RenamePrgFolder"; - Typ = "1"; - Source = "shlxtmsi.dll"; - Target = "RenamePrgFolder"; - Inbinarytable = 1; - Assignment1 = ("InstallExecuteSequence", "OLDPRODUCTS And Not REMOVE=\"ALL\" And Not PATCH", "ValidateProductID"); -End - -WindowsCustomAction gid_Customaction_RemovePrgFolder - Name = "RemovePrgFolder"; - Typ = "1"; - Source = "shlxtmsi.dll"; - Target = "RemovePrgFolder"; - Inbinarytable = 1; - Assignment1 = ("InstallExecuteSequence", "OLDPRODUCTS And Not REMOVE=\"ALL\" And Not PATCH", "end"); -End - WindowsCustomAction gid_Customaction_Regallmsdocdll Name = "Regallmsdocdll"; Typ = "65"; @@ -262,3 +245,34 @@ WindowsCustomAction gid_Customaction_prep_reg_dlls Inbinarytable = 1; Assignment1 = ("InstallExecuteSequence", "", "behind_CostFinalize"); End + +#if HAVE_FEATURE_UPDATE_MAR + +WindowsCustomAction gid_Customaction_prepare_updateservice + Name = "prepare_updateservice"; + Typ = "65"; + Source = "install_updateservice.dll"; + Target = "PrepareUpdateservice"; + Inbinarytable = 1; + Assignment1 = ("InstallExecuteSequence", "", "behind_CostFinalize"); +End + +WindowsCustomAction gid_Customaction_install_updateservice + Name = "install_updateservice"; + Typ = "3137"; + Source = "install_updateservice.dll"; + Target = "InstallUpdateservice"; + Inbinarytable = 1; + Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\"", "InstallFinalize"); +End + +WindowsCustomAction gid_Customaction_uninstall_updateservice + Name = "uninstall_updateservice"; + Typ = "3137"; + Source = "install_updateservice.dll"; + Target = "UninstallUpdateservice"; + Inbinarytable = 1; + Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\"", "UnpublishComponents"); +End + +#endif diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp index fd008624fd66..f1982cb49380 100644 --- a/scp2/source/python/file_python.scp +++ b/scp2/source/python/file_python.scp @@ -50,14 +50,5 @@ End #endif // SYSTEM_PYTHON -// Scripting Framework Python configuration settings - -File gid_File_Share_Registry_Pyuno_Xcd - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Brand_Dir_Share_Registry; - Name = "pyuno.xcd"; -End - // DISABLE_PYUNO #endif diff --git a/scp2/source/python/file_python_librelogo.scp b/scp2/source/python/file_python_librelogo.scp index 67f789f80045..8c0f0defc6c3 100644 --- a/scp2/source/python/file_python_librelogo.scp +++ b/scp2/source/python/file_python_librelogo.scp @@ -8,7 +8,6 @@ #include "macros.inc" -#ifndef AIX #ifndef DISABLE_PYUNO File gid_File_Share_Registry_LibreLogo_Xcd TXT_FILE_BODY; @@ -17,4 +16,3 @@ File gid_File_Share_Registry_LibreLogo_Xcd Name = "librelogo.xcd"; End #endif -#endif diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp index 343ad94029fb..62c1bdcd4dd6 100644 --- a/scp2/source/python/module_python.scp +++ b/scp2/source/python/module_python.scp @@ -46,8 +46,7 @@ Module gid_Module_Pyuno Files = (auto_python_ALL, gid_File_Pyuno_Rdb, gid_File_Lib_Python_So, - gid_File_Lib_Python3_So, - gid_File_Share_Registry_Pyuno_Xcd); + gid_File_Lib_Python3_So); Unixlinks = (gid_Unixlink_Python_Headers, gid_Unixlink_Python_LibreOfficePython, gid_Unixlink_Python_Resources, diff --git a/scp2/source/python/module_python_librelogo.scp b/scp2/source/python/module_python_librelogo.scp index 1102b8750252..a056d49acc3e 100644 --- a/scp2/source/python/module_python_librelogo.scp +++ b/scp2/source/python/module_python_librelogo.scp @@ -10,7 +10,6 @@ #include "AutoInstall/python_librelogo" -#ifndef AIX #ifndef DISABLE_PYUNO Module gid_Module_Optional_Pyuno_LibreLogo PackageInfo = "packinfo_office.txt"; @@ -23,4 +22,3 @@ Module gid_Module_Optional_Pyuno_LibreLogo Styles = ( ); End #endif -#endif diff --git a/scp2/source/writer/file_writer.scp b/scp2/source/writer/file_writer.scp index 28966fc7b696..d29e1594a48c 100644 --- a/scp2/source/writer/file_writer.scp +++ b/scp2/source/writer/file_writer.scp @@ -18,7 +18,7 @@ #include "macros.inc" -#if defined WITH_HELP +#if defined WITH_HELPPACKS File gid_File_Help_Swriter_Zip Dir = FILELIST_DIR; FILELIST_TXT_FILE_BODY_HELPPACK; diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp index 98859a881836..e8b931314a90 100644 --- a/scp2/source/writer/registryitem_writer.scp +++ b/scp2/source/writer/registryitem_writer.scp @@ -735,7 +735,7 @@ RegistryItem gid_Regitem_sxw_KindMap Value = "document"; End -// new odt file extension +// new odt file extension RegistryItem gid_Regitem_Odt_PersistentHandler ParentID = PREDEFINED_HKEY_CLASSES_ROOT; @@ -1024,7 +1024,7 @@ RegistryItem gid_Regitem_fodt_KindMap Value = "document"; End -// new ott file extension +// new ott file extension RegistryItem gid_Regitem_Ott_PersistentHandler ParentID = PREDEFINED_HKEY_CLASSES_ROOT; @@ -1167,7 +1167,7 @@ RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell_Printto_Command Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\""; End -// new odm file extension +// new odm file extension RegistryItem gid_Regitem_Odm_PersistentHandler ParentID = PREDEFINED_HKEY_CLASSES_ROOT; @@ -1317,7 +1317,7 @@ RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell_Printto_Command Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\""; End -// new oth file extension +// new oth file extension RegistryItem gid_Regitem_Oth_PersistentHandler ParentID = PREDEFINED_HKEY_CLASSES_ROOT; @@ -1763,6 +1763,7 @@ End CONDITIONAL_REGISTER_DOC_EXTENSION( Uot, gid_Module_Prg_Wrt_Other_Reg, uot, UOT, UNIFORM_OFFICE_FORMAT_TEXT, 1, swriter.exe, open, Writer ) CONDITIONAL_REGISTER_DOC_EXTENSION( Lwp, gid_Module_Prg_Wrt_Other_Reg, lwp, LWP, WORDPRO_DOCUMENT, 1, swriter.exe, open, Writer ) CONDITIONAL_REGISTER_DOC_EXTENSION( 602, gid_Module_Prg_Wrt_Other_Reg, 602, 602, T602_TEXT_FILE, 1, swriter.exe, open, Writer ) +CONDITIONAL_REGISTER_DOC_EXTENSION( Pages, gid_Module_Prg_Wrt_Other_Reg, pages, PAGES, PAGES_DOCUMENT, 1, swriter.exe, open, Writer ) // registering ms-word URI scheme handler CONDITIONAL_REGISTER_URI_HANDLER( ms-word, ms_word, gid_Module_Prg_Wrt_MSO_Reg, SELECT_WORD ) diff --git a/scp2/source/writer/registryitem_writer.ulf b/scp2/source/writer/registryitem_writer.ulf index 51e9cba9d9e2..db39d38ddd98 100644 --- a/scp2/source/writer/registryitem_writer.ulf +++ b/scp2/source/writer/registryitem_writer.ulf @@ -64,3 +64,5 @@ en-US = "Lotus Word Pro Document" [STR_REG_VAL_T602_TEXT_FILE] en-US = "T602 Text File" +[STR_REG_VAL_PAGES_DOCUMENT] +en-US = "Apple Pages" |