gbuild: fix XcuMergeTarget build breakage:

Introduce gb_XcuFile_for_extension function to use the right file
depending on WITH_LANG setting.

Change-Id: Ibe4fc4e28fe445fc9391b68d370039528eab7ed8

6 files changed, 23 insertions, 15 deletions

diff --git a/dictionaries b/dictionaries
-Subproject c918f1d4242d9fd9a8de284e6b32b8c00e59deb
+Subproject 53e9940d33caa1e8a00ddaadfb57e5d668d3537
diff --git a/reportbuilder/Extension_reportbuilder.mk b/reportbuilder/Extension_reportbuilder.mk
index 7309467dabcd..fd79c8783e6b 100644
--- a/reportbuilder/Extension_reportbuilder.mk
+++ b/reportbuilder/Extension_reportbuilder.mk
@@ -63,27 +63,27 @@ $(eval $(call gb_Extension_add_files,report-builder,images,\
 ))
 
 $(eval $(call gb_Extension_add_files,report-builder,registry/data/org/openoffice,\
-	$(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/Setup.xcu) \
+	$(call gb_XcuFile_for_extension,reportbuilder/registry/data/org/openoffice/Setup.xcu) \
 ))
 
 $(eval $(call gb_Extension_add_files,report-builder,registry/data/org/openoffice/Office,\
-	$(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/Accelerators.xcu) \
-	$(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/DataAccess.xcu) \
-	$(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/Embedding.xcu) \
-	$(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu) \
+	$(call gb_XcuFile_for_extension,reportbuilder/registry/data/org/openoffice/Office/Accelerators.xcu) \
+	$(call gb_XcuFile_for_extension,reportbuilder/registry/data/org/openoffice/Office/DataAccess.xcu) \
+	$(call gb_XcuFile_for_extension,reportbuilder/registry/data/org/openoffice/Office/Embedding.xcu) \
+	$(call gb_XcuFile_for_extension,reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu) \
 	$(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/Paths.xcu) \
 	$(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/ReportDesign.xcu) \
 ))
 
 $(eval $(call gb_Extension_add_files,report-builder,registry/data/org/openoffice/Office/UI,\
 	$(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/UI/Controller.xcu) \
-	$(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu) \
-	$(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu) \
+	$(call gb_XcuFile_for_extension,reportbuilder/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu) \
+	$(call gb_XcuFile_for_extension,reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu) \
 ))
 
 $(eval $(call gb_Extension_add_files,report-builder,registry/data/org/openoffice/TypeDetection,\
-	$(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/TypeDetection/Filter.xcu) \
-	$(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/TypeDetection/Types.xcu) \
+	$(call gb_XcuFile_for_extension,reportbuilder/registry/data/org/openoffice/TypeDetection/Filter.xcu) \
+	$(call gb_XcuFile_for_extension,reportbuilder/registry/data/org/openoffice/TypeDetection/Types.xcu) \
 ))
 
 $(eval $(call gb_Extension_add_files,report-builder,registry/schema/org/openoffice/Office,\
diff --git a/sdext/Extension_minimizer.mk b/sdext/Extension_minimizer.mk
index 17142fccf66b..8b56ab887dad 100644
--- a/sdext/Extension_minimizer.mk
+++ b/sdext/Extension_minimizer.mk
@@ -43,10 +43,10 @@ $(eval $(call gb_Extension_add_files,presentation-minimizer,bitmaps,\
 $(eval $(call gb_Extension_add_file,presentation-minimizer,registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs,$(call gb_XcsTarget_get_target,sdext/source/minimizer/registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs)))
 
 $(eval $(call gb_Extension_add_files,presentation-minimizer,registry/data/org/openoffice/Office,\
-    $(call gb_XcuMergeTarget_get_target,sdext/source/minimizer/registry/data/org/openoffice/Office/Addons.xcu) \
+    $(call gb_XcuFile_for_extension,sdext/source/minimizer/registry/data/org/openoffice/Office/Addons.xcu) \
     $(call gb_XcuDataTarget_get_target,sdext/source/minimizer/registry/data/org/openoffice/Office/ProtocolHandler.xcu) \
 ))
 
-$(eval $(call gb_Extension_add_file,presentation-minimizer,registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu,$(call gb_XcuMergeTarget_get_target,sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu)))
+$(eval $(call gb_Extension_add_file,presentation-minimizer,registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu,$(call gb_XcuFile_for_extension,sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu)))
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sdext/Extension_presenter.mk b/sdext/Extension_presenter.mk
index bdd584f0cc12..dd70aa67e4eb 100644
--- a/sdext/Extension_presenter.mk
+++ b/sdext/Extension_presenter.mk
@@ -130,7 +130,7 @@ $(eval $(call gb_Extension_add_files,presenter-screen,bitmaps,\
 
 $(eval $(call gb_Extension_add_file,presenter-screen,registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs,$(call gb_XcsTarget_get_target,sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs)))
 
-$(eval $(call gb_Extension_add_file,presenter-screen,registry/data/org/openoffice/Office/extension/PresenterScreen.xcu,$(call gb_XcuMergeTarget_get_target,sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu)))
+$(eval $(call gb_Extension_add_file,presenter-screen,registry/data/org/openoffice/Office/extension/PresenterScreen.xcu,$(call gb_XcuFile_for_extension,sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu)))
 
 $(eval $(call gb_Extension_add_files,presenter-screen,registry/data/org/openoffice/Office,\
     $(call gb_XcuDataTarget_get_target,sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu) \
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index d1d4aeb036c6..a73888e9dfd3 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -512,4 +512,12 @@ $(call gb_Configuration_get_preparation_target,$(1)) : $(call gb_Configuration_g
 
 endef
 
+# apparently extensions package the XcuMergeTarget directly...
+# trivial convenience function to get the right file:
+ifeq ($(gb_WITH_LANG),)
+gb_XcuFile_for_extension = $(call gb_Configuration__get_source,,$(1))
+else
+gb_XcuFile_for_extension = $(call gb_XcuMergeTarget_get_target,$(1))
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/swext/Extension_wiki-publisher.mk b/swext/Extension_wiki-publisher.mk
index 6f4e4a3d2eb4..ba28469fd6cd 100644
--- a/swext/Extension_wiki-publisher.mk
+++ b/swext/Extension_wiki-publisher.mk
@@ -36,14 +36,14 @@ $(eval $(call gb_Extension_add_file,wiki-publisher,commons-httpclient-3.1.jar,$(
 $(eval $(call gb_Extension_add_file,wiki-publisher,commons-lang-2.3.jar,$(OUTDIR)/bin/commons-lang-2.3.jar))
 $(eval $(call gb_Extension_add_file,wiki-publisher,commons-logging-1.1.1.jar,$(OUTDIR)/bin/commons-logging-1.1.1.jar))
 endif
-$(eval $(call gb_Extension_add_file,wiki-publisher,Addons.xcu,$(WORKDIR)/XcuMergeTarget/swext/mediawiki/src/registry/data/org/openoffice/Office/Addons.xcu))
+$(eval $(call gb_Extension_add_file,wiki-publisher,Addons.xcu,$(call gb_XcuFile_for_extension,swext/mediawiki/src/registry/data/org/openoffice/Office/Addons.xcu)))
 $(eval $(call gb_Extension_add_file,wiki-publisher,Filter.xcu,$(SRCDIR)/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Filter.xcu))
-$(eval $(call gb_Extension_add_file,wiki-publisher,OptionsDialog.xcu,$(WORKDIR)/XcuMergeTarget/swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu))
+$(eval $(call gb_Extension_add_file,wiki-publisher,OptionsDialog.xcu,$(call gb_XcuFile_for_extension,swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu)))
 $(eval $(call gb_Extension_add_file,wiki-publisher,Paths.xcu,$(SRCDIR)/swext/mediawiki/src/registry/data/org/openoffice/Office/Paths.xcu))
 $(eval $(call gb_Extension_add_file,wiki-publisher,ProtocolHandler.xcu,$(SRCDIR)/swext/mediawiki/src/registry/data/org/openoffice/Office/ProtocolHandler.xcu))
 $(eval $(call gb_Extension_add_file,wiki-publisher,Types.xcu,$(SRCDIR)/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Types.xcu))
 $(eval $(call gb_Extension_add_file,wiki-publisher,WikiExtension.xcs,$(SRCDIR)/swext/mediawiki/src/registry/schema/org/openoffice/Office/Custom/WikiExtension.xcs))
-$(eval $(call gb_Extension_add_file,wiki-publisher,WikiExtension.xcu,$(WORKDIR)/XcuMergeTarget/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu))
+$(eval $(call gb_Extension_add_file,wiki-publisher,WikiExtension.xcu,$(call gb_XcuFile_for_extension,swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu)))
 $(eval $(call gb_Extension_add_file,wiki-publisher,mediawiki.jar,$(OUTDIR)/bin/mediawiki.jar))
 $(eval $(call gb_Extension_add_file,wiki-publisher,components.rdb,$(SRCDIR)/swext/mediawiki/src/components.rdb))
 $(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/EditSetting.xdl,$(SRCDIR)/swext/mediawiki/dialogs/EditSetting.xdl))