[Libreoffice-commits] .: Branch 'libreoffice-3-6' - reportbuilder/Extension_reportbuilder.mk

[David Tardon]

 reportbuilder/Extension_reportbuilder.mk |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit b1ca38aa592fa8b5adebb8832681babbf95e1eff
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Jul 25 10:57:13 2012 +0200

    fdo#52427 fix l10n of reportbuilder
    
    Change-Id: I9ff1b7329eca2faa560181c49d6c4527a008fead
    (cherry picked from commit dda589ba60ff5ea104d85f0a09759c954498a5c9)
    
    Signed-off-by: Michael Meeks <michael.meeks at suse.com>

diff --git a/reportbuilder/Extension_reportbuilder.mk b/reportbuilder/Extension_reportbuilder.mk
index 649a961..70d3408 100644
--- a/reportbuilder/Extension_reportbuilder.mk
+++ b/reportbuilder/Extension_reportbuilder.mk
@@ -64,27 +64,27 @@ $(eval $(call gb_Extension_add_files,report-builder,images,\
 ))
 
 $(eval $(call gb_Extension_add_files,report-builder,registry/data/org/openoffice,\
-	$(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Setup.xcu) \
+	$(call gb_XcuMergeTarget_get_target,reportbuilder/registry/data/org/openoffice/Setup.xcu) \
 ))
 
 $(eval $(call gb_Extension_add_files,report-builder,registry/data/org/openoffice/Office,\
-	$(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/Accelerators.xcu) \
-	$(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/DataAccess.xcu) \
-	$(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/Embedding.xcu) \
-	$(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu) \
+	$(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_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_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu) \
-	$(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.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) \
 ))
 
 $(eval $(call gb_Extension_add_files,report-builder,registry/data/org/openoffice/TypeDetection,\
-	$(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/TypeDetection/Filter.xcu) \
-	$(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/TypeDetection/Types.xcu) \
+	$(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) \
 ))
 
 $(eval $(call gb_Extension_add_files,report-builder,registry/schema/org/openoffice/Office,\