diff options
| author | David Tardon <dtardon@redhat.com> | 2012-04-08 15:12:18 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-04-08 15:12:18 +0200 |
| commit | fbbb833dda9e86d93e8f45f02a1286edb81033a3 (patch) | |
| tree | da6d2d88c5e6396ac2578a5ab9fd91be77862ae4 /sw | |
| parent | cd2c512f9f6b6aa000fa48efb18033b3ebb3a264 (diff) | |
compile- and run-time use of UNO must be split
There are unit tests that do not use URE, e.g., in cppuhelper.
This reverts commit 33e9f3d3d6b29545ef9df3f5334c015e15caa5c8.
Conflicts:
sot/CppunitTest_sot_test_sot.mk
svl/CppunitTest_svl_urihelper.mk
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/CppunitTest_sw_filters_test.mk | 2 | ||||
| -rw-r--r-- | sw/CppunitTest_sw_layout_test.mk | 2 | ||||
| -rw-r--r-- | sw/CppunitTest_sw_macros_test.mk | 2 | ||||
| -rw-r--r-- | sw/CppunitTest_sw_regression_test.mk | 2 | ||||
| -rw-r--r-- | sw/CppunitTest_sw_subsequent_ooxmltok.mk | 2 | ||||
| -rw-r--r-- | sw/CppunitTest_sw_subsequent_rtftok.mk | 2 | ||||
| -rw-r--r-- | sw/CppunitTest_sw_swdoc_test.mk | 2 |
7 files changed, 14 insertions, 0 deletions
diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk index ecfc8ce11c0b..d7f026eb1852 100644 --- a/sw/CppunitTest_sw_filters_test.mk +++ b/sw/CppunitTest_sw_filters_test.mk @@ -71,6 +71,8 @@ $(eval $(call gb_CppunitTest_use_api,sw_filters_test,\ udkapi \ )) +$(eval $(call gb_CppunitTest_uses_ure,sw_filters_test)) + $(eval $(call gb_CppunitTest_use_components,sw_filters_test,\ comphelper/util/comphelp \ configmgr/source/configmgr \ diff --git a/sw/CppunitTest_sw_layout_test.mk b/sw/CppunitTest_sw_layout_test.mk index 819babbae19f..b7d2d5d95cf1 100644 --- a/sw/CppunitTest_sw_layout_test.mk +++ b/sw/CppunitTest_sw_layout_test.mk @@ -81,6 +81,8 @@ $(eval $(call gb_CppunitTest_use_api,sw_layout_test,\ udkapi \ )) +$(eval $(call gb_CppunitTest_uses_ure,sw_layout_test)) + $(eval $(call gb_CppunitTest_use_components,sw_layout_test,\ comphelper/util/comphelp \ configmgr/source/configmgr \ diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk index 634f8f3d04b0..77e8bb178068 100644 --- a/sw/CppunitTest_sw_macros_test.mk +++ b/sw/CppunitTest_sw_macros_test.mk @@ -82,6 +82,8 @@ $(eval $(call gb_CppunitTest_use_api,sw_macros_test,\ udkapi \ )) +$(eval $(call gb_CppunitTest_uses_ure,sw_macros_test)) + $(eval $(call gb_CppunitTest_use_components,sw_macros_test,\ basic/util/sb \ comphelper/util/comphelp \ diff --git a/sw/CppunitTest_sw_regression_test.mk b/sw/CppunitTest_sw_regression_test.mk index c64a9d30df77..17680d887962 100644 --- a/sw/CppunitTest_sw_regression_test.mk +++ b/sw/CppunitTest_sw_regression_test.mk @@ -82,6 +82,8 @@ $(eval $(call gb_CppunitTest_use_api,sw_regression_test,\ udkapi \ )) +$(eval $(call gb_CppunitTest_uses_ure,sw_regression_test)) + $(eval $(call gb_CppunitTest_use_components,sw_regression_test,\ basic/util/sb \ comphelper/util/comphelp \ diff --git a/sw/CppunitTest_sw_subsequent_ooxmltok.mk b/sw/CppunitTest_sw_subsequent_ooxmltok.mk index db72f14b7918..f60f318734b5 100644 --- a/sw/CppunitTest_sw_subsequent_ooxmltok.mk +++ b/sw/CppunitTest_sw_subsequent_ooxmltok.mk @@ -48,6 +48,8 @@ $(eval $(call gb_CppunitTest_use_api,sw_subsequent_ooxmltok,\ udkapi \ )) +$(eval $(call gb_CppunitTest_uses_ure,sw_subsequent_ooxmltok)) + $(eval $(call gb_CppunitTest_use_components,sw_subsequent_ooxmltok,\ comphelper/util/comphelp \ configmgr/source/configmgr \ diff --git a/sw/CppunitTest_sw_subsequent_rtftok.mk b/sw/CppunitTest_sw_subsequent_rtftok.mk index a3e0f86f7a87..a3714a06c9e9 100644 --- a/sw/CppunitTest_sw_subsequent_rtftok.mk +++ b/sw/CppunitTest_sw_subsequent_rtftok.mk @@ -48,6 +48,8 @@ $(eval $(call gb_CppunitTest_use_api,sw_subsequent_rtftok,\ udkapi \ )) +$(eval $(call gb_CppunitTest_uses_ure,sw_subsequent_rtftok)) + $(eval $(call gb_CppunitTest_use_components,sw_subsequent_rtftok,\ configmgr/source/configmgr \ fileaccess/source/fileacc \ diff --git a/sw/CppunitTest_sw_swdoc_test.mk b/sw/CppunitTest_sw_swdoc_test.mk index 7629d1afd66e..13c9fb2414db 100644 --- a/sw/CppunitTest_sw_swdoc_test.mk +++ b/sw/CppunitTest_sw_swdoc_test.mk @@ -85,6 +85,8 @@ $(eval $(call gb_CppunitTest_use_api,sw_swdoc_test,\ udkapi \ )) +$(eval $(call gb_CppunitTest_uses_ure,sw_swdoc_test)) + $(eval $(call gb_CppunitTest_use_components,sw_swdoc_test,\ comphelper/util/comphelp \ configmgr/source/configmgr \ |