diff options
Diffstat (limited to 'scp2')
-rw-r--r-- | scp2/InstallModule_ooo.mk | 1 | ||||
-rw-r--r-- | scp2/inc/macros.inc | 8 | ||||
-rw-r--r-- | scp2/macros/macro.pl | 10 | ||||
-rw-r--r-- | scp2/source/base/file_base.scp | 13 | ||||
-rw-r--r-- | scp2/source/base/module_base.scp | 9 | ||||
-rw-r--r-- | scp2/source/calc/file_calc.scp | 13 | ||||
-rw-r--r-- | scp2/source/calc/module_calc.scp | 6 | ||||
-rw-r--r-- | scp2/source/math/file_math.scp | 2 | ||||
-rw-r--r-- | scp2/source/math/module_math.scp | 2 | ||||
-rw-r--r-- | scp2/source/ooo/common_brand.scp | 8 | ||||
-rw-r--r-- | scp2/source/ooo/file_ooo.scp | 63 | ||||
-rw-r--r-- | scp2/source/ooo/file_resource_ooo.scp | 99 | ||||
-rw-r--r-- | scp2/source/ooo/module_lang_template.scp | 79 | ||||
-rw-r--r-- | scp2/source/templates/module_langpack_root.sct | 11 | ||||
-rw-r--r-- | scp2/source/writer/module_writer.scp | 2 |
15 files changed, 87 insertions, 239 deletions
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index ce564a51c130..a832cb20f665 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -64,7 +64,6 @@ $(eval $(call gb_InstallModule_add_scpfiles,scp2/ooo,\ scp2/source/ooo/file_extra_ooo \ scp2/source/ooo/file_library_ooo \ scp2/source/ooo/file_ooo \ - scp2/source/ooo/file_resource_ooo \ scp2/source/ooo/installation_ooo \ scp2/source/ooo/module_help_template \ scp2/source/ooo/module_hidden_ooo \ diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 7093a1c6f6b6..4f03fbe58d8e 100644 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -515,12 +515,12 @@ End #include <langmacros.inc> -#define UI_FILELIST_ALL_LANG(name, file) \ - File CONCAT3(gid_File_Share_Config_Sofficecfg_uiconfig_, name, _Lang) \ +#define MO_FILELIST_ALL_LANG(name) \ + File CONCAT3(gid_File_Res_, name, _Lang) \ TXT_FILE_BODY; \ Styles = (PACKED); \ - Dir = gid_Dir_Share_Config_Sofficecfg; \ - UI_ALL_LANG_BUT_EN_US(file); \ + Dir = gid_Dir_Resource; \ + MO_ALL_LANG_EXCEPT_EN_US_AND_QTZ(name); \ End #define URE_PRIVATE_LIB(id,name) \ diff --git a/scp2/macros/macro.pl b/scp2/macros/macro.pl index 4221315f924d..e034cfd98624 100644 --- a/scp2/macros/macro.pl +++ b/scp2/macros/macro.pl @@ -50,7 +50,7 @@ write_DIR_ISOLANGUAGE_ALL_LANG(); write_DIR_ISOLANGUAGE_ALL_LANG_LPROJ(); write_EXTRA_ALL_LANG(); write_EXTRA_ALL_LANG_BUT_EN_US(); -write_UI_ALL_LANG_BUT_EN_US(); +write_MO_ALL_LANG_EXCEPT_EN_US_AND_QTZ(); write_EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(); write_RESFILE_ALL_LANG(); write_README_ALL_LANG(); @@ -167,16 +167,16 @@ sub write_EXTRA_ALL_LANG_BUT_EN_US print OUTFILE "\n\n"; } -sub write_UI_ALL_LANG_BUT_EN_US +sub write_MO_ALL_LANG_EXCEPT_EN_US_AND_QTZ { - print OUTFILE "#define UI_ALL_LANG_BUT_EN_US(name) "; + print OUTFILE "#define MO_ALL_LANG_EXCEPT_EN_US_AND_QTZ(name) "; my $first = 1; foreach $lang (@completelangiso) { - if ($lang ne "en-US") { + if (($lang ne "en-US") and ($lang ne "qtz")) { print OUTFILE "; " unless $first; $first = 0; print OUTFILE - "\\\n\tName ($lang) = STRING(CONCAT2(name,/ui/res/$lang.zip))"; + "\\\n\tName ($lang) = STRING(CONCAT3($lang/LC_MESSAGES/,name,.mo))"; } } print OUTFILE "\n\n"; diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp index c8537dadcd06..5c50dd3b7af7 100644 --- a/scp2/source/base/file_base.scp +++ b/scp2/source/base/file_base.scp @@ -18,19 +18,6 @@ #include "macros.inc" -STD_RES_FILE( gid_File_Res_Abp, abp) - -STD_RES_FILE( gid_File_Res_Dbp, dbp) - -STD_RES_FILE( gid_File_Res_Dbu, dbu) - -STD_RES_FILE( gid_File_Res_Cnr, cnr) -STD_RES_FILE( gid_File_Res_Sdberr, sdberr) - -STD_RES_FILE( gid_File_Res_Rpt, rpt) - -STD_RES_FILE( gid_File_Res_Rptui, rptui) - #if defined WITH_HELP File gid_File_Help_Sdatabase_Zip Dir = FILELIST_DIR; diff --git a/scp2/source/base/module_base.scp b/scp2/source/base/module_base.scp index e8b71da7ab2a..783c8a49a01d 100644 --- a/scp2/source/base/module_base.scp +++ b/scp2/source/base/module_base.scp @@ -57,14 +57,7 @@ Module gid_Module_Langpack_Base_Template Name = "gid_Module_Langpack_Base_Template"; Description = "gid_Module_Langpack_Base_Template"; Styles = (TEMPLATEMODULE); - Files = (gid_File_Res_Abp, - gid_File_Res_Cnr, - gid_File_Res_Dbp, - gid_File_Res_Dbu, - gid_File_Res_Rpt, - gid_File_Res_Rptui, - gid_File_Res_Sdbcl, - gid_File_Res_Sdberr); + Files = (); End #include "alllangmodules_base.inc" diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp index eae330c8989b..75cbbbc119b9 100644 --- a/scp2/source/calc/file_calc.scp +++ b/scp2/source/calc/file_calc.scp @@ -25,14 +25,6 @@ File gid_File_Share_Registry_Calc_Xcd Name = "calc.xcd"; End -STD_RES_FILE( gid_File_Res_Analysis, analysis) - -STD_RES_FILE( gid_File_Res_Date, date) - -STD_RES_FILE( gid_File_Res_Pricing, pricing) - -STD_RES_FILE( gid_File_Res_Sc, sc ) - #if defined WITH_HELP File gid_File_Help_Scalc_Zip Dir = FILELIST_DIR; @@ -41,8 +33,3 @@ File gid_File_Help_Scalc_Zip End #endif -#if defined(WITH_LPSOLVER) - -STD_RES_FILE( gid_File_Res_Solver, solver) - -#endif diff --git a/scp2/source/calc/module_calc.scp b/scp2/source/calc/module_calc.scp index b81da8e1f22d..dd31007bb5ca 100644 --- a/scp2/source/calc/module_calc.scp +++ b/scp2/source/calc/module_calc.scp @@ -66,11 +66,7 @@ Module gid_Module_Langpack_Calc_Template Name = "gid_Module_Langpack_Calc_Template"; Description = "gid_Module_Langpack_Calc_Template"; Styles = (TEMPLATEMODULE); - Files = (gid_File_Res_Analysis, - gid_File_Res_Date, - gid_File_Res_Pricing, - gid_File_Res_Sc, - gid_File_Res_Solver); + Files = (); End Module gid_Module_Prg_Calc_MSO_Reg diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp index a7a75b5e643b..12877b8f1eda 100644 --- a/scp2/source/math/file_math.scp +++ b/scp2/source/math/file_math.scp @@ -18,8 +18,6 @@ #include "macros.inc" -STD_RES_FILE( gid_File_Res_Sm, sm ) - File gid_File_Share_Registry_Math_Xcd TXT_FILE_BODY; Styles = (PACKED); diff --git a/scp2/source/math/module_math.scp b/scp2/source/math/module_math.scp index c45e6500c654..c3054845d9f5 100644 --- a/scp2/source/math/module_math.scp +++ b/scp2/source/math/module_math.scp @@ -58,7 +58,7 @@ Module gid_Module_Langpack_Math_Template Name = "gid_Module_Langpack_Math_Template"; Description = "gid_Module_Langpack_Math_Template"; Styles = (TEMPLATEMODULE); - Files = (gid_File_Res_Sm); + Files = (); End #include "alllangmodules_math.inc" diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index a9e53ab7906e..e39a65e19ef1 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -638,6 +638,14 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Brand_Share_Subdir Value = LIBO_SHARE_FOLDER; End +ProfileItem gid_Brand_Profileitem_Fundamental_Brand_Resource_Subdir + ModuleID = gid_Module_Root_Brand; + ProfileID = gid_Brand_Profile_Fundamental_Ini; + Section = "Bootstrap"; + Key = "BRAND_SHARE_RESOURCE_SUBDIR"; + Value = LIBO_SHARE_RESOURCE_FOLDER; +End + ProfileItem gid_Brand_Profileitem_Fundamental_Brand_Bin_Subdir ModuleID = gid_Module_Root_Brand; ProfileID = gid_Brand_Profile_Fundamental_Ini; diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index bd57e8287ada..ea8eddc16635 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -27,8 +27,6 @@ #include "macros.inc" -STD_RES_FILE( gid_File_Res_Eps, eps ) - #if defined WITH_HELP File gid_File_Help_Common_Zip Dir = FILELIST_DIR; @@ -177,33 +175,40 @@ UI_FILELIST(vcl, "UIConfig/vcl.filelist") UI_FILELIST(writerperfect, "UIConfig/writerperfect.filelist") UI_FILELIST(xmlsec, "UIConfig/xmlsec.filelist") -UI_FILELIST_ALL_LANG(basicide, modules/BasicIDE) -UI_FILELIST_ALL_LANG(cui, cui) -#ifdef DBCONNECTIVITY -UI_FILELIST_ALL_LANG(dbaccess, dbaccess) -UI_FILELIST_ALL_LANG(dbreport, modules/dbreport) -UI_FILELIST_ALL_LANG(sbibliography, modules/sbibliography) -UI_FILELIST_ALL_LANG(spropctrlr, modules/spropctrlr) -#endif -UI_FILELIST_ALL_LANG(desktop, desktop) -UI_FILELIST_ALL_LANG(editeng, editeng) -UI_FILELIST_ALL_LANG(filter, filter) -UI_FILELIST_ALL_LANG(formula, formula) -UI_FILELIST_ALL_LANG(fps, fps) -UI_FILELIST_ALL_LANG(sabpilot, modules/sabpilot) -UI_FILELIST_ALL_LANG(scalc, modules/scalc) -UI_FILELIST_ALL_LANG(scanner, modules/scanner) -UI_FILELIST_ALL_LANG(schart, modules/schart) -UI_FILELIST_ALL_LANG(sdraw, modules/sdraw) -UI_FILELIST_ALL_LANG(sfx, sfx) -UI_FILELIST_ALL_LANG(simpress, modules/simpress) -UI_FILELIST_ALL_LANG(smath, modules/smath) -UI_FILELIST_ALL_LANG(svt, svt) -UI_FILELIST_ALL_LANG(svx, svx) -UI_FILELIST_ALL_LANG(swriter, modules/swriter) -UI_FILELIST_ALL_LANG(uui, uui) -UI_FILELIST_ALL_LANG(vcl, vcl) -UI_FILELIST_ALL_LANG(xmlsec, xmlsec) +MO_FILELIST_ALL_LANG(acc) +MO_FILELIST_ALL_LANG(avmedia) +#ifndef DISABLE_SCRIPTING +MO_FILELIST_ALL_LANG(basctl) +#endif +MO_FILELIST_ALL_LANG(chart) +MO_FILELIST_ALL_LANG(cnr) +MO_FILELIST_ALL_LANG(cui) +MO_FILELIST_ALL_LANG(dba) +MO_FILELIST_ALL_LANG(dkt) +MO_FILELIST_ALL_LANG(editeng) +MO_FILELIST_ALL_LANG(flt) +MO_FILELIST_ALL_LANG(for) +MO_FILELIST_ALL_LANG(fps) +MO_FILELIST_ALL_LANG(frm) +MO_FILELIST_ALL_LANG(fwk) +MO_FILELIST_ALL_LANG(pcr) +MO_FILELIST_ALL_LANG(rpt) +MO_FILELIST_ALL_LANG(sb) +MO_FILELIST_ALL_LANG(sc) +MO_FILELIST_ALL_LANG(sca) +MO_FILELIST_ALL_LANG(scc) +MO_FILELIST_ALL_LANG(sd) +MO_FILELIST_ALL_LANG(sfx) +MO_FILELIST_ALL_LANG(sm) +MO_FILELIST_ALL_LANG(svl) +MO_FILELIST_ALL_LANG(svt) +MO_FILELIST_ALL_LANG(svx) +MO_FILELIST_ALL_LANG(sw) +MO_FILELIST_ALL_LANG(uui) +MO_FILELIST_ALL_LANG(vcl) +MO_FILELIST_ALL_LANG(wiz) +MO_FILELIST_ALL_LANG(wpt) +MO_FILELIST_ALL_LANG(xsc) #if defined UNX && ! defined MACOSX diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp deleted file mode 100644 index ac90ee812f5a..000000000000 --- a/scp2/source/ooo/file_resource_ooo.scp +++ /dev/null @@ -1,99 +0,0 @@ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "macros.inc" - -#ifndef DISABLE_SCRIPTING - -STD_RES_FILE( gid_File_Res_Basctl, basctl) - -#endif - -STD_RES_FILE( gid_File_Res_Bib, bib ) - -STD_RES_FILE( gid_File_Res_Chartcontroller, chartcontroller ) - -STD_RES_FILE( gid_File_Res_Dba, dba) - -STD_RES_FILE( gid_File_Res_Sdbt, sdbt) - -STD_RES_FILE( gid_File_Res_Dbmm, dbmm) - -STD_RES_FILE( gid_File_Res_Dbw, dbw ) - -STD_RES_FILE( gid_File_Res_Dkt, dkt) - -STD_RES_FILE( gid_File_Res_Frm, frm) - -STD_RES_FILE( gid_File_Res_Fwe, fwe) - -STD_RES_FILE( gid_File_Res_Fps_Office, fps_office) - -STD_RES_FILE( gid_File_Res_Gal, gal ) - -STD_RES_FILE( gid_File_Res_Deployment, deployment ) -STD_RES_FILE( gid_File_Res_DeploymentGui, deploymentgui ) - -STD_RES_FILE( gid_File_Res_Pcr, pcr) - -STD_RES_FILE( gid_File_Res_Pdffilter, pdffilter) - -#ifdef UNX - -STD_RES_FILE( gid_File_Res_San, scn ) - -#endif - -STD_RES_FILE( gid_File_Res_Sd, sd ) - -STD_RES_FILE( gid_File_Res_Sfx, sfx ) - -STD_RES_FILE( gid_File_Res_Sb, sb ) - -STD_RES_FILE( gid_File_Res_Svl, svl ) - -STD_RES_FILE( gid_File_Res_Svt, svt ) - -STD_RES_FILE( gid_File_Res_Svx, svx ) -STD_RES_FILE( gid_File_Res_Editeng, editeng ) - -STD_RES_FILE( gid_File_Res_Cui, cui ) - -STD_RES_FILE( gid_File_Res_Sw, sw ) - - -STD_RES_FILE( gid_File_Res_Acc, acc ) - -STD_RES_FILE( gid_File_Res_Uui, uui ) - -STD_RES_FILE( gid_File_Res_Vcl, vcl ) - -STD_RES_FILE( gid_File_Res_Writerperfect, writerperfect ) - -STD_RES_FILE( gid_File_Res_Xsltdlg, xsltdlg ) - -STD_RES_FILE( gid_File_Res_AVMedia, avmedia ) - -STD_RES_FILE( gid_File_Res_XMLSecurity, xmlsec ) - -STD_RES_FILE( gid_File_Res_Upd, upd ) - -STD_RES_FILE( gid_File_Res_T602Filter, t602filter ) - -STD_RES_FILE( gid_File_Res_Forui, forui ) -STD_RES_FILE( gid_File_Res_For, for ) diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp index 2b2f86f0342b..0455a4e75133 100644 --- a/scp2/source/ooo/module_lang_template.scp +++ b/scp2/source/ooo/module_lang_template.scp @@ -49,6 +49,38 @@ Module gid_Module_Langpack_Basis_Template gid_File_Share_Config_Sofficecfg_uiconfig_uui_Lang, gid_File_Share_Config_Sofficecfg_uiconfig_vcl_Lang, gid_File_Share_Config_Sofficecfg_uiconfig_xmlsec_Lang, + gid_File_Res_acc_Lang, + gid_File_Res_avmedia_Lang, + gid_File_Res_basctl_Lang, + gid_File_Res_chart_Lang, + gid_File_Res_cnr_Lang, + gid_File_Res_cui_Lang, + gid_File_Res_dba_Lang, + gid_File_Res_dkt_Lang, + gid_File_Res_editeng_Lang, + gid_File_Res_flt_Lang, + gid_File_Res_for_Lang, + gid_File_Res_fps_Lang, + gid_File_Res_frm_Lang, + gid_File_Res_fwk_Lang, + gid_File_Res_pcr_Lang, + gid_File_Res_rpt_Lang, + gid_File_Res_sb_Lang, + gid_File_Res_sc_Lang, + gid_File_Res_sca_Lang, + gid_File_Res_scc_Lang, + gid_File_Res_sd_Lang, + gid_File_Res_sfx_Lang, + gid_File_Res_sm_Lang, + gid_File_Res_svl_Lang, + gid_File_Res_svt_Lang, + gid_File_Res_svx_Lang, + gid_File_Res_sw_Lang, + gid_File_Res_uui_Lang, + gid_File_Res_vcl_Lang, + gid_File_Res_wiz_Lang, + gid_File_Res_wpt_Lang, + gid_File_Res_xsc_Lang, gid_File_Extra_Autotextshare_Lang, gid_File_Registry_Filter_Zip, gid_File_Registry_Lang, @@ -59,53 +91,6 @@ Module gid_Module_Langpack_Basis_Template gid_Dir_Autotext_Language); End -Module gid_Module_Langpack_Resource_Template - ParentID = gid_Module_Langpack_Languageroot; - Name = "gid_Module_Langpack_Resource_Template"; - Description = "gid_Module_Langpack_Resource_Template"; - Styles = (TEMPLATEMODULE); - Files = (gid_File_Res_Basctl, - gid_File_Res_Bib, - gid_File_Res_Chartcontroller, - gid_File_Res_Sdbt, - gid_File_Res_Dbmm, - gid_File_Res_Dba, - gid_File_Res_Dbw, - gid_File_Res_Dkt, - gid_File_Res_Editeng, - gid_File_Res_For, - gid_File_Res_Forui, - gid_File_Res_Fps_Office, - gid_File_Res_Frm, - gid_File_Res_Fwe, - gid_File_Res_Gal, - gid_File_Res_Deployment, - gid_File_Res_DeploymentGui, - gid_File_Res_Pcr, - gid_File_Res_Pdffilter, - gid_File_Res_San, - gid_File_Res_Sb, - gid_File_Res_Sd, - gid_File_Res_Sfx, - gid_File_Res_Spa, - gid_File_Res_Svl, - gid_File_Res_Svt, - gid_File_Res_Svx, - gid_File_Res_Cui, - gid_File_Res_Sw, - gid_File_Res_Tk, - gid_File_Res_Acc, - gid_File_Res_Uui, - gid_File_Res_Vcl, - gid_File_Res_Writerperfect, - gid_File_Res_Wzi, - gid_File_Res_Xsltdlg, - gid_File_Res_AVMedia, - gid_File_Res_XMLSecurity, - gid_File_Res_Eps, - gid_File_Res_UpdChk, - gid_File_Res_Upd); -End Module gid_Module_Langpack_Fonts_Template ParentID = gid_Module_Langpack_Languageroot; Name = "gid_Module_Langpack_Fonts_Template"; diff --git a/scp2/source/templates/module_langpack_root.sct b/scp2/source/templates/module_langpack_root.sct index 48b96531d22f..eb0b7764bb82 100644 --- a/scp2/source/templates/module_langpack_root.sct +++ b/scp2/source/templates/module_langpack_root.sct @@ -28,17 +28,6 @@ Module gid_Module_Langpack_Basis_<LANGUAGE_> Styles =(HIDDEN_ROOT, LANGUAGEMODULE); End -Module gid_Module_Langpack_Resource_<LANGUAGE_> - ParentID = gid_Module_Langpack_Root_<LANGUAGE_>; - Sortkey = "100"; - Language = "<LANGUAGE>"; - Assigns = gid_Module_Langpack_Resource_Template; - Name = "gid_Module_Langpack_Resource_<LANGUAGE_>"; - Description = "gid_Module_Langpack_Resource_<LANGUAGE_>"; - PackageInfo = "packinfo_office_lang.txt"; - Styles =(HIDDEN_ROOT, LANGUAGEMODULE); -End - Module gid_Module_Langpack_Fonts_<LANGUAGE_> ParentID = gid_Module_Langpack_Root_<LANGUAGE_>; Sortkey = "300"; diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp index 917868951be9..9a0ed77ac4b8 100644 --- a/scp2/source/writer/module_writer.scp +++ b/scp2/source/writer/module_writer.scp @@ -57,7 +57,7 @@ Module gid_Module_Langpack_Writer_Template Name = "gid_Module_Langpack_Writer_Template"; Description = "gid_Module_Langpack_Writer_Template"; Styles = (TEMPLATEMODULE); - Files = (gid_File_Res_T602Filter); + Files = (); End Module gid_Module_Prg_Wrt_MSO_Reg |