can use gb_CppunitTest_use_configuration and still access .ui files

after...

commit 506cab1a01b0481d0831a7a692a26dc5a5b55e91
Author: Caolán McNamara <caolanm@redhat.com>
Date:   Wed Apr 12 16:14:10 2017 +0100

take the .ui files from $BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR

Change-Id: I9cffdc092206c038da32a32a2cfe629e68b5c258

Change-Id: I906d16037cdf0b9203a4120cb1a5e9846a5c7b7f
Reviewed-on: https://gerrit.libreoffice.org/36482
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

21 files changed, 21 insertions, 39 deletions

diff --git a/basctl/CppunitTest_basctl_dialogs_test.mk b/basctl/CppunitTest_basctl_dialogs_test.mk
index 5a290bfee725..d45c8ab97d8b 100644
--- a/basctl/CppunitTest_basctl_dialogs_test.mk
+++ b/basctl/CppunitTest_basctl_dialogs_test.mk
@@ -61,8 +61,7 @@ $(eval $(call gb_CppunitTest_use_vcl_non_headless_with_windows,basctl_dialogs_te
 
 $(eval $(call gb_CppunitTest_use_rdb,basctl_dialogs_test,services))
 
-# $(eval $(call gb_CppunitTest_use_configuration,basctl_dialogs_test))
-$(eval $(call gb_CppunitTest_use_instdir_configuration,basctl_dialogs_test))
+$(eval $(call gb_CppunitTest_use_configuration,basctl_dialogs_test))
 
 $(eval $(call gb_CppunitTest_use_uiconfigs,basctl_dialogs_test,\
 	modules/BasicIDE \
diff --git a/chart2/CppunitTest_chart2_dialogs_test.mk b/chart2/CppunitTest_chart2_dialogs_test.mk
index 10c81d098747..edc36d1188d2 100644
--- a/chart2/CppunitTest_chart2_dialogs_test.mk
+++ b/chart2/CppunitTest_chart2_dialogs_test.mk
@@ -63,8 +63,7 @@ $(eval $(call gb_CppunitTest_use_vcl_non_headless_with_windows,chart2_dialogs_te
 
 $(eval $(call gb_CppunitTest_use_rdb,chart2_dialogs_test,services))
 
-# $(eval $(call gb_CppunitTest_use_configuration,chart2_dialogs_test))
-$(eval $(call gb_CppunitTest_use_instdir_configuration,chart2_dialogs_test))
+$(eval $(call gb_CppunitTest_use_configuration,chart2_dialogs_test))
 
 $(eval $(call gb_CppunitTest_use_uiconfigs,chart2_dialogs_test,\
 	modules/schart \
diff --git a/cui/CppunitTest_cui_dialogs_test.mk b/cui/CppunitTest_cui_dialogs_test.mk
index e1c07faeb8e2..cb6ae8dbf2c6 100644
--- a/cui/CppunitTest_cui_dialogs_test.mk
+++ b/cui/CppunitTest_cui_dialogs_test.mk
@@ -62,8 +62,7 @@ $(eval $(call gb_CppunitTest_use_vcl_non_headless_with_windows,cui_dialogs_test)
 
 $(eval $(call gb_CppunitTest_use_rdb,cui_dialogs_test,services))
 
-# $(eval $(call gb_CppunitTest_use_configuration,cui_dialogs_test))
-$(eval $(call gb_CppunitTest_use_instdir_configuration,cui_dialogs_test))
+$(eval $(call gb_CppunitTest_use_configuration,cui_dialogs_test))
 
 $(eval $(call gb_CppunitTest_use_uiconfigs,cui_dialogs_test,\
 	cui \
diff --git a/dbaccess/CppunitTest_dbaccess_dialogs_test.mk b/dbaccess/CppunitTest_dbaccess_dialogs_test.mk
index 704764bac605..a4c653dc0c3e 100644
--- a/dbaccess/CppunitTest_dbaccess_dialogs_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_dialogs_test.mk
@@ -61,8 +61,7 @@ $(eval $(call gb_CppunitTest_use_vcl_non_headless_with_windows,dbaccess_dialogs_
 
 $(eval $(call gb_CppunitTest_use_rdb,dbaccess_dialogs_test,services))
 
-# $(eval $(call gb_CppunitTest_use_configuration,dbaccess_dialogs_test))
-$(eval $(call gb_CppunitTest_use_instdir_configuration,dbaccess_dialogs_test))
+$(eval $(call gb_CppunitTest_use_configuration,dbaccess_dialogs_test))
 
 $(eval $(call gb_CppunitTest_use_uiconfigs,dbaccess_dialogs_test,\
 	dbaccess \
diff --git a/desktop/CppunitTest_desktop_dialogs_test.mk b/desktop/CppunitTest_desktop_dialogs_test.mk
index d8117a4689d6..d51f7c70089f 100644
--- a/desktop/CppunitTest_desktop_dialogs_test.mk
+++ b/desktop/CppunitTest_desktop_dialogs_test.mk
@@ -61,8 +61,7 @@ $(eval $(call gb_CppunitTest_use_vcl_non_headless_with_windows,desktop_dialogs_t
 
 $(eval $(call gb_CppunitTest_use_rdb,desktop_dialogs_test,services))
 
-# $(eval $(call gb_CppunitTest_use_configuration,desktop_dialogs_test))
-$(eval $(call gb_CppunitTest_use_instdir_configuration,desktop_dialogs_test))
+$(eval $(call gb_CppunitTest_use_configuration,desktop_dialogs_test))
 
 $(eval $(call gb_CppunitTest_use_uiconfigs,desktop_dialogs_test,\
 	desktop \
diff --git a/filter/CppunitTest_filter_dialogs_test.mk b/filter/CppunitTest_filter_dialogs_test.mk
index 5f98799d4e92..32dd32471aff 100644
--- a/filter/CppunitTest_filter_dialogs_test.mk
+++ b/filter/CppunitTest_filter_dialogs_test.mk
@@ -60,8 +60,7 @@ $(eval $(call gb_CppunitTest_use_vcl_non_headless_with_windows,filter_dialogs_te
 
 $(eval $(call gb_CppunitTest_use_rdb,filter_dialogs_test,services))
 
-# $(eval $(call gb_CppunitTest_use_configuration,filter_dialogs_test))
-$(eval $(call gb_CppunitTest_use_instdir_configuration,filter_dialogs_test))
+$(eval $(call gb_CppunitTest_use_configuration,filter_dialogs_test))
 
 $(eval $(call gb_CppunitTest_use_uiconfigs,filter_dialogs_test,\
 	filter \
diff --git a/formula/CppunitTest_formula_dialogs_test.mk b/formula/CppunitTest_formula_dialogs_test.mk
index 7cc881cab747..b3dd51eea949 100644
--- a/formula/CppunitTest_formula_dialogs_test.mk
+++ b/formula/CppunitTest_formula_dialogs_test.mk
@@ -55,8 +55,7 @@ $(eval $(call gb_CppunitTest_use_vcl_non_headless_with_windows,formula_dialogs_t
 
 $(eval $(call gb_CppunitTest_use_rdb,formula_dialogs_test,services))
 
-# $(eval $(call gb_CppunitTest_use_configuration,formula_dialogs_test))
-$(eval $(call gb_CppunitTest_use_instdir_configuration,formula_dialogs_test))
+$(eval $(call gb_CppunitTest_use_configuration,formula_dialogs_test))
 
 $(eval $(call gb_CppunitTest_use_uiconfigs,formula_dialogs_test,\
 	formula \
diff --git a/fpicker/CppunitTest_fpicker_dialogs_test.mk b/fpicker/CppunitTest_fpicker_dialogs_test.mk
index 1bf3ae17a9c3..92f8989aedc9 100644
--- a/fpicker/CppunitTest_fpicker_dialogs_test.mk
+++ b/fpicker/CppunitTest_fpicker_dialogs_test.mk
@@ -55,8 +55,7 @@ $(eval $(call gb_CppunitTest_use_vcl_non_headless_with_windows,fpicker_dialogs_t
 
 $(eval $(call gb_CppunitTest_use_rdb,fpicker_dialogs_test,services))
 
-# $(eval $(call gb_CppunitTest_use_configuration,fpicker_dialogs_test))
-$(eval $(call gb_CppunitTest_use_instdir_configuration,fpicker_dialogs_test))
+$(eval $(call gb_CppunitTest_use_configuration,fpicker_dialogs_test))
 
 $(eval $(call gb_CppunitTest_use_uiconfigs,fpicker_dialogs_test,\
 	fps \
diff --git a/reportdesign/CppunitTest_reportdesign_dialogs_test.mk b/reportdesign/CppunitTest_reportdesign_dialogs_test.mk
index 7ec61e8038ec..70b290f4cacf 100644
--- a/reportdesign/CppunitTest_reportdesign_dialogs_test.mk
+++ b/reportdesign/CppunitTest_reportdesign_dialogs_test.mk
@@ -61,8 +61,7 @@ $(eval $(call gb_CppunitTest_use_vcl_non_headless_with_windows,reportdesign_dial
 
 $(eval $(call gb_CppunitTest_use_rdb,reportdesign_dialogs_test,services))
 
-# $(eval $(call gb_CppunitTest_use_configuration,reportdesign_dialogs_test))
-$(eval $(call gb_CppunitTest_use_instdir_configuration,reportdesign_dialogs_test))
+$(eval $(call gb_CppunitTest_use_configuration,reportdesign_dialogs_test))
 
 $(eval $(call gb_CppunitTest_use_uiconfigs,reportdesign_dialogs_test,\
 	modules/dbreport \
diff --git a/sc/CppunitTest_sc_screenshots.mk b/sc/CppunitTest_sc_screenshots.mk
index ea42cb8b8c5d..0c0123a1824c 100644
--- a/sc/CppunitTest_sc_screenshots.mk
+++ b/sc/CppunitTest_sc_screenshots.mk
@@ -56,7 +56,7 @@ $(eval $(call gb_CppunitTest_use_vcl_non_headless_with_windows,sc_screenshots))
 
 $(eval $(call gb_CppunitTest_use_rdb,sc_screenshots,services))
 
-$(eval $(call gb_CppunitTest_use_instdir_configuration,sc_screenshots))
+$(eval $(call gb_CppunitTest_use_configuration,sc_screenshots))
 
 $(eval $(call gb_CppunitTest_use_uiconfigs,sc_screenshots,\
 	cui \
diff --git a/sd/CppunitTest_sd_dialogs_test.mk b/sd/CppunitTest_sd_dialogs_test.mk
index f82eca48bc95..0196d95befa5 100644
--- a/sd/CppunitTest_sd_dialogs_test.mk
+++ b/sd/CppunitTest_sd_dialogs_test.mk
@@ -65,8 +65,7 @@ $(eval $(call gb_CppunitTest_use_vcl_non_headless_with_windows,sd_dialogs_test))
 
 $(eval $(call gb_CppunitTest_use_rdb,sd_dialogs_test,services))
 
-# $(eval $(call gb_CppunitTest_use_configuration,sd_dialogs_test))
-$(eval $(call gb_CppunitTest_use_instdir_configuration,sd_dialogs_test))
+$(eval $(call gb_CppunitTest_use_configuration,sd_dialogs_test))
 
 $(eval $(call gb_CppunitTest_use_uiconfigs,sd_dialogs_test,\
 	modules/sdraw \
diff --git a/sfx2/CppunitTest_sfx2_classification.mk b/sfx2/CppunitTest_sfx2_classification.mk
index 1bdc56c5f558..a96a35afc483 100644
--- a/sfx2/CppunitTest_sfx2_classification.mk
+++ b/sfx2/CppunitTest_sfx2_classification.mk
@@ -36,7 +36,7 @@ $(eval $(call gb_CppunitTest_use_vcl,sfx2_classification))
 
 $(eval $(call gb_CppunitTest_use_rdb,sfx2_classification,services))
 
-$(eval $(call gb_CppunitTest_use_instdir_configuration,sfx2_classification))
+$(eval $(call gb_CppunitTest_use_configuration,sfx2_classification))
 
 $(eval $(call gb_CppunitTest_use_uiconfigs,sfx2_classification,\
 	svx \
diff --git a/sfx2/CppunitTest_sfx2_dialogs_test.mk b/sfx2/CppunitTest_sfx2_dialogs_test.mk
index 55129c0b1846..50d92d3d9a85 100644
--- a/sfx2/CppunitTest_sfx2_dialogs_test.mk
+++ b/sfx2/CppunitTest_sfx2_dialogs_test.mk
@@ -61,8 +61,7 @@ $(eval $(call gb_CppunitTest_use_vcl_non_headless_with_windows,sfx2_dialogs_test
 
 $(eval $(call gb_CppunitTest_use_rdb,sfx2_dialogs_test,services))
 
-# $(eval $(call gb_CppunitTest_use_configuration,sfx2_dialogs_test))
-$(eval $(call gb_CppunitTest_use_instdir_configuration,sfx2_dialogs_test))
+$(eval $(call gb_CppunitTest_use_configuration,sfx2_dialogs_test))
 
 $(eval $(call gb_CppunitTest_use_uiconfigs,sfx2_dialogs_test,\
 	sfx \
diff --git a/starmath/CppunitTest_starmath_dialogs_test.mk b/starmath/CppunitTest_starmath_dialogs_test.mk
index a1147f3efeb8..2f96dc546d66 100644
--- a/starmath/CppunitTest_starmath_dialogs_test.mk
+++ b/starmath/CppunitTest_starmath_dialogs_test.mk
@@ -60,8 +60,7 @@ $(eval $(call gb_CppunitTest_use_vcl_non_headless_with_windows,starmath_dialogs_
 
 $(eval $(call gb_CppunitTest_use_rdb,starmath_dialogs_test,services))
 
-# $(eval $(call gb_CppunitTest_use_configuration,starmath_dialogs_test))
-$(eval $(call gb_CppunitTest_use_instdir_configuration,starmath_dialogs_test))
+$(eval $(call gb_CppunitTest_use_configuration,starmath_dialogs_test))
 
 $(eval $(call gb_CppunitTest_use_uiconfigs,starmath_dialogs_test,\
 	modules/smath \
diff --git a/svtools/CppunitTest_svtools_dialogs_test.mk b/svtools/CppunitTest_svtools_dialogs_test.mk
index 7706985974a9..92c5f1ab03dd 100644
--- a/svtools/CppunitTest_svtools_dialogs_test.mk
+++ b/svtools/CppunitTest_svtools_dialogs_test.mk
@@ -61,8 +61,7 @@ $(eval $(call gb_CppunitTest_use_vcl_non_headless_with_windows,svtools_dialogs_t
 
 $(eval $(call gb_CppunitTest_use_rdb,svtools_dialogs_test,services))
 
-# $(eval $(call gb_CppunitTest_use_configuration,svtools_dialogs_test))
-$(eval $(call gb_CppunitTest_use_instdir_configuration,svtools_dialogs_test))
+$(eval $(call gb_CppunitTest_use_configuration,svtools_dialogs_test))
 
 $(eval $(call gb_CppunitTest_use_uiconfigs,svtools_dialogs_test,\
 	svt \
diff --git a/svx/CppunitTest_svx_dialogs_test.mk b/svx/CppunitTest_svx_dialogs_test.mk
index ff251ea31655..020e6ce6116d 100644
--- a/svx/CppunitTest_svx_dialogs_test.mk
+++ b/svx/CppunitTest_svx_dialogs_test.mk
@@ -63,8 +63,7 @@ $(eval $(call gb_CppunitTest_use_vcl_non_headless_with_windows,svx_dialogs_test)
 
 $(eval $(call gb_CppunitTest_use_rdb,svx_dialogs_test,services))
 
-# $(eval $(call gb_CppunitTest_use_configuration,svx_dialogs_test))
-$(eval $(call gb_CppunitTest_use_instdir_configuration,svx_dialogs_test))
+$(eval $(call gb_CppunitTest_use_configuration,svx_dialogs_test))
 
 $(eval $(call gb_CppunitTest_use_uiconfigs,svx_dialogs_test,\
 	svx \
diff --git a/sw/CppunitTest_sw_dialogs_test.mk b/sw/CppunitTest_sw_dialogs_test.mk
index 6be014b8a13b..8f1efa6343ed 100644
--- a/sw/CppunitTest_sw_dialogs_test.mk
+++ b/sw/CppunitTest_sw_dialogs_test.mk
@@ -66,8 +66,7 @@ $(eval $(call gb_CppunitTest_use_vcl_non_headless_with_windows,sw_dialogs_test))
 
 $(eval $(call gb_CppunitTest_use_rdb,sw_dialogs_test,services))
 
-# $(eval $(call gb_CppunitTest_use_configuration,sw_dialogs_test))
-$(eval $(call gb_CppunitTest_use_instdir_configuration,sw_dialogs_test))
+$(eval $(call gb_CppunitTest_use_configuration,sw_dialogs_test))
 
 $(eval $(call gb_CppunitTest_use_uiconfigs,sw_dialogs_test,\
 	modules/swriter \
diff --git a/sw/CppunitTest_sw_mailmerge.mk b/sw/CppunitTest_sw_mailmerge.mk
index 8d2a3f8ac75e..8d798c1788a4 100644
--- a/sw/CppunitTest_sw_mailmerge.mk
+++ b/sw/CppunitTest_sw_mailmerge.mk
@@ -79,7 +79,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_mailmerge, \
     xmloff/util/xo \
 ))
 
-$(eval $(call gb_CppunitTest_use_instdir_configuration,sw_mailmerge))
+$(eval $(call gb_CppunitTest_use_configuration,sw_mailmerge))
 $(eval $(call gb_CppunitTest_use_ure,sw_mailmerge))
 $(eval $(call gb_CppunitTest_use_vcl,sw_mailmerge))
 
diff --git a/uui/CppunitTest_uui_dialogs_test.mk b/uui/CppunitTest_uui_dialogs_test.mk
index 385c467712a8..85ea191ce923 100644
--- a/uui/CppunitTest_uui_dialogs_test.mk
+++ b/uui/CppunitTest_uui_dialogs_test.mk
@@ -60,8 +60,7 @@ $(eval $(call gb_CppunitTest_use_vcl_non_headless_with_windows,uui_dialogs_test)
 
 $(eval $(call gb_CppunitTest_use_rdb,uui_dialogs_test,services))
 
-# $(eval $(call gb_CppunitTest_use_configuration,uui_dialogs_test))
-$(eval $(call gb_CppunitTest_use_instdir_configuration,uui_dialogs_test))
+$(eval $(call gb_CppunitTest_use_configuration,uui_dialogs_test))
 
 $(eval $(call gb_CppunitTest_use_uiconfigs,uui_dialogs_test,\
 	uui \
diff --git a/vcl/CppunitTest_vcl_dialogs_test.mk b/vcl/CppunitTest_vcl_dialogs_test.mk
index d2ae83cb4c52..ce28195d9de7 100644
--- a/vcl/CppunitTest_vcl_dialogs_test.mk
+++ b/vcl/CppunitTest_vcl_dialogs_test.mk
@@ -60,8 +60,7 @@ $(eval $(call gb_CppunitTest_use_vcl_non_headless_with_windows,vcl_dialogs_test)
 
 $(eval $(call gb_CppunitTest_use_rdb,vcl_dialogs_test,services))
 
-# $(eval $(call gb_CppunitTest_use_configuration,vcl_dialogs_test))
-$(eval $(call gb_CppunitTest_use_instdir_configuration,vcl_dialogs_test))
+$(eval $(call gb_CppunitTest_use_configuration,vcl_dialogs_test))
 
 $(eval $(call gb_CppunitTest_use_uiconfigs,vcl_dialogs_test,\
 	vcl \
diff --git a/xmlsecurity/CppunitTest_xmlsecurity_dialogs_test.mk b/xmlsecurity/CppunitTest_xmlsecurity_dialogs_test.mk
index a5f609361480..875ffbcae731 100644
--- a/xmlsecurity/CppunitTest_xmlsecurity_dialogs_test.mk
+++ b/xmlsecurity/CppunitTest_xmlsecurity_dialogs_test.mk
@@ -60,8 +60,7 @@ $(eval $(call gb_CppunitTest_use_vcl_non_headless_with_windows,xmlsecurity_dialo
 
 $(eval $(call gb_CppunitTest_use_rdb,xmlsecurity_dialogs_test,services))
 
-# $(eval $(call gb_CppunitTest_use_configuration,xmlsecurity_dialogs_test))
-$(eval $(call gb_CppunitTest_use_instdir_configuration,xmlsecurity_dialogs_test))
+$(eval $(call gb_CppunitTest_use_configuration,xmlsecurity_dialogs_test))
 
 $(eval $(call gb_CppunitTest_use_uiconfigs,xmlsecurity_dialogs_test,\
 	xmlsec \