sw/CppunitTest_sw_apitests.mk | 39 ---------------------- sw/CppunitTest_sw_filters_test.mk | 38 --------------------- sw/CppunitTest_sw_macros_test.mk | 41 ----------------------- sw/CppunitTest_sw_mailmerge.mk | 52 ----------------------------- sw/CppunitTest_sw_odfimport.mk | 39 ---------------------- sw/CppunitTest_sw_ooxmlencryption.mk | 5 -- sw/CppunitTest_sw_ooxmlexport8.mk | 41 ----------------------- sw/CppunitTest_sw_ooxmlfieldexport.mk | 5 -- sw/CppunitTest_sw_ooxmlimport.mk | 42 ------------------------ sw/CppunitTest_sw_ooxmlimport2.mk | 42 ------------------------ sw/CppunitTest_sw_ooxmllinks.mk | 4 -- sw/CppunitTest_sw_ooxmlw14export.mk | 4 -- sw/CppunitTest_sw_rtfimport.mk | 32 ------------------ sw/CppunitTest_sw_ww8export.mk | 34 ------------------- sw/CppunitTest_sw_ww8import.mk | 30 ----------------- sw/ooxmlexport_setup.mk | 59 ---------------------------------- 16 files changed, 16 insertions(+), 491 deletions(-)
New commits: commit 6d75afb75219905a4bd3337aee5fea5ba019da4a Author: Michael Stahl <[email protected]> AuthorDate: Fri Mar 8 11:53:13 2019 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Fri Mar 8 14:21:59 2019 +0100 sw: replace long lists of components with services.rdb This should be more maintainable. Change-Id: I60ee68cd79f7a0627bcaf8fd34d3036124ea0f9e Reviewed-on: https://gerrit.libreoffice.org/68914 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> diff --git a/sw/CppunitTest_sw_apitests.mk b/sw/CppunitTest_sw_apitests.mk index 595a1940e27f..b601b948d82f 100644 --- a/sw/CppunitTest_sw_apitests.mk +++ b/sw/CppunitTest_sw_apitests.mk @@ -66,43 +66,6 @@ $(eval $(call gb_CppunitTest_use_ure,sw_apitests)) $(eval $(call gb_CppunitTest_use_vcl,sw_apitests)) $(eval $(call gb_CppunitTest_use_configuration,sw_apitests)) -$(eval $(call gb_CppunitTest_use_components,sw_apitests,\ - basic/util/sb \ - embeddedobj/util/embobj \ - comphelper/util/comphelp \ - configmgr/source/configmgr \ - dbaccess/util/dba \ - filter/source/config/cache/filterconfig1 \ - filter/source/storagefilterdetect/storagefd \ - forms/util/frm \ - framework/util/fwk \ - i18npool/util/i18npool \ - i18npool/source/search/i18nsearch \ - oox/util/oox \ - package/source/xstor/xstor \ - package/util/package2 \ - sax/source/expatwrap/expwrap \ - scripting/source/basprov/basprov \ - scripting/util/scriptframe \ - sfx2/util/sfx \ - sot/util/sot \ - svl/source/fsstor/fsstorage \ - svl/util/svl \ - svtools/util/svt \ - svx/util/svx \ - sw/util/msword \ - sw/util/sw \ - sw/util/swd \ - sw/util/vbaswobj \ - 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 \ - uui/util/uui \ - xmloff/util/xo \ -)) +$(eval $(call gb_CppunitTest_use_rdb,sw_apitests,services)) # vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk index 9415a1adca43..eaa295ef4ad2 100644 --- a/sw/CppunitTest_sw_filters_test.mk +++ b/sw/CppunitTest_sw_filters_test.mk @@ -53,43 +53,7 @@ $(eval $(call gb_CppunitTest_use_api,sw_filters_test,\ $(eval $(call gb_CppunitTest_use_ure,sw_filters_test)) $(eval $(call gb_CppunitTest_use_vcl,sw_filters_test)) -$(eval $(call gb_CppunitTest_use_components,sw_filters_test,\ - basic/util/sb \ - comphelper/util/comphelp \ - configmgr/source/configmgr \ - dbaccess/util/dba \ - embeddedobj/util/embobj \ - emfio/emfio \ - filter/source/config/cache/filterconfig1 \ - filter/source/t602/t602filter \ - forms/util/frm \ - framework/util/fwk \ - i18npool/util/i18npool \ - linguistic/source/lng \ - oox/util/oox \ - package/source/xstor/xstor \ - package/util/package2 \ - sax/source/expatwrap/expwrap \ - sfx2/util/sfx \ - starmath/util/sm \ - svl/source/fsstor/fsstorage \ - svtools/util/svt \ - sw/util/msword \ - sw/util/sw \ - sw/util/swd \ - uui/util/uui \ - toolkit/util/tk \ - ucb/source/core/ucb1 \ - ucb/source/ucp/file/ucpfile1 \ - unotools/util/utl \ - unoxml/source/rdf/unordf \ - unoxml/source/service/unoxml \ - writerfilter/util/writerfilter \ - $(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \ - vcl/vcl.common \ - xmloff/source/transform/xof \ - xmloff/util/xo \ -)) +$(eval $(call gb_CppunitTest_use_rdb,sw_filters_test,services)) $(eval $(call gb_CppunitTest_use_configuration,sw_filters_test)) diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk index ee45b6a14139..f5e4d9c95d2a 100644 --- a/sw/CppunitTest_sw_macros_test.mk +++ b/sw/CppunitTest_sw_macros_test.mk @@ -65,46 +65,7 @@ $(eval $(call gb_CppunitTest_use_api,sw_macros_test,\ $(eval $(call gb_CppunitTest_use_ure,sw_macros_test)) $(eval $(call gb_CppunitTest_use_vcl,sw_macros_test)) -$(eval $(call gb_CppunitTest_use_components,sw_macros_test,\ - basic/util/sb \ - embeddedobj/util/embobj \ - comphelper/util/comphelp \ - configmgr/source/configmgr \ - dbaccess/util/dba \ - filter/source/config/cache/filterconfig1 \ - filter/source/storagefilterdetect/storagefd \ - forms/util/frm \ - framework/util/fwk \ - i18npool/util/i18npool \ - i18npool/source/search/i18nsearch \ - oox/util/oox \ - package/source/xstor/xstor \ - package/util/package2 \ - sax/source/expatwrap/expwrap \ - scripting/source/basprov/basprov \ - scripting/util/scriptframe \ - sfx2/util/sfx \ - sot/util/sot \ - svl/source/fsstor/fsstorage \ - svl/util/svl \ - svtools/util/svt \ - svx/util/svx \ - sw/util/msword \ - sw/util/sw \ - sw/util/swd \ - sw/util/vbaswobj \ - 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 \ - uui/util/uui \ - vcl/vcl.common \ - xmloff/util/xo \ - xmlsecurity/util/xsec_xmlsec \ -)) +$(eval $(call gb_CppunitTest_use_rdb,sw_macros_test,services)) $(eval $(call gb_CppunitTest_use_configuration,sw_macros_test)) diff --git a/sw/CppunitTest_sw_mailmerge.mk b/sw/CppunitTest_sw_mailmerge.mk index 6d9df162df5c..a6b7611687af 100644 --- a/sw/CppunitTest_sw_mailmerge.mk +++ b/sw/CppunitTest_sw_mailmerge.mk @@ -38,57 +38,7 @@ $(eval $(call gb_CppunitTest_use_api,sw_mailmerge,\ oovbaapi \ )) -$(eval $(call gb_CppunitTest_use_components,sw_mailmerge, \ - basic/util/sb \ - comphelper/util/comphelp \ - configmgr/source/configmgr \ - connectivity/source/cpool/dbpool2 \ - connectivity/source/drivers/calc/calc \ - connectivity/source/drivers/writer/writer \ - connectivity/source/manager/sdbc2 \ - dbaccess/source/filter/xml/dbaxml \ - dbaccess/util/dba \ - embeddedobj/util/embobj \ - filter/source/config/cache/filterconfig1 \ - filter/source/odfflatxml/odfflatxml \ - filter/source/storagefilterdetect/storagefd \ - filter/source/xmlfilteradaptor/xmlfa \ - filter/source/xmlfilterdetect/xmlfd \ - forms/util/frm \ - framework/util/fwk \ - i18npool/util/i18npool \ - lingucomponent/source/languageguessing/guesslang \ - linguistic/source/lng \ - oox/util/oox \ - package/source/xstor/xstor \ - package/util/package2 \ - sax/source/expatwrap/expwrap \ - sc/util/sc \ - sc/util/scfilt \ - sfx2/util/sfx \ - sot/util/sot \ - svl/source/fsstor/fsstorage \ - svl/util/svl \ - svtools/util/svt \ - sw/util/sw \ - sw/util/swd \ - 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 \ - uui/util/uui \ - vcl/vcl.common \ - $(if $(filter-out MACOSX WNT,$(OS)), \ - $(if $(DISABLE_GUI),, \ - vcl/vcl.unx \ - ) \ - ) \ - xmloff/util/xo \ - xmlscript/util/xmlscript \ -)) +$(eval $(call gb_CppunitTest_use_rdb,sw_mailmerge,services)) $(eval $(call gb_CppunitTest_use_configuration,sw_mailmerge)) $(eval $(call gb_CppunitTest_use_ure,sw_mailmerge)) diff --git a/sw/CppunitTest_sw_odfimport.mk b/sw/CppunitTest_sw_odfimport.mk index bf227939f074..36f5b4a00e2a 100644 --- a/sw/CppunitTest_sw_odfimport.mk +++ b/sw/CppunitTest_sw_odfimport.mk @@ -52,44 +52,7 @@ $(eval $(call gb_CppunitTest_use_api,sw_odfimport,\ $(eval $(call gb_CppunitTest_use_ure,sw_odfimport)) $(eval $(call gb_CppunitTest_use_vcl,sw_odfimport)) -$(eval $(call gb_CppunitTest_use_components,sw_odfimport,\ - basic/util/sb \ - comphelper/util/comphelp \ - configmgr/source/configmgr \ - embeddedobj/util/embobj \ - filter/source/config/cache/filterconfig1 \ - filter/source/storagefilterdetect/storagefd \ - filter/source/odfflatxml/odfflatxml \ - filter/source/xmlfilterdetect/xmlfd \ - filter/source/xmlfilteradaptor/xmlfa \ - framework/util/fwk \ - i18npool/util/i18npool \ - lingucomponent/source/languageguessing/guesslang \ - linguistic/source/lng \ - package/util/package2 \ - package/source/xstor/xstor \ - sw/util/sw \ - sw/util/swd \ - sax/source/expatwrap/expwrap \ - sfx2/util/sfx \ - svl/source/fsstor/fsstorage \ - svtools/util/svt \ - toolkit/util/tk \ - ucb/source/core/ucb1 \ - ucb/source/ucp/file/ucpfile1 \ - unotools/util/utl \ - unoxml/source/service/unoxml \ - uui/util/uui \ - $(if $(filter-out MACOSX WNT,$(OS)), \ - $(if $(DISABLE_GUI),, \ - vcl/vcl.unx \ - ) \ - ) \ - $(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \ - vcl/vcl.common \ - xmloff/util/xo \ - svgio/svgio \ -)) +$(eval $(call gb_CppunitTest_use_rdb,sw_odfimport,services)) $(eval $(call gb_CppunitTest_use_configuration,sw_odfimport)) diff --git a/sw/CppunitTest_sw_ooxmlencryption.mk b/sw/CppunitTest_sw_ooxmlencryption.mk index 5485199be139..787b5b517dc5 100644 --- a/sw/CppunitTest_sw_ooxmlencryption.mk +++ b/sw/CppunitTest_sw_ooxmlencryption.mk @@ -40,10 +40,7 @@ $(eval $(call gb_CppunitTest_use_api,sw_ooxmlencryption,\ $(eval $(call gb_CppunitTest_use_ure,sw_ooxmlencryption)) $(eval $(call gb_CppunitTest_use_vcl,sw_ooxmlencryption)) -$(eval $(call gb_CppunitTest_use_components,sw_ooxmlencryption,\ - $(sw_ooxmlexport_components) \ - filter/source/storagefilterdetect/storagefd \ -)) +$(eval $(call gb_CppunitTest_use_rdb,sw_ooxmlencryption,services)) $(eval $(call gb_CppunitTest_use_configuration,sw_ooxmlencryption)) diff --git a/sw/CppunitTest_sw_ooxmlexport8.mk b/sw/CppunitTest_sw_ooxmlexport8.mk index 13e9bd6c1140..afd6d160631e 100644 --- a/sw/CppunitTest_sw_ooxmlexport8.mk +++ b/sw/CppunitTest_sw_ooxmlexport8.mk @@ -64,46 +64,7 @@ $(eval $(call gb_CppunitTest_use_api,sw_ooxmlexport8,\ $(eval $(call gb_CppunitTest_use_ure,sw_ooxmlexport8)) $(eval $(call gb_CppunitTest_use_vcl,sw_ooxmlexport8)) -$(eval $(call gb_CppunitTest_use_components,sw_ooxmlexport8,\ - basic/util/sb \ - chart2/source/controller/chartcontroller \ - chart2/source/chartcore \ - canvas/source/factory/canvasfactory \ - comphelper/util/comphelp \ - configmgr/source/configmgr \ - drawinglayer/drawinglayer \ - embeddedobj/util/embobj \ - emfio/emfio \ - filter/source/config/cache/filterconfig1 \ - forms/util/frm \ - framework/util/fwk \ - i18npool/util/i18npool \ - linguistic/source/lng \ - oox/util/oox \ - package/source/xstor/xstor \ - package/util/package2 \ - sax/source/expatwrap/expwrap \ - sw/util/sw \ - sw/util/swd \ - sw/util/msword \ - sfx2/util/sfx \ - starmath/util/sm \ - svl/source/fsstor/fsstorage \ - svl/util/svl \ - svtools/util/svt \ - svx/util/svx \ - svx/util/svxcore \ - toolkit/util/tk \ - ucb/source/core/ucb1 \ - ucb/source/ucp/file/ucpfile1 \ - unotools/util/utl \ - unoxml/source/service/unoxml \ - unoxml/source/rdf/unordf \ - uui/util/uui \ - vcl/vcl.common \ - writerfilter/util/writerfilter \ - xmloff/util/xo \ -)) +$(eval $(call gb_CppunitTest_use_rdb,sw_ooxmlexport8,services)) $(eval $(call gb_CppunitTest_use_configuration,sw_ooxmlexport8)) diff --git a/sw/CppunitTest_sw_ooxmlfieldexport.mk b/sw/CppunitTest_sw_ooxmlfieldexport.mk index 192e4bc7a5fc..8e86d5e0249f 100644 --- a/sw/CppunitTest_sw_ooxmlfieldexport.mk +++ b/sw/CppunitTest_sw_ooxmlfieldexport.mk @@ -40,10 +40,7 @@ $(eval $(call gb_CppunitTest_use_api,sw_ooxmlfieldexport,\ $(eval $(call gb_CppunitTest_use_ure,sw_ooxmlfieldexport)) $(eval $(call gb_CppunitTest_use_vcl,sw_ooxmlfieldexport)) -$(eval $(call gb_CppunitTest_use_components,sw_ooxmlfieldexport,\ - $(sw_ooxmlexport_components) \ - filter/source/storagefilterdetect/storagefd \ -)) +$(eval $(call gb_CppunitTest_use_rdb,sw_ooxmlfieldexport,services)) $(eval $(call gb_CppunitTest_use_configuration,sw_ooxmlfieldexport)) diff --git a/sw/CppunitTest_sw_ooxmlimport.mk b/sw/CppunitTest_sw_ooxmlimport.mk index de38d0877be4..4dbd414cdf30 100644 --- a/sw/CppunitTest_sw_ooxmlimport.mk +++ b/sw/CppunitTest_sw_ooxmlimport.mk @@ -64,47 +64,7 @@ $(eval $(call gb_CppunitTest_use_api,sw_ooxmlimport,\ $(eval $(call gb_CppunitTest_use_ure,sw_ooxmlimport)) $(eval $(call gb_CppunitTest_use_vcl,sw_ooxmlimport)) -$(eval $(call gb_CppunitTest_use_components,sw_ooxmlimport,\ - basic/util/sb \ - chart2/source/controller/chartcontroller \ - chart2/source/chartcore \ - canvas/source/factory/canvasfactory \ - comphelper/util/comphelp \ - configmgr/source/configmgr \ - drawinglayer/drawinglayer \ - embeddedobj/util/embobj \ - emfio/emfio \ - filter/source/config/cache/filterconfig1 \ - forms/util/frm \ - framework/util/fwk \ - i18npool/util/i18npool \ - linguistic/source/lng \ - oox/util/oox \ - package/source/xstor/xstor \ - package/util/package2 \ - sax/source/expatwrap/expwrap \ - sw/util/sw \ - sw/util/swd \ - sw/util/msword \ - sfx2/util/sfx \ - sot/util/sot \ - starmath/util/sm \ - svl/source/fsstor/fsstorage \ - svl/util/svl \ - svtools/util/svt \ - svx/util/svx \ - svx/util/svxcore \ - toolkit/util/tk \ - ucb/source/core/ucb1 \ - ucb/source/ucp/file/ucpfile1 \ - unotools/util/utl \ - unoxml/source/service/unoxml \ - unoxml/source/rdf/unordf \ - uui/util/uui \ - vcl/vcl.common \ - writerfilter/util/writerfilter \ - xmloff/util/xo \ -)) +$(eval $(call gb_CppunitTest_use_rdb,sw_ooxmlimport,services)) $(eval $(call gb_CppunitTest_use_configuration,sw_ooxmlimport)) diff --git a/sw/CppunitTest_sw_ooxmlimport2.mk b/sw/CppunitTest_sw_ooxmlimport2.mk index 1760b61e98b3..ce1a040ffc12 100644 --- a/sw/CppunitTest_sw_ooxmlimport2.mk +++ b/sw/CppunitTest_sw_ooxmlimport2.mk @@ -65,47 +65,7 @@ $(eval $(call gb_CppunitTest_use_api,sw_ooxmlimport2,\ $(eval $(call gb_CppunitTest_use_ure,sw_ooxmlimport2)) $(eval $(call gb_CppunitTest_use_vcl,sw_ooxmlimport2)) -$(eval $(call gb_CppunitTest_use_components,sw_ooxmlimport2,\ - basic/util/sb \ - chart2/source/controller/chartcontroller \ - chart2/source/chartcore \ - canvas/source/factory/canvasfactory \ - comphelper/util/comphelp \ - configmgr/source/configmgr \ - drawinglayer/drawinglayer \ - embeddedobj/util/embobj \ - emfio/emfio \ - filter/source/config/cache/filterconfig1 \ - forms/util/frm \ - framework/util/fwk \ - i18npool/util/i18npool \ - linguistic/source/lng \ - oox/util/oox \ - package/source/xstor/xstor \ - package/util/package2 \ - sax/source/expatwrap/expwrap \ - sw/util/sw \ - sw/util/swd \ - sw/util/msword \ - sfx2/util/sfx \ - sot/util/sot \ - starmath/util/sm \ - svl/source/fsstor/fsstorage \ - svl/util/svl \ - svtools/util/svt \ - svx/util/svx \ - svx/util/svxcore \ - toolkit/util/tk \ - ucb/source/core/ucb1 \ - ucb/source/ucp/file/ucpfile1 \ - unotools/util/utl \ - unoxml/source/service/unoxml \ - unoxml/source/rdf/unordf \ - uui/util/uui \ - vcl/vcl.common \ - writerfilter/util/writerfilter \ - xmloff/util/xo \ -)) +$(eval $(call gb_CppunitTest_use_rdb,sw_ooxmlimport2,services)) $(eval $(call gb_CppunitTest_use_configuration,sw_ooxmlimport2)) diff --git a/sw/CppunitTest_sw_ooxmllinks.mk b/sw/CppunitTest_sw_ooxmllinks.mk index 6e7babb03a5e..bc2eaf9151c7 100644 --- a/sw/CppunitTest_sw_ooxmllinks.mk +++ b/sw/CppunitTest_sw_ooxmllinks.mk @@ -40,9 +40,7 @@ $(eval $(call gb_CppunitTest_use_api,sw_ooxmllinks,\ $(eval $(call gb_CppunitTest_use_ure,sw_ooxmllinks)) $(eval $(call gb_CppunitTest_use_vcl,sw_ooxmllinks)) -$(eval $(call gb_CppunitTest_use_components,sw_ooxmllinks,\ - $(sw_ooxmlexport_components) \ -)) +$(eval $(call gb_CppunitTest_use_rdb,sw_ooxmllinks,services)) $(eval $(call gb_CppunitTest_use_configuration,sw_ooxmllinks)) diff --git a/sw/CppunitTest_sw_ooxmlw14export.mk b/sw/CppunitTest_sw_ooxmlw14export.mk index d04297aa0ddf..d55be21c863c 100644 --- a/sw/CppunitTest_sw_ooxmlw14export.mk +++ b/sw/CppunitTest_sw_ooxmlw14export.mk @@ -40,9 +40,7 @@ $(eval $(call gb_CppunitTest_use_api,sw_ooxmlw14export,\ $(eval $(call gb_CppunitTest_use_ure,sw_ooxmlw14export)) $(eval $(call gb_CppunitTest_use_vcl,sw_ooxmlw14export)) -$(eval $(call gb_CppunitTest_use_components,sw_ooxmlw14export,\ - $(sw_ooxmlexport_components) \ -)) +$(eval $(call gb_CppunitTest_use_rdb,sw_ooxmlw14export,services)) $(eval $(call gb_CppunitTest_use_configuration,sw_ooxmlw14export)) diff --git a/sw/CppunitTest_sw_rtfimport.mk b/sw/CppunitTest_sw_rtfimport.mk index 92cc12c75a28..58a92e1e2cce 100644 --- a/sw/CppunitTest_sw_rtfimport.mk +++ b/sw/CppunitTest_sw_rtfimport.mk @@ -57,37 +57,7 @@ $(eval $(call gb_CppunitTest_use_api,sw_rtfimport,\ $(eval $(call gb_CppunitTest_use_ure,sw_rtfimport)) $(eval $(call gb_CppunitTest_use_vcl,sw_rtfimport)) -$(eval $(call gb_CppunitTest_use_components,sw_rtfimport,\ - basic/util/sb \ - canvas/source/factory/canvasfactory \ - comphelper/util/comphelp \ - configmgr/source/configmgr \ - embeddedobj/util/embobj \ - emfio/emfio \ - filter/source/config/cache/filterconfig1 \ - filter/source/storagefilterdetect/storagefd \ - framework/util/fwk \ - i18npool/util/i18npool \ - linguistic/source/lng \ - package/util/package2 \ - package/source/xstor/xstor \ - sax/source/expatwrap/expwrap \ - sw/util/sw \ - sw/util/swd \ - sfx2/util/sfx \ - starmath/util/sm \ - svl/source/fsstor/fsstorage \ - svtools/util/svt \ - toolkit/util/tk \ - ucb/source/core/ucb1 \ - ucb/source/ucp/file/ucpfile1 \ - unotools/util/utl \ - unoxml/source/service/unoxml \ - uui/util/uui \ - writerfilter/util/writerfilter \ - vcl/vcl.common \ - xmloff/util/xo \ -)) +$(eval $(call gb_CppunitTest_use_rdb,sw_rtfimport,services)) $(eval $(call gb_CppunitTest_use_configuration,sw_rtfimport)) diff --git a/sw/CppunitTest_sw_ww8export.mk b/sw/CppunitTest_sw_ww8export.mk index 548a7bcbad77..8f6877ae6275 100644 --- a/sw/CppunitTest_sw_ww8export.mk +++ b/sw/CppunitTest_sw_ww8export.mk @@ -52,39 +52,7 @@ $(eval $(call gb_CppunitTest_use_api,sw_ww8export,\ $(eval $(call gb_CppunitTest_use_ure,sw_ww8export)) $(eval $(call gb_CppunitTest_use_vcl,sw_ww8export)) -$(eval $(call gb_CppunitTest_use_components,sw_ww8export,\ - basic/util/sb \ - comphelper/util/comphelp \ - configmgr/source/configmgr \ - dbaccess/util/dba \ - embeddedobj/util/embobj \ - emfio/emfio \ - filter/source/config/cache/filterconfig1 \ - filter/source/storagefilterdetect/storagefd \ - forms/util/frm \ - framework/util/fwk \ - i18npool/util/i18npool \ - linguistic/source/lng \ - package/source/xstor/xstor \ - package/util/package2 \ - sax/source/expatwrap/expwrap \ - sw/util/msword \ - sw/util/sw \ - sw/util/swd \ - sfx2/util/sfx \ - svl/source/fsstor/fsstorage \ - svtools/util/svt \ - toolkit/util/tk \ - ucb/source/core/ucb1 \ - ucb/source/ucp/file/ucpfile1 \ - unotools/util/utl \ - unoxml/source/service/unoxml \ - unoxml/source/rdf/unordf \ - uui/util/uui \ - $(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \ - vcl/vcl.common \ - xmloff/util/xo \ -)) +$(eval $(call gb_CppunitTest_use_rdb,sw_ww8export,services)) $(eval $(call gb_CppunitTest_use_configuration,sw_ww8export)) diff --git a/sw/CppunitTest_sw_ww8import.mk b/sw/CppunitTest_sw_ww8import.mk index bb73e4230da0..31a7dcbe80ba 100644 --- a/sw/CppunitTest_sw_ww8import.mk +++ b/sw/CppunitTest_sw_ww8import.mk @@ -51,35 +51,7 @@ $(eval $(call gb_CppunitTest_use_api,sw_ww8import,\ $(eval $(call gb_CppunitTest_use_ure,sw_ww8import)) $(eval $(call gb_CppunitTest_use_vcl,sw_ww8import)) -$(eval $(call gb_CppunitTest_use_components,sw_ww8import,\ - basic/util/sb \ - comphelper/util/comphelp \ - configmgr/source/configmgr \ - dbaccess/util/dba \ - filter/source/config/cache/filterconfig1 \ - forms/util/frm \ - framework/util/fwk \ - i18npool/util/i18npool \ - linguistic/source/lng \ - package/util/package2 \ - package/source/xstor/xstor \ - sw/util/msword \ - sw/util/sw \ - sw/util/swd \ - sfx2/util/sfx \ - svl/source/fsstor/fsstorage \ - svtools/util/svt \ - 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 \ - uui/util/uui \ - vcl/vcl.common \ - $(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \ -)) +$(eval $(call gb_CppunitTest_use_rdb,sw_ww8import,services)) $(eval $(call gb_CppunitTest_use_configuration,sw_ww8import)) diff --git a/sw/ooxmlexport_setup.mk b/sw/ooxmlexport_setup.mk index 45cf7a6be0e0..9d3c13325098 100644 --- a/sw/ooxmlexport_setup.mk +++ b/sw/ooxmlexport_setup.mk @@ -25,60 +25,6 @@ define sw_ooxmlexport_libraries svxcore endef -define sw_ooxmlexport_components - basic/util/sb \ - canvas/source/factory/canvasfactory \ - chart2/source/chartcore \ - chart2/source/controller/chartcontroller \ - comphelper/util/comphelp \ - configmgr/source/configmgr \ - dbaccess/util/dba \ - drawinglayer/drawinglayer \ - embeddedobj/util/embobj \ - emfio/emfio \ - $(if $(filter WNT,$(OS)), \ - embeddedobj/source/msole/emboleobj.windows, \ - embeddedobj/source/msole/emboleobj \ - ) \ - filter/source/config/cache/filterconfig1 \ - filter/source/odfflatxml/odfflatxml \ - filter/source/xmlfilterdetect/xmlfd \ - filter/source/xmlfilteradaptor/xmlfa \ - forms/util/frm \ - framework/util/fwk \ - i18npool/util/i18npool \ - linguistic/source/lng \ - oox/util/oox \ - package/source/xstor/xstor \ - package/util/package2 \ - sax/source/expatwrap/expwrap \ - sc/util/sc \ - sc/util/scd \ - sc/util/scfilt \ - sw/util/sw \ - sw/util/swd \ - sw/util/msword \ - sfx2/util/sfx \ - sot/util/sot \ - starmath/util/sm \ - svl/source/fsstor/fsstorage \ - svl/util/svl \ - svtools/util/svt \ - svx/util/svx \ - svx/util/svxcore \ - 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 \ - uui/util/uui \ - vcl/vcl.common \ - writerfilter/util/writerfilter \ - xmloff/util/xo -endef - # template for ooxmlexport tests (there are several so that they can be run in parallel) define sw_ooxmlexport_test @@ -113,10 +59,7 @@ $(eval $(call gb_CppunitTest_use_api,sw_ooxmlexport$(1),\ $(eval $(call gb_CppunitTest_use_ure,sw_ooxmlexport$(1))) $(eval $(call gb_CppunitTest_use_vcl,sw_ooxmlexport$(1))) -$(eval $(call gb_CppunitTest_use_components,sw_ooxmlexport$(1),\ - $(sw_ooxmlexport_components) \ - filter/source/storagefilterdetect/storagefd \ -)) +$(eval $(call gb_CppunitTest_use_rdb,sw_ooxmlexport$(1),services)) $(eval $(call gb_CppunitTest_use_configuration,sw_ooxmlexport$(1))) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
