summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--android/qa/sc/Makefile7
-rw-r--r--extensions/CppunitTest_extensions_test_update.mk7
-rw-r--r--hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk6
-rw-r--r--lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk7
-rw-r--r--sc/CppunitTest_sc_cellrangesbase.mk9
-rw-r--r--sc/CppunitTest_sc_databaserangeobj.mk9
-rw-r--r--sc/CppunitTest_sc_datapilotfieldobj.mk9
-rw-r--r--sc/CppunitTest_sc_filters_test.mk6
-rw-r--r--sc/CppunitTest_sc_macros_test.mk9
-rw-r--r--sc/CppunitTest_sc_namedrangeobj.mk9
-rw-r--r--sc/CppunitTest_sc_spreadsheetobj.mk9
-rw-r--r--sc/CppunitTest_sc_subsequent_filters_test.mk6
-rw-r--r--sc/CppunitTest_sc_tableautoformatfield.mk9
-rw-r--r--sc/CppunitTest_sc_ucalc.mk7
-rw-r--r--sd/CppunitTest_sd_filters_test.mk6
-rw-r--r--sd/CppunitTest_sd_regression_test.mk12
-rw-r--r--sw/CppunitTest_sw_filters_test.mk20
-rw-r--r--sw/CppunitTest_sw_macros_test.mk9
-rw-r--r--sw/CppunitTest_sw_swdoc_test.mk15
-rw-r--r--writerfilter/CppunitTest_writerfilter_rtftok.mk9
20 files changed, 68 insertions, 112 deletions
diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 3499906605ad..cd09db12a7cd 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -132,13 +132,10 @@ copy-stuff:
for F in xml/ure/services; do \
sed -e 's!uri="vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/!uri="$(APP_DATA_PATH)/lib/!g' <$(OUTDIR)/$$F.rdb >assets/$$F.rdb; \
done
- for F in framework/util/fwk i18npool/util/i18npool sfx2/util/sfx unoxml/source/service/unoxml configmgr/source/configmgr; do \
+ for F in framework/util/fwk i18npool/util/i18npool sfx2/util/sfx ucb/source/core/ucb1 ucb/source/ucp/file/ucpfile1 unoxml/source/service/unoxml configmgr/source/configmgr; do \
mkdir -p assets/ComponentTarget/`dirname $$F`; \
sed -e 's!uri="vnd.sun.star.expand:$$LO_LIB_DIR/!uri="$(APP_DATA_PATH)/lib/!g' <$(WORKDIR)/ComponentTarget/$$F.component >assets/ComponentTarget/$$F.component; \
done
- for F in ucb1 ucpfile1; do \
- sed -e 's!uri="vnd.sun.star.expand:$$LO_LIB_DIR/!uri="$(APP_DATA_PATH)/lib/!g' <$(OUTDIR)/xml/$$F.component >assets/xml/$$F.component; \
- done
for F in uno_services uno_types; do \
sed -e 's!uri="./!uri="$(APP_DATA_PATH)/lib/!g' <$(SRC_ROOT)/testtools/$(INPATH)/lib/$$F.rdb >assets/lib/$$F.rdb; \
done
@@ -170,7 +167,7 @@ uninstall:
adb uninstall $(APP_PACKAGE)
run:
- echo "STAR_RESOURCEPATH=$(APP_DATA_PATH)/bin FONTCONFIG_FILE=$(APP_DATA_PATH)/etc/fonts/fonts.conf $(APP_DATA_PATH)/lib/libtest_sc_ucalc.so --headless --protector libunoexceptionprotector.so unoexceptionprotector '-env:CONFIGURATION_LAYERS=xcsxcu:file:///assets/xml/registry' '-env:UNO_TYPES=file:///assets/bin/udkapi.rdb file:///assets/bin/types.rdb' '-env:UNO_SERVICES=file:///assets/xml/ure/services.rdb file:///assets/ComponentTarget/framework/util/fwk.component file:///assets/ComponentTarget/i18npool/util/i18npool.component file:///assets/ComponentTarget/sfx2/util/sfx.component file:///assets/ComponentTarget/unoxml/source/service/unoxml.component file:///assets/ComponentTarget/configmgr/source/configmgr.component file:///assets/xml/ucb1.component file:///assets/xml/ucpfile1.component' -env:URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib -env:LO_LIB_DIR=file://$(APP_DATA_PATH)/lib" >cmdline
+ echo "STAR_RESOURCEPATH=$(APP_DATA_PATH)/bin FONTCONFIG_FILE=$(APP_DATA_PATH)/etc/fonts/fonts.conf $(APP_DATA_PATH)/lib/libtest_sc_ucalc.so --headless --protector libunoexceptionprotector.so unoexceptionprotector '-env:CONFIGURATION_LAYERS=xcsxcu:file:///assets/xml/registry' '-env:UNO_TYPES=file:///assets/bin/udkapi.rdb file:///assets/bin/types.rdb' '-env:UNO_SERVICES=file:///assets/xml/ure/services.rdb file:///assets/ComponentTarget/framework/util/fwk.component file:///assets/ComponentTarget/i18npool/util/i18npool.component file:///assets/ComponentTarget/sfx2/util/sfx.component file:///assets/ComponentTarget/unoxml/source/service/unoxml.component file:///assets/ComponentTarget/configmgr/source/configmgr.component file:///assets/ComponentTarget/ucb/source/core/ucb1.component file:///assets/ComponentTarget/ucb/source/ucp/file/ucpfile1.component' -env:URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib -env:LO_LIB_DIR=file://$(APP_DATA_PATH)/lib" >cmdline
adb push cmdline $(APP_DATA_PATH)/cmdline
adb shell am start -n $(APP_PACKAGE)/$(BOOTSTRAP) -e lo-main-library libcppunittester -e lo-main-indirect-cmdline "$(APP_DATA_PATH)/cmdline"
diff --git a/extensions/CppunitTest_extensions_test_update.mk b/extensions/CppunitTest_extensions_test_update.mk
index a81b5856735e..22c30bbc633b 100644
--- a/extensions/CppunitTest_extensions_test_update.mk
+++ b/extensions/CppunitTest_extensions_test_update.mk
@@ -71,14 +71,11 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,extensions_test_update,\
$(eval $(call gb_CppunitTest_add_components,extensions_test_update,\
configmgr/source/configmgr \
extensions/source/update/feed/updatefeed \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
unoxml/source/service/unoxml \
))
-$(eval $(call gb_CppunitTest_add_old_components,extensions_test_update,\
- ucb1 \
- ucpfile1 \
-))
-
$(eval $(call gb_CppunitTest_set_args,extensions_test_update,\
--headless \
--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
diff --git a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
index 7beda1af0092..540db598d38d 100644
--- a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
+++ b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
@@ -64,10 +64,8 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,hwpfilter_test_hwpfilter,\
$(eval $(call gb_CppunitTest_add_components,hwpfilter_test_hwpfilter,\
configmgr/source/configmgr \
hwpfilter/source/hwp \
-))
-$(eval $(call gb_CppunitTest_add_old_components,hwpfilter_test_hwpfilter,\
- ucb1 \
- ucpfile1 \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
))
$(eval $(call gb_CppunitTest_set_args,hwpfilter_test_hwpfilter,\
diff --git a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
index 0f73599532b8..72f87d6adf53 100644
--- a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
+++ b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
@@ -64,11 +64,8 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,lotuswordpro_test_lotuswordpro,\
$(eval $(call gb_CppunitTest_add_components,lotuswordpro_test_lotuswordpro,\
configmgr/source/configmgr \
lotuswordpro/util/lwpfilter \
-))
-
-$(eval $(call gb_CppunitTest_add_old_components,lotuswordpro_test_lotuswordpro,\
- ucb1 \
- ucpfile1 \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
))
$(eval $(call gb_CppunitTest_set_args,lotuswordpro_test_lotuswordpro,\
diff --git a/sc/CppunitTest_sc_cellrangesbase.mk b/sc/CppunitTest_sc_cellrangesbase.mk
index 051ee27292e8..3dff64379578 100644
--- a/sc/CppunitTest_sc_cellrangesbase.mk
+++ b/sc/CppunitTest_sc_cellrangesbase.mk
@@ -115,17 +115,14 @@ $(eval $(call gb_CppunitTest_add_components,sc_cellrangesbase,\
sot/util/sot \
svl/source/fsstor/fsstorage \
toolkit/util/tk \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+ ucb/source/ucp/tdoc/ucptdoc1 \
unotools/util/utl \
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
))
-$(eval $(call gb_CppunitTest_add_old_components,sc_cellrangesbase,\
- ucb1 \
- ucpfile1 \
- ucptdoc1 \
-))
-
$(eval $(call gb_CppunitTest_set_args,sc_cellrangesbase,\
--headless \
--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk
index 187f13a62342..a5ba678610f3 100644
--- a/sc/CppunitTest_sc_databaserangeobj.mk
+++ b/sc/CppunitTest_sc_databaserangeobj.mk
@@ -114,17 +114,14 @@ $(eval $(call gb_CppunitTest_add_components,sc_databaserangeobj,\
sot/util/sot \
svl/source/fsstor/fsstorage \
toolkit/util/tk \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+ ucb/source/ucp/tdoc/ucptdoc1 \
unotools/util/utl \
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
))
-$(eval $(call gb_CppunitTest_add_old_components,sc_databaserangeobj,\
- ucb1 \
- ucpfile1 \
- ucptdoc1 \
-))
-
$(eval $(call gb_CppunitTest_set_args,sc_databaserangeobj,\
--headless \
--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk
index 236ffb9e0184..8039eccb26bb 100644
--- a/sc/CppunitTest_sc_datapilotfieldobj.mk
+++ b/sc/CppunitTest_sc_datapilotfieldobj.mk
@@ -115,17 +115,14 @@ $(eval $(call gb_CppunitTest_add_components,sc_datapilotfieldobj,\
sot/util/sot \
svl/source/fsstor/fsstorage \
toolkit/util/tk \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+ ucb/source/ucp/tdoc/ucptdoc1 \
unotools/util/utl \
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
))
-$(eval $(call gb_CppunitTest_add_old_components,sc_datapilotfieldobj,\
- ucb1 \
- ucpfile1 \
- ucptdoc1 \
-))
-
$(eval $(call gb_CppunitTest_set_args,sc_datapilotfieldobj,\
--headless \
--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk
index 4ad57ba72010..259d308cd97c 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -111,6 +111,9 @@ $(eval $(call gb_CppunitTest_add_components,sc_filters_test,\
sot/util/sot \
svl/util/svl \
toolkit/util/tk \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+ ucb/source/ucp/tdoc/ucptdoc1 \
unotools/util/utl \
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
@@ -118,9 +121,6 @@ $(eval $(call gb_CppunitTest_add_components,sc_filters_test,\
$(eval $(call gb_CppunitTest_add_old_components,sc_filters_test,\
embobj \
- ucb1 \
- ucpfile1 \
- ucptdoc1 \
))
$(eval $(call gb_CppunitTest_set_args,sc_filters_test,\
diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk
index e760cb2e3eaa..b8205ac5b9b0 100644
--- a/sc/CppunitTest_sc_macros_test.mk
+++ b/sc/CppunitTest_sc_macros_test.mk
@@ -113,17 +113,14 @@ $(eval $(call gb_CppunitTest_add_components,sc_macros_test,\
sot/util/sot \
svl/source/fsstor/fsstorage \
toolkit/util/tk \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+ ucb/source/ucp/tdoc/ucptdoc1 \
unotools/util/utl \
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
))
-$(eval $(call gb_CppunitTest_add_old_components,sc_macros_test,\
- ucb1 \
- ucpfile1 \
- ucptdoc1 \
-))
-
$(eval $(call gb_CppunitTest_set_args,sc_macros_test,\
--headless \
--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk
index c41c29ef6141..ee96b029f26e 100644
--- a/sc/CppunitTest_sc_namedrangeobj.mk
+++ b/sc/CppunitTest_sc_namedrangeobj.mk
@@ -115,17 +115,14 @@ $(eval $(call gb_CppunitTest_add_components,sc_namedrangeobj,\
sot/util/sot \
svl/source/fsstor/fsstorage \
toolkit/util/tk \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+ ucb/source/ucp/tdoc/ucptdoc1 \
unotools/util/utl \
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
))
-$(eval $(call gb_CppunitTest_add_old_components,sc_namedrangeobj,\
- ucb1 \
- ucpfile1 \
- ucptdoc1 \
-))
-
$(eval $(call gb_CppunitTest_set_args,sc_namedrangeobj,\
--headless \
--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
diff --git a/sc/CppunitTest_sc_spreadsheetobj.mk b/sc/CppunitTest_sc_spreadsheetobj.mk
index f29818bbbb0c..62d32721d40e 100644
--- a/sc/CppunitTest_sc_spreadsheetobj.mk
+++ b/sc/CppunitTest_sc_spreadsheetobj.mk
@@ -114,17 +114,14 @@ $(eval $(call gb_CppunitTest_add_components,sc_spreadsheetobj,\
sot/util/sot \
svl/source/fsstor/fsstorage \
toolkit/util/tk \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+ ucb/source/ucp/tdoc/ucptdoc1 \
unotools/util/utl \
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
))
-$(eval $(call gb_CppunitTest_add_old_components,sc_spreadsheetobj,\
- ucb1 \
- ucpfile1 \
- ucptdoc1 \
-))
-
$(eval $(call gb_CppunitTest_set_args,sc_spreadsheetobj,\
--headless \
--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk
index 2fe33e98e372..a72b09fbc7d7 100644
--- a/sc/CppunitTest_sc_subsequent_filters_test.mk
+++ b/sc/CppunitTest_sc_subsequent_filters_test.mk
@@ -110,6 +110,9 @@ $(eval $(call gb_CppunitTest_add_components,sc_subsequent_filters_test,\
sot/util/sot \
svl/util/svl \
toolkit/util/tk \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+ ucb/source/ucp/tdoc/ucptdoc1 \
unotools/util/utl \
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
@@ -131,9 +134,6 @@ endif
$(eval $(call gb_CppunitTest_add_old_components,sc_subsequent_filters_test,\
embobj \
- ucb1 \
- ucpfile1 \
- ucptdoc1 \
))
$(eval $(call gb_CppunitTest_set_args,sc_subsequent_filters_test,\
diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk
index 1a65fa6b79b3..b8f1838df023 100644
--- a/sc/CppunitTest_sc_tableautoformatfield.mk
+++ b/sc/CppunitTest_sc_tableautoformatfield.mk
@@ -114,17 +114,14 @@ $(eval $(call gb_CppunitTest_add_components,sc_tableautoformatfield,\
sot/util/sot \
svl/source/fsstor/fsstorage \
toolkit/util/tk \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+ ucb/source/ucp/tdoc/ucptdoc1 \
unotools/util/utl \
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
))
-$(eval $(call gb_CppunitTest_add_old_components,sc_tableautoformatfield,\
- ucb1 \
- ucpfile1 \
- ucptdoc1 \
-))
-
$(eval $(call gb_CppunitTest_set_args,sc_tableautoformatfield,\
--headless \
--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
index 3862ff260f1b..f3d5c025c5f3 100644
--- a/sc/CppunitTest_sc_ucalc.mk
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -100,14 +100,11 @@ $(eval $(call gb_CppunitTest_add_components,sc_ucalc,\
framework/util/fwk \
i18npool/util/i18npool \
sfx2/util/sfx \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
unoxml/source/service/unoxml \
))
-$(eval $(call gb_CppunitTest_add_old_components,sc_ucalc,\
- ucb1 \
- ucpfile1 \
-))
-
$(eval $(call gb_CppunitTest_set_args,sc_ucalc,\
--headless \
--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk
index 9216515af219..b4de440d40b6 100644
--- a/sd/CppunitTest_sd_filters_test.mk
+++ b/sd/CppunitTest_sd_filters_test.mk
@@ -106,6 +106,9 @@ $(eval $(call gb_CppunitTest_add_components,sd_filters_test,\
sfx2/util/sfx \
sot/util/sot \
toolkit/util/tk \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+ ucb/source/ucp/tdoc/ucptdoc1 \
unotools/util/utl \
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
@@ -115,9 +118,6 @@ $(eval $(call gb_CppunitTest_add_components,sd_filters_test,\
$(eval $(call gb_CppunitTest_add_old_components,sd_filters_test,\
embobj \
- ucb1 \
- ucpfile1 \
- ucptdoc1 \
))
$(eval $(call gb_CppunitTest_set_args,sd_filters_test,\
diff --git a/sd/CppunitTest_sd_regression_test.mk b/sd/CppunitTest_sd_regression_test.mk
index 85b5c6d6409f..42a7d996761a 100644
--- a/sd/CppunitTest_sd_regression_test.mk
+++ b/sd/CppunitTest_sd_regression_test.mk
@@ -110,6 +110,12 @@ $(eval $(call gb_CppunitTest_add_components,sd_regression_test,\
sot/util/sot \
svl/source/fsstor/fsstorage \
toolkit/util/tk \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/expand/ucpexpand1 \
+ ucb/source/ucp/file/ucpfile1 \
+ ucb/source/ucp/gio/ucpgio \
+ ucb/source/ucp/package/ucppkg1 \
+ ucb/source/ucp/tdoc/ucptdoc1 \
unotools/util/utl \
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
@@ -119,12 +125,6 @@ $(eval $(call gb_CppunitTest_add_components,sd_regression_test,\
$(eval $(call gb_CppunitTest_add_old_components,sd_regression_test,\
embobj \
- ucb1 \
- ucpexpand1 \
- ucpfile1 \
- ucpgio \
- ucppkg1 \
- ucptdoc1 \
))
$(eval $(call gb_CppunitTest_set_args,sd_regression_test,\
diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk
index 34d6afba019e..ce85a4c25a8f 100644
--- a/sw/CppunitTest_sw_filters_test.mk
+++ b/sw/CppunitTest_sw_filters_test.mk
@@ -79,24 +79,24 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sw_filters_test,\
))
$(eval $(call gb_CppunitTest_add_components,sw_filters_test,\
+ comphelper/util/comphelp \
configmgr/source/configmgr \
- sw/util/sw \
- sw/util/msword \
- forms/util/frm \
dbaccess/util/dba \
- sfx2/util/sfx \
+ fileaccess/source/fileacc \
+ forms/util/frm \
framework/util/fwk \
+ i18npool/util/i18npool \
+ package/util/package2 \
+ sfx2/util/sfx \
+ sw/util/msword \
+ sw/util/sw \
toolkit/util/tk \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
unoxml/source/service/unoxml \
- fileaccess/source/fileacc \
- comphelper/util/comphelp \
- i18npool/util/i18npool \
- package/util/package2 \
))
$(eval $(call gb_CppunitTest_add_old_components,sw_filters_test,\
- ucb1 \
- ucpfile1 \
ucpchelp1 \
))
diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk
index 58d11faaf68a..0a2a81d0dc54 100644
--- a/sw/CppunitTest_sw_macros_test.mk
+++ b/sw/CppunitTest_sw_macros_test.mk
@@ -115,17 +115,14 @@ $(eval $(call gb_CppunitTest_add_components,sw_macros_test,\
sot/util/sot \
svl/source/fsstor/fsstorage \
toolkit/util/tk \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+ ucb/source/ucp/tdoc/ucptdoc1 \
unotools/util/utl \
unoxml/source/rdf/unordf \
unoxml/source/service/unoxml \
))
-$(eval $(call gb_CppunitTest_add_old_components,sw_macros_test,\
- ucb1 \
- ucpfile1 \
- ucptdoc1 \
-))
-
$(eval $(call gb_CppunitTest_set_args,sw_macros_test,\
--headless \
--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
diff --git a/sw/CppunitTest_sw_swdoc_test.mk b/sw/CppunitTest_sw_swdoc_test.mk
index 8cea3f7d514b..d5056ed3ac02 100644
--- a/sw/CppunitTest_sw_swdoc_test.mk
+++ b/sw/CppunitTest_sw_swdoc_test.mk
@@ -94,18 +94,15 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sw_swdoc_test,\
))
$(eval $(call gb_CppunitTest_add_components,sw_swdoc_test,\
+ comphelper/util/comphelp \
configmgr/source/configmgr \
- sfx2/util/sfx \
- framework/util/fwk \
- unoxml/source/service/unoxml \
fileaccess/source/fileacc \
- comphelper/util/comphelp \
+ framework/util/fwk \
i18npool/util/i18npool \
-))
-
-$(eval $(call gb_CppunitTest_add_old_components,sw_swdoc_test,\
- ucb1 \
- ucpfile1 \
+ sfx2/util/sfx \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+ unoxml/source/service/unoxml \
))
$(eval $(call gb_CppunitTest_set_args,sw_swdoc_test,\
diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk
index 737cde37a052..564a73adae18 100644
--- a/writerfilter/CppunitTest_writerfilter_rtftok.mk
+++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk
@@ -59,15 +59,12 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,writerfilter_rtftok,\
))
$(eval $(call gb_CppunitTest_add_components,writerfilter_rtftok,\
- configmgr/source/configmgr \
+ configmgr/source/configmgr \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
writerfilter/util/writerfilter \
))
-$(eval $(call gb_CppunitTest_add_old_components,writerfilter_rtftok,\
- ucb1 \
- ucpfile1 \
-))
-
$(eval $(call gb_CppunitTest_set_args,writerfilter_rtftok,\
--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \
"-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry)" \
generated by cgit (git 2.34.1) at 2024-07-29 05:55:30 +0000