diff options
| author | Andras Timar <andras.timar@collabora.com> | 2023-12-17 17:37:51 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2024-01-15 14:35:24 +0100 |
| commit | f7d44a0d52dfc533af85a778ce258433b726a8a1 (patch) | |
| tree | 703c8dc5d0f5ac7cc64ff75189bfa6a4bd4d75b4 /officecfg | |
| parent | 68ed04e21674cdf25991e374839ef0fd35a3f2b0 (diff) | |
get rid of warnings when reportbuilder is not configured for build
In the LOK case for example, where there is no reportbuilder, there
were a lot of bogus warning messages at startup, confimgr complained
that there were translations for non existing configuration nodes,
all belonged to reportbuilder.
Change-Id: I7f9cef3206bddd9e333b97ee966fb950fbb352d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160887
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'officecfg')
| -rw-r--r-- | officecfg/Configuration_officecfg.mk | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk index fc5a4ed6ebe7..aa4eec7b054c 100644 --- a/officecfg/Configuration_officecfg.mk +++ b/officecfg/Configuration_officecfg.mk @@ -64,12 +64,16 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat org/openoffice/Setup-base.xcu \ org/openoffice/Setup-math.xcu \ org/openoffice/Setup-report.xcu \ - org/openoffice/Setup-reportbuilder.xcu \ + $(call gb_Helper_optional,REPORTBUILDER, \ + org/openoffice/Setup-reportbuilder.xcu \ + ) \ org/openoffice/Setup-start.xcu \ org/openoffice/UserProfile-unixdesktop.xcu \ org/openoffice/VCL-unixdesktop.xcu \ org/openoffice/Office/Accelerators-macosx.xcu \ - org/openoffice/Office/Accelerators-reportbuilder.xcu \ + $(call gb_Helper_optional,REPORTBUILDER, \ + org/openoffice/Office/Accelerators-reportbuilder.xcu \ + ) \ org/openoffice/Office/Accelerators-unxwnt.xcu \ $(call gb_Helper_optional,LIBRELOGO, \ org/openoffice/Office/Addons-librelogo.xcu \ @@ -93,7 +97,9 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat org/openoffice/Office/Common-ctl.xcu \ org/openoffice/Office/Common-ctlseqcheck.xcu \ org/openoffice/Office/DataAccess-evoab2.xcu \ - org/openoffice/Office/DataAccess-reportbuilder.xcu \ + $(call gb_Helper_optional,REPORTBUILDER, \ + org/openoffice/Office/DataAccess-reportbuilder.xcu \ + ) \ org/openoffice/Office/Paths-macosx.xcu \ org/openoffice/Office/Paths-unxwnt.xcu \ org/openoffice/Office/Paths-unixdesktop.xcu \ @@ -109,13 +115,17 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat org/openoffice/Office/Embedding-impress.xcu \ org/openoffice/Office/Embedding-math.xcu \ org/openoffice/Office/Embedding-base.xcu \ - org/openoffice/Office/Embedding-reportbuilder.xcu \ + $(call gb_Helper_optional,REPORTBUILDER, \ + org/openoffice/Office/Embedding-reportbuilder.xcu \ + ) \ org/openoffice/Office/Embedding-writer.xcu \ $(call gb_Helper_optional,LIBRELOGO, \ org/openoffice/Office/UI/WriterCommands-librelogo.xcu \ org/openoffice/Office/UI/WriterWindowState-librelogo.xcu \ ) \ - org/openoffice/Office/UI/Controller-reportbuilder.xcu \ + $(call gb_Helper_optional,REPORTBUILDER, \ + org/openoffice/Office/UI/Controller-reportbuilder.xcu \ + ) \ org/openoffice/Office/UI/Infobar-macosxsandbox.xcu \ org/openoffice/TypeDetection/UISort-writer.xcu \ org/openoffice/TypeDetection/UISort-calc.xcu \ @@ -145,7 +155,9 @@ $(eval $(call gb_Configuration_add_localized_datas,registry,officecfg/registry/d org/openoffice/Office/TableWizard.xcu \ org/openoffice/Office/UI.xcu \ org/openoffice/Office/Embedding.xcu \ - org/openoffice/Office/ExtendedColorScheme.xcu \ + $(call gb_Helper_optional,REPORTBUILDER, \ + org/openoffice/Office/ExtendedColorScheme.xcu \ + ) \ org/openoffice/Office/FormWizard.xcu \ org/openoffice/Office/Writer.xcu \ org/openoffice/Office/UI/BasicIDECommands.xcu \ @@ -160,7 +172,9 @@ $(eval $(call gb_Configuration_add_localized_datas,registry,officecfg/registry/d org/openoffice/Office/UI/DbQueryWindowState.xcu \ org/openoffice/Office/UI/DbTableWindowState.xcu \ org/openoffice/Office/UI/DbRelationWindowState.xcu \ - org/openoffice/Office/UI/DbReportWindowState.xcu \ + $(call gb_Helper_optional,REPORTBUILDER, \ + org/openoffice/Office/UI/DbReportWindowState.xcu \ + ) \ org/openoffice/Office/UI/DbBrowserWindowState.xcu \ org/openoffice/Office/UI/DbTableDataWindowState.xcu \ org/openoffice/Office/UI/DrawImpressCommands.xcu \ @@ -172,7 +186,9 @@ $(eval $(call gb_Configuration_add_localized_datas,registry,officecfg/registry/d org/openoffice/Office/UI/DrawWindowState.xcu \ org/openoffice/Office/UI/ImpressWindowState.xcu \ org/openoffice/Office/UI/MathWindowState.xcu \ - org/openoffice/Office/UI/ReportCommands.xcu \ + $(call gb_Helper_optional,REPORTBUILDER, \ + org/openoffice/Office/UI/ReportCommands.xcu \ + ) \ org/openoffice/Office/UI/Sidebar.xcu \ org/openoffice/Office/UI/StartModuleWindowState.xcu \ org/openoffice/Office/UI/WriterWindowState.xcu \ |