these are not old component files anymore

10 files changed, 29 insertions, 53 deletions

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 \