diff options
-rw-r--r-- | extensions/CppunitTest_extensions_test_update.mk | 2 | ||||
-rw-r--r-- | hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk | 2 | ||||
-rw-r--r-- | lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk | 4 | ||||
-rw-r--r-- | sc/CppunitTest_sc_cellrangesbase.mk | 2 | ||||
-rw-r--r-- | sc/CppunitTest_sc_datapilotfieldobj.mk | 2 | ||||
-rw-r--r-- | sc/CppunitTest_sc_filters_test.mk | 2 | ||||
-rw-r--r-- | sc/CppunitTest_sc_macros_test.mk | 2 | ||||
-rw-r--r-- | sc/CppunitTest_sc_namedrangeobj.mk | 2 | ||||
-rw-r--r-- | sc/CppunitTest_sc_subsequent_filters_test.mk | 2 | ||||
-rw-r--r-- | sc/CppunitTest_sc_tableautoformatfield.mk | 2 | ||||
-rw-r--r-- | sc/CppunitTest_sc_ucalc.mk | 2 | ||||
-rw-r--r-- | sd/CppunitTest_sd_filters_test.mk | 2 | ||||
-rw-r--r-- | sd/CppunitTest_sd_uimpress.mk | 5 | ||||
-rw-r--r-- | starmath/CppunitTest_starmath_qa_cppunit.mk | 2 | ||||
-rw-r--r-- | svtools/CppunitTest_svtools_filters_test.mk | 4 | ||||
-rw-r--r-- | sw/CppunitTest_sw_filters_test.mk | 2 | ||||
-rw-r--r-- | sw/CppunitTest_sw_macros_test.mk | 2 | ||||
-rw-r--r-- | sw/CppunitTest_sw_swdoc_test.mk | 2 | ||||
-rw-r--r-- | writerfilter/CppunitTest_writerfilter_rtftok.mk | 2 |
19 files changed, 21 insertions, 24 deletions
diff --git a/extensions/CppunitTest_extensions_test_update.mk b/extensions/CppunitTest_extensions_test_update.mk index 4184fea2bcc3..3db886b0a524 100644 --- a/extensions/CppunitTest_extensions_test_update.mk +++ b/extensions/CppunitTest_extensions_test_update.mk @@ -66,11 +66,11 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,extensions_test_update,\ )) $(eval $(call gb_CppunitTest_add_components,extensions_test_update,\ + configmgr/source/configmgr \ unoxml/source/service/unoxml \ )) $(eval $(call gb_CppunitTest_add_old_components,extensions_test_update,\ - configmgr \ ucb1 \ ucpfile1 \ updatefeed \ diff --git a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk index 48eb28cff665..c0ec1c154804 100644 --- a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk +++ b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk @@ -65,7 +65,7 @@ $(eval $(call gb_CppunitTest_add_components,hwpfilter_test_hwpfilter,\ hwpfilter/source/hwp \ )) $(eval $(call gb_CppunitTest_add_old_components,hwpfilter_test_hwpfilter,\ - configmgr \ + configmgr/source/configmgr \ ucb1 \ ucpfile1 \ )) diff --git a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk index 88010ae4995e..0f73599532b8 100644 --- a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk +++ b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk @@ -62,11 +62,11 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,lotuswordpro_test_lotuswordpro,\ )) $(eval $(call gb_CppunitTest_add_components,lotuswordpro_test_lotuswordpro,\ - lotuswordpro/util/lwpfilter,\ + configmgr/source/configmgr \ + lotuswordpro/util/lwpfilter \ )) $(eval $(call gb_CppunitTest_add_old_components,lotuswordpro_test_lotuswordpro,\ - configmgr \ ucb1 \ ucpfile1 \ )) diff --git a/sc/CppunitTest_sc_cellrangesbase.mk b/sc/CppunitTest_sc_cellrangesbase.mk index dd1028f040c7..07822e5d0c0e 100644 --- a/sc/CppunitTest_sc_cellrangesbase.mk +++ b/sc/CppunitTest_sc_cellrangesbase.mk @@ -93,6 +93,7 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sc_cellrangesbase,\ $(eval $(call gb_CppunitTest_add_components,sc_cellrangesbase,\ basic/util/sb \ comphelper/util/comphelp \ + configmgr/source/configmgr \ dbaccess/util/dba \ fileaccess/source/fileacc \ filter/source/config/cache/filterconfig1 \ @@ -120,7 +121,6 @@ $(eval $(call gb_CppunitTest_add_components,sc_cellrangesbase,\ )) $(eval $(call gb_CppunitTest_add_old_components,sc_cellrangesbase,\ - configmgr \ ucb1 \ ucpfile1 \ ucptdoc1 \ diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk index 05eb85ecbd44..74cfeb37bb0c 100644 --- a/sc/CppunitTest_sc_datapilotfieldobj.mk +++ b/sc/CppunitTest_sc_datapilotfieldobj.mk @@ -93,6 +93,7 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sc_datapilotfieldobj,\ $(eval $(call gb_CppunitTest_add_components,sc_datapilotfieldobj,\ basic/util/sb \ comphelper/util/comphelp \ + configmgr/source/configmgr \ dbaccess/util/dba \ fileaccess/source/fileacc \ filter/source/config/cache/filterconfig1 \ @@ -120,7 +121,6 @@ $(eval $(call gb_CppunitTest_add_components,sc_datapilotfieldobj,\ )) $(eval $(call gb_CppunitTest_add_old_components,sc_datapilotfieldobj,\ - configmgr \ ucb1 \ ucpfile1 \ ucptdoc1 \ diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk index 8e96211f157d..034debd3b98d 100644 --- a/sc/CppunitTest_sc_filters_test.mk +++ b/sc/CppunitTest_sc_filters_test.mk @@ -89,6 +89,7 @@ $(eval $(call gb_CppunitTest_add_components,sc_filters_test,\ chart2/source/tools/charttools \ chart2/source/model/chartmodel \ comphelper/util/comphelp \ + configmgr/source/configmgr \ dbaccess/util/dba \ eventattacher/source/evtatt \ fileaccess/source/fileacc \ @@ -116,7 +117,6 @@ $(eval $(call gb_CppunitTest_add_components,sc_filters_test,\ $(eval $(call gb_CppunitTest_add_old_components,sc_filters_test,\ embobj \ - configmgr \ ucb1 \ ucpfile1 \ ucptdoc1 \ diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk index de7d44433eda..3252d1594634 100644 --- a/sc/CppunitTest_sc_macros_test.mk +++ b/sc/CppunitTest_sc_macros_test.mk @@ -91,6 +91,7 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sc_macros_test,\ $(eval $(call gb_CppunitTest_add_components,sc_macros_test,\ basic/util/sb \ comphelper/util/comphelp \ + configmgr/source/configmgr \ dbaccess/util/dba \ fileaccess/source/fileacc \ filter/source/config/cache/filterconfig1 \ @@ -118,7 +119,6 @@ $(eval $(call gb_CppunitTest_add_components,sc_macros_test,\ )) $(eval $(call gb_CppunitTest_add_old_components,sc_macros_test,\ - configmgr \ ucb1 \ ucpfile1 \ ucptdoc1 \ diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk index ee6845fb1a31..87619a7911aa 100644 --- a/sc/CppunitTest_sc_namedrangeobj.mk +++ b/sc/CppunitTest_sc_namedrangeobj.mk @@ -92,6 +92,7 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sc_namedrangeobj,\ $(eval $(call gb_CppunitTest_add_components,sc_namedrangeobj,\ basic/util/sb \ comphelper/util/comphelp \ + configmgr/source/configmgr \ dbaccess/util/dba \ fileaccess/source/fileacc \ filter/source/config/cache/filterconfig1 \ @@ -119,7 +120,6 @@ $(eval $(call gb_CppunitTest_add_components,sc_namedrangeobj,\ )) $(eval $(call gb_CppunitTest_add_old_components,sc_namedrangeobj,\ - configmgr \ ucb1 \ ucpfile1 \ ucptdoc1 \ diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk index 8e5f645ad7e7..6a97f9345403 100644 --- a/sc/CppunitTest_sc_subsequent_filters_test.mk +++ b/sc/CppunitTest_sc_subsequent_filters_test.mk @@ -89,6 +89,7 @@ $(eval $(call gb_CppunitTest_add_components,sc_subsequent_filters_test,\ chart2/source/tools/charttools \ chart2/source/model/chartmodel \ comphelper/util/comphelp \ + configmgr/source/configmgr \ dbaccess/util/dba \ eventattacher/source/evtatt \ fileaccess/source/fileacc \ @@ -130,7 +131,6 @@ endif $(eval $(call gb_CppunitTest_add_old_components,sc_subsequent_filters_test,\ embobj \ - configmgr \ ucb1 \ ucpfile1 \ ucptdoc1 \ diff --git a/sc/CppunitTest_sc_tableautoformatfield.mk b/sc/CppunitTest_sc_tableautoformatfield.mk index c07955e07d82..426cf9389c85 100644 --- a/sc/CppunitTest_sc_tableautoformatfield.mk +++ b/sc/CppunitTest_sc_tableautoformatfield.mk @@ -92,6 +92,7 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sc_tableautoformatfield,\ $(eval $(call gb_CppunitTest_add_components,sc_tableautoformatfield,\ basic/util/sb \ comphelper/util/comphelp \ + configmgr/source/configmgr \ dbaccess/util/dba \ fileaccess/source/fileacc \ filter/source/config/cache/filterconfig1 \ @@ -119,7 +120,6 @@ $(eval $(call gb_CppunitTest_add_components,sc_tableautoformatfield,\ )) $(eval $(call gb_CppunitTest_add_old_components,sc_tableautoformatfield,\ - configmgr \ ucb1 \ ucpfile1 \ ucptdoc1 \ diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk index 6c90aecdeab8..8fc3d1dcb69d 100644 --- a/sc/CppunitTest_sc_ucalc.mk +++ b/sc/CppunitTest_sc_ucalc.mk @@ -94,6 +94,7 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sc_ucalc,\ )) $(eval $(call gb_CppunitTest_add_components,sc_ucalc,\ + configmgr/source/configmgr \ framework/util/fwk \ i18npool/util/i18npool \ sfx2/util/sfx \ @@ -101,7 +102,6 @@ $(eval $(call gb_CppunitTest_add_components,sc_ucalc,\ )) $(eval $(call gb_CppunitTest_add_old_components,sc_ucalc,\ - configmgr \ ucb1 \ ucpfile1 \ )) diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk index 8ce430b58972..9216515af219 100644 --- a/sd/CppunitTest_sd_filters_test.mk +++ b/sd/CppunitTest_sd_filters_test.mk @@ -89,6 +89,7 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sd_filters_test,\ $(eval $(call gb_CppunitTest_add_components,sd_filters_test,\ basic/util/sb \ comphelper/util/comphelp \ + configmgr/source/configmgr \ dbaccess/util/dba \ fileaccess/source/fileacc \ filter/source/config/cache/filterconfig1 \ @@ -113,7 +114,6 @@ $(eval $(call gb_CppunitTest_add_components,sd_filters_test,\ )) $(eval $(call gb_CppunitTest_add_old_components,sd_filters_test,\ - configmgr \ embobj \ ucb1 \ ucpfile1 \ diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk index d8d30ed6a156..d7233a2d212e 100644 --- a/sd/CppunitTest_sd_uimpress.mk +++ b/sd/CppunitTest_sd_uimpress.mk @@ -85,14 +85,11 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sd_uimpress,\ )) $(eval $(call gb_CppunitTest_add_components,sd_uimpress,\ + configmgr/source/configmgr \ framework/util/fwk \ i18npool/util/i18npool \ )) -$(eval $(call gb_CppunitTest_add_old_components,sd_uimpress,\ - configmgr \ -)) - $(eval $(call gb_CppunitTest_set_args,sd_uimpress,\ --headless \ --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector \ diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk index fff47e14b1c2..c174a35fe743 100644 --- a/starmath/CppunitTest_starmath_qa_cppunit.mk +++ b/starmath/CppunitTest_starmath_qa_cppunit.mk @@ -83,6 +83,7 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,starmath_qa_cppunit,\ )) $(eval $(call gb_CppunitTest_add_components,starmath_qa_cppunit,\ + configmgr/source/configmgr \ framework/util/fwk \ i18npool/util/i18npool \ toolkit/util/tk \ @@ -91,7 +92,6 @@ $(eval $(call gb_CppunitTest_add_components,starmath_qa_cppunit,\ $(eval $(call gb_CppunitTest_add_old_components,starmath_qa_cppunit,\ component/vcl/vcl \ - configmgr \ mcnttype \ )) diff --git a/svtools/CppunitTest_svtools_filters_test.mk b/svtools/CppunitTest_svtools_filters_test.mk index 7c51be8cbfa8..8ca769ebde02 100644 --- a/svtools/CppunitTest_svtools_filters_test.mk +++ b/svtools/CppunitTest_svtools_filters_test.mk @@ -60,8 +60,8 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,svtools_filters_test,\ types \ )) -$(eval $(call gb_CppunitTest_add_old_components,svtools_filters_test,\ - configmgr \ +$(eval $(call gb_CppunitTest_add_components,svtools_filters_test,\ + configmgr/source/configmgr \ )) $(eval $(call gb_CppunitTest_set_args,svtools_filters_test,\ diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk index d12ff2d94497..53a6c891cb88 100644 --- a/sw/CppunitTest_sw_filters_test.mk +++ b/sw/CppunitTest_sw_filters_test.mk @@ -79,6 +79,7 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sw_filters_test,\ )) $(eval $(call gb_CppunitTest_add_components,sw_filters_test,\ + configmgr/source/configmgr \ sw/util/sw \ sw/util/msword \ forms/util/frm \ @@ -94,7 +95,6 @@ $(eval $(call gb_CppunitTest_add_components,sw_filters_test,\ )) $(eval $(call gb_CppunitTest_add_old_components,sw_filters_test,\ - configmgr \ ucb1 \ ucpfile1 \ ucpchelp1 \ diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk index a640452fad82..606679140e61 100644 --- a/sw/CppunitTest_sw_macros_test.mk +++ b/sw/CppunitTest_sw_macros_test.mk @@ -93,6 +93,7 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sw_macros_test,\ $(eval $(call gb_CppunitTest_add_components,sw_macros_test,\ basic/util/sb \ comphelper/util/comphelp \ + configmgr/source/configmgr \ dbaccess/util/dba \ fileaccess/source/fileacc \ filter/source/config/cache/filterconfig1 \ @@ -120,7 +121,6 @@ $(eval $(call gb_CppunitTest_add_components,sw_macros_test,\ )) $(eval $(call gb_CppunitTest_add_old_components,sw_macros_test,\ - configmgr \ ucb1 \ ucpfile1 \ ucptdoc1 \ diff --git a/sw/CppunitTest_sw_swdoc_test.mk b/sw/CppunitTest_sw_swdoc_test.mk index e18b0c8d52c8..7a186f962aab 100644 --- a/sw/CppunitTest_sw_swdoc_test.mk +++ b/sw/CppunitTest_sw_swdoc_test.mk @@ -94,6 +94,7 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sw_swdoc_test,\ )) $(eval $(call gb_CppunitTest_add_components,sw_swdoc_test,\ + configmgr/source/configmgr \ sfx2/util/sfx \ framework/util/fwk \ unoxml/source/service/unoxml \ @@ -103,7 +104,6 @@ $(eval $(call gb_CppunitTest_add_components,sw_swdoc_test,\ )) $(eval $(call gb_CppunitTest_add_old_components,sw_swdoc_test,\ - configmgr \ ucb1 \ ucpfile1 \ )) diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk index 13f3f77db574..737cde37a052 100644 --- a/writerfilter/CppunitTest_writerfilter_rtftok.mk +++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk @@ -59,11 +59,11 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,writerfilter_rtftok,\ )) $(eval $(call gb_CppunitTest_add_components,writerfilter_rtftok,\ + configmgr/source/configmgr \ writerfilter/util/writerfilter \ )) $(eval $(call gb_CppunitTest_add_old_components,writerfilter_rtftok,\ - configmgr \ ucb1 \ ucpfile1 \ )) |