can use gb_CppunitTest_use_configuration and still access .ui files

after...

commit 506cab1a
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/36482Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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))
 

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 \

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 \

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 \