diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-04-12 16:21:23 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2017-04-12 22:59:42 +0200 |
commit | 9f565f5cb628dcd32b05be7079dd5482e5cc19b9 (patch) | |
tree | 686e8d4db7cb6f2c7470028e82a33cf1e11660f5 /sw | |
parent | 76fbd18a515e531f1d238ab0b405212a032c53f2 (diff) |
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>
Diffstat (limited to 'sw')
-rw-r--r-- | sw/CppunitTest_sw_dialogs_test.mk | 3 | ||||
-rw-r--r-- | sw/CppunitTest_sw_mailmerge.mk | 2 |
2 files changed, 2 insertions, 3 deletions
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)) |