chart2/qa/extras/charttest.hxx | 6 cppcanvas/CppunitTest_cppcanvas_emfplus.mk | 5 dbaccess/CppunitTest_dbaccess_CRMDatabase_test.mk | 5 dbaccess/CppunitTest_dbaccess_RowSetClones.mk | 1 dbaccess/CppunitTest_dbaccess_dialog_save.mk | 1 dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk | 5 dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk | 1 dbaccess/CppunitTest_dbaccess_firebird_test.mk | 5 dbaccess/CppunitTest_dbaccess_hsqldb_test.mk | 5 dbaccess/CppunitTest_dbaccess_migration.mk | 5 dbaccess/CppunitTest_dbaccess_nolib_save.mk | 1 embeddedobj/CppunitTest_embeddedobj_general.mk | 1 embeddedobj/qa/cppunit/msole.cxx | 6 emfio/qa/cppunit/emf/EmfImportTest.cxx | 6 filter/CppunitTest_filter_pdf.mk | 1 filter/CppunitTest_filter_textfilterdetect.mk | 5 filter/qa/unit/svg.cxx | 6 framework/CppunitTest_framework_CheckXTitle.mk | 5 framework/CppunitTest_framework_accelerators.mk | 5 framework/CppunitTest_framework_dispatch.mk | 5 framework/CppunitTest_framework_loadenv.mk | 5 framework/CppunitTest_framework_services.mk | 5 include/test/unoapi_test.hxx | 14 + include/test/unoapixml_test.hxx | 37 ---- lotuswordpro/CppunitTest_lotuswordpro_import_test.mk | 5 oox/CppunitTest_oox_drawingml.mk | 1 oox/CppunitTest_oox_helper.mk | 1 oox/CppunitTest_oox_mathml.mk | 1 oox/CppunitTest_oox_shape.mk | 1 oox/CppunitTest_oox_vml.mk | 1 oox/qa/unit/export.cxx | 6 oox/qa/unit/mcgr.cxx | 6 oox/qa/unit/testscene3d.cxx | 6 oox/qa/unit/wpc_drawing_canvas.cxx | 6 reportdesign/CppunitTest_reportdesign_basic_test.mk | 5 sc/CppunitTest_sc_anchor_test.mk | 5 sc/CppunitTest_sc_cond_format_merge.mk | 1 sc/CppunitTest_sc_functionlistobj.mk | 5 sc/CppunitTest_sc_new_cond_format_api.mk | 5 sc/CppunitTest_sc_pdf_export.mk | 2 sc/CppunitTest_sc_vba_macro_test.mk | 1 sc/common_unoapi_tests.mk | 5 sc/qa/extras/htmlexporttest.cxx | 6 sc/qa/unit/SparklineImportExportTest.cxx | 6 sc/qa/unit/helper/qahelper.hxx | 6 sc/qa/unit/helper/sctestviewcallback.cxx | 2 sc/qa/unit/helper/sctiledrenderingtest.cxx | 6 sc/qa/unit/helper/sctiledrenderingtest.hxx | 4 sc/qa/unit/jumbosheets-test.cxx | 4 sccomp/CppunitTest_sccomp_swarmsolvertest.mk | 4 sd/CppunitTest_sd_pdf_import_test.mk | 1 sd/qa/filter/eppt/eppt.cxx | 6 sd/qa/inc/sdtiledrenderingtest.hxx | 4 sd/qa/unit/HtmlExportTest.cxx | 6 sd/qa/unit/SVGExportTests.cxx | 6 sd/qa/unit/sdmodeltestbase.hxx | 6 sd/qa/unit/sdtiledrenderingtest.cxx | 6 sfx2/CppunitTest_sfx2_autoredaction.mk | 1 sfx2/CppunitTest_sfx2_classification.mk | 5 sfx2/CppunitTest_sfx2_doc.mk | 1 sfx2/CppunitTest_sfx2_view.mk | 1 sfx2/qa/cppunit/test_misc.cxx | 6 slideshow/CppunitTest_slideshow_engine.mk | 1 starmath/CppunitTest_starmath_import.mk | 5 starmath/qa/extras/mmlexport-test.cxx | 6 svx/CppunitTest_svx_core.mk | 1 svx/qa/unit/sdr.cxx | 6 svx/qa/unit/svdraw.cxx | 6 svx/qa/unit/table.cxx | 6 svx/qa/unit/unodraw.cxx | 6 sw/CppunitTest_sw_accessible_relation_set.mk | 1 sw/CppunitTest_sw_apitests.mk | 111 ------------ sw/CppunitTest_sw_apitests_SwXAutoTextContainer.mk | 14 + sw/CppunitTest_sw_apitests_SwXBodyText.mk | 14 + sw/CppunitTest_sw_apitests_SwXBookmark.mk | 14 + sw/CppunitTest_sw_apitests_SwXBookmarks.mk | 14 + sw/CppunitTest_sw_apitests_SwXChapterNumbering.mk | 14 + sw/CppunitTest_sw_apitests_SwXDocumentIndex.mk | 14 + sw/CppunitTest_sw_apitests_SwXDocumentIndexMark.mk | 14 + sw/CppunitTest_sw_apitests_SwXDocumentIndexes.mk | 14 + sw/CppunitTest_sw_apitests_SwXDocumentSettings.mk | 14 + sw/CppunitTest_sw_apitests_SwXFieldEnumeration.mk | 14 + sw/CppunitTest_sw_apitests_SwXFootnote.mk | 14 + sw/CppunitTest_sw_apitests_SwXFootnoteProperties.mk | 14 + sw/CppunitTest_sw_apitests_SwXFootnoteText.mk | 14 + sw/CppunitTest_sw_apitests_SwXFootnotes.mk | 14 + sw/CppunitTest_sw_apitests_SwXFrames.mk | 14 + sw/CppunitTest_sw_apitests_SwXHeadFootText.mk | 14 + sw/CppunitTest_sw_apitests_SwXNumberingRules.mk | 14 + sw/CppunitTest_sw_apitests_SwXParagraphEnumeration.mk | 14 + sw/CppunitTest_sw_apitests_SwXReferenceMark.mk | 14 + sw/CppunitTest_sw_apitests_SwXReferenceMarks.mk | 14 + sw/CppunitTest_sw_apitests_SwXStyleFamilies.mk | 14 + sw/CppunitTest_sw_apitests_SwXTableCellText.mk | 14 + sw/CppunitTest_sw_apitests_SwXTextEmbeddedObjects.mk | 14 + sw/CppunitTest_sw_apitests_SwXTextField.mk | 14 + sw/CppunitTest_sw_apitests_SwXTextFieldMasters.mk | 14 + sw/CppunitTest_sw_apitests_SwXTextFieldTypes.mk | 14 + sw/CppunitTest_sw_apitests_SwXTextFrame.mk | 14 + sw/CppunitTest_sw_apitests_SwXTextSections.mk | 14 + sw/CppunitTest_sw_apitests_SwXTextTable.mk | 14 + sw/CppunitTest_sw_apitests_SwXTextTables.mk | 14 + sw/Module_sw.mk | 32 +++ sw/common_unoapi_tests.mk | 90 +++++++++ sw/qa/api/SwXAutoTextContainer.cxx | 2 sw/qa/api/SwXBodyText.cxx | 2 sw/qa/api/SwXBookmark.cxx | 2 sw/qa/api/SwXBookmarks.cxx | 2 sw/qa/api/SwXChapterNumbering.cxx | 2 sw/qa/api/SwXDocumentIndexMark.cxx | 2 sw/qa/api/SwXDocumentIndexes.cxx | 2 sw/qa/api/SwXDocumentSettings.cxx | 2 sw/qa/api/SwXFieldEnumeration.cxx | 2 sw/qa/api/SwXFootnote.cxx | 2 sw/qa/api/SwXFootnoteProperties.cxx | 2 sw/qa/api/SwXFootnoteText.cxx | 2 sw/qa/api/SwXFootnotes.cxx | 2 sw/qa/api/SwXFrames.cxx | 2 sw/qa/api/SwXHeadFootText.cxx | 2 sw/qa/api/SwXNumberingRules.cxx | 2 sw/qa/api/SwXParagraphEnumeration.cxx | 2 sw/qa/api/SwXReferenceMark.cxx | 2 sw/qa/api/SwXReferenceMarks.cxx | 2 sw/qa/api/SwXStyleFamilies.cxx | 2 sw/qa/api/SwXTableCellText.cxx | 2 sw/qa/api/SwXTextEmbeddedObjects.cxx | 2 sw/qa/api/SwXTextField.cxx | 2 sw/qa/api/SwXTextFieldMasters.cxx | 2 sw/qa/api/SwXTextFieldTypes.cxx | 2 sw/qa/api/SwXTextFrame.cxx | 2 sw/qa/api/SwXTextSections.cxx | 2 sw/qa/api/SwXTextTable.cxx | 2 sw/qa/api/SwXTextTables.cxx | 2 sw/qa/extras/tiledrendering/tiledrendering2.cxx | 6 sw/qa/inc/swmodeltestbase.hxx | 4 sw/qa/unit/swmodeltestbase.cxx | 2 sw/qa/writerfilter/dmapper/GraphicImport.cxx | 6 sw/qa/writerfilter/dmapper/SettingsTable.cxx | 6 sw/qa/writerfilter/filter/WriterFilter.cxx | 6 sw/qa/writerfilter/rtftok/rtfdispatchsymbol.cxx | 6 test/Library_subsequenttest.mk | 1 test/source/unoapi_test.cxx | 13 + test/source/unoapixml_test.cxx | 41 ---- unoxml/CppunitTest_unoxml_rdftest.mk | 1 vcl/CppunitTest_vcl_filter_ipdf.mk | 1 vcl/CppunitTest_vcl_font_ttf_structure_test.mk | 5 vcl/CppunitTest_vcl_gen.mk | 5 vcl/CppunitTest_vcl_pdf_encryption.mk | 1 vcl/CppunitTest_vcl_pdfexport.mk | 1 vcl/CppunitTest_vcl_unx_generic.mk | 1 writerperfect/qa/unit/EPUBExportTest.cxx | 6 xmloff/qa/unit/draw.cxx | 6 xmloff/qa/unit/style.cxx | 6 xmloff/qa/unit/text.cxx | 6 xmloff/qa/unit/text/txtparae.cxx | 6 xmloff/qa/unit/text/txtprmap.cxx | 6 xmlsecurity/CppunitTest_xmlsecurity_xmlsec.mk | 1 xmlsecurity/qa/unit/signing/signing.cxx | 10 - xmlsecurity/qa/unit/signing/signing2.cxx | 10 - 159 files changed, 867 insertions(+), 336 deletions(-)
New commits: commit ba3fb9026cda8beea3111ae6dbde16d100e72181 Author: Xisco Fauli <[email protected]> AuthorDate: Tue Feb 17 16:18:19 2026 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Wed Feb 18 21:17:13 2026 +0100 merge UnoApiText and UnoApiXmlTest in preparation for a follow-up commit Change-Id: I3449c031696fe3ab13d4832e2671da08eb483cdb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199552 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> diff --git a/chart2/qa/extras/charttest.hxx b/chart2/qa/extras/charttest.hxx index 9935456215fb..556fe641e14b 100644 --- a/chart2/qa/extras/charttest.hxx +++ b/chart2/qa/extras/charttest.hxx @@ -9,7 +9,7 @@ #pragma once -#include <test/unoapixml_test.hxx> +#include <test/unoapi_test.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/propertysequence.hxx> @@ -59,11 +59,11 @@ using namespace css; using namespace css::uno; -class ChartTest : public UnoApiXmlTest +class ChartTest : public UnoApiTest { public: ChartTest(const OUString& path) - : UnoApiXmlTest(path) + : UnoApiTest(path) { } diff --git a/cppcanvas/CppunitTest_cppcanvas_emfplus.mk b/cppcanvas/CppunitTest_cppcanvas_emfplus.mk index 7e692bdd53e0..1ddcf55ba0b9 100644 --- a/cppcanvas/CppunitTest_cppcanvas_emfplus.mk +++ b/cppcanvas/CppunitTest_cppcanvas_emfplus.mk @@ -29,7 +29,10 @@ $(eval $(call gb_CppunitTest_use_libraries,cppcanvas_emfplus, \ vcl \ )) -$(eval $(call gb_CppunitTest_use_external,cppcanvas_emfplus,boost_headers)) +$(eval $(call gb_CppunitTest_use_externals,cppcanvas_emfplus, \ + boost_headers \ + libxml2 \ +)) $(eval $(call gb_CppunitTest_use_sdk_api,cppcanvas_emfplus)) diff --git a/dbaccess/CppunitTest_dbaccess_CRMDatabase_test.mk b/dbaccess/CppunitTest_dbaccess_CRMDatabase_test.mk index 4e93dc0fe25e..e6ae82ecd3d4 100644 --- a/dbaccess/CppunitTest_dbaccess_CRMDatabase_test.mk +++ b/dbaccess/CppunitTest_dbaccess_CRMDatabase_test.mk @@ -9,7 +9,10 @@ $(eval $(call gb_CppunitTest_CppunitTest,dbaccess_CRMDatabase_test)) -$(eval $(call gb_CppunitTest_use_external,dbaccess_CRMDatabase_test,boost_headers)) +$(eval $(call gb_CppunitTest_use_externals,dbaccess_CRMDatabase_test, \ + boost_headers \ + libxml2 \ +)) $(eval $(call gb_CppunitTest_add_exception_objects,dbaccess_CRMDatabase_test, \ dbaccess/qa/unit/CRMDatabase_test \ diff --git a/dbaccess/CppunitTest_dbaccess_RowSetClones.mk b/dbaccess/CppunitTest_dbaccess_RowSetClones.mk index 49ca097132f0..e94deee13fd9 100644 --- a/dbaccess/CppunitTest_dbaccess_RowSetClones.mk +++ b/dbaccess/CppunitTest_dbaccess_RowSetClones.mk @@ -15,6 +15,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,dbaccess_RowSetClones, \ $(eval $(call gb_CppunitTest_use_externals,dbaccess_RowSetClones,\ boost_headers \ + libxml2 \ )) $(eval $(call gb_CppunitTest_use_libraries,dbaccess_RowSetClones, \ diff --git a/dbaccess/CppunitTest_dbaccess_dialog_save.mk b/dbaccess/CppunitTest_dbaccess_dialog_save.mk index b77cbfb95ec1..da6b851dda0f 100644 --- a/dbaccess/CppunitTest_dbaccess_dialog_save.mk +++ b/dbaccess/CppunitTest_dbaccess_dialog_save.mk @@ -15,6 +15,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,dbaccess_dialog_save, \ $(eval $(call gb_CppunitTest_use_externals,dbaccess_dialog_save,\ boost_headers \ + libxml2 \ )) $(eval $(call gb_CppunitTest_use_libraries,dbaccess_dialog_save, \ diff --git a/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk b/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk index 80af11b4e826..092da82e2e36 100644 --- a/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk +++ b/dbaccess/CppunitTest_dbaccess_embeddeddb_performancetest.mk @@ -9,7 +9,10 @@ $(eval $(call gb_CppunitTest_CppunitTest,dbaccess_embeddeddb_performancetest)) -$(eval $(call gb_CppunitTest_use_external,dbaccess_embeddeddb_performancetest,boost_headers)) +$(eval $(call gb_CppunitTest_use_externals,dbaccess_embeddeddb_performancetest, \ + boost_headers \ + libxml2 \ +)) $(eval $(call gb_CppunitTest_add_exception_objects,dbaccess_embeddeddb_performancetest, \ dbaccess/qa/unit/embeddeddb_performancetest \ diff --git a/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk b/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk index 733045c6788b..730700bcd056 100644 --- a/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk +++ b/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk @@ -15,6 +15,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,dbaccess_empty_stdlib_save, \ $(eval $(call gb_CppunitTest_use_externals,dbaccess_empty_stdlib_save,\ boost_headers \ + libxml2 \ )) $(eval $(call gb_CppunitTest_use_libraries,dbaccess_empty_stdlib_save, \ diff --git a/dbaccess/CppunitTest_dbaccess_firebird_test.mk b/dbaccess/CppunitTest_dbaccess_firebird_test.mk index a8d4704eb1e9..c00749074bb0 100644 --- a/dbaccess/CppunitTest_dbaccess_firebird_test.mk +++ b/dbaccess/CppunitTest_dbaccess_firebird_test.mk @@ -9,7 +9,10 @@ $(eval $(call gb_CppunitTest_CppunitTest,dbaccess_firebird_test)) -$(eval $(call gb_CppunitTest_use_external,dbaccess_firebird_test,boost_headers)) +$(eval $(call gb_CppunitTest_use_externals,dbaccess_firebird_test, \ + boost_headers \ + libxml2 \ +)) $(eval $(call gb_CppunitTest_add_exception_objects,dbaccess_firebird_test, \ dbaccess/qa/unit/firebird \ diff --git a/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk b/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk index 07b4f960b859..34005b6e9624 100644 --- a/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk +++ b/dbaccess/CppunitTest_dbaccess_hsqldb_test.mk @@ -9,7 +9,10 @@ $(eval $(call gb_CppunitTest_CppunitTest,dbaccess_hsqldb_test)) -$(eval $(call gb_CppunitTest_use_external,dbaccess_hsqldb_test,boost_headers)) +$(eval $(call gb_CppunitTest_use_externals,dbaccess_hsqldb_test, \ + boost_headers \ + libxml2 \ +)) $(eval $(call gb_CppunitTest_add_exception_objects,dbaccess_hsqldb_test, \ dbaccess/qa/unit/hsqldb \ diff --git a/dbaccess/CppunitTest_dbaccess_migration.mk b/dbaccess/CppunitTest_dbaccess_migration.mk index 89ff0f05d4e1..4cebb31aa352 100644 --- a/dbaccess/CppunitTest_dbaccess_migration.mk +++ b/dbaccess/CppunitTest_dbaccess_migration.mk @@ -13,7 +13,10 @@ $(eval $(call gb_CppunitTest_add_exception_objects,dbaccess_migration, \ dbaccess/qa/unit/migration \ )) -$(eval $(call gb_CppunitTest_use_external,dbaccess_migration,boost_headers)) +$(eval $(call gb_CppunitTest_use_externals,dbaccess_migration, \ + boost_headers \ + libxml2 \ +)) $(eval $(call gb_CppunitTest_use_libraries,dbaccess_migration, \ basegfx \ diff --git a/dbaccess/CppunitTest_dbaccess_nolib_save.mk b/dbaccess/CppunitTest_dbaccess_nolib_save.mk index 4437548977de..fe033ff70c55 100644 --- a/dbaccess/CppunitTest_dbaccess_nolib_save.mk +++ b/dbaccess/CppunitTest_dbaccess_nolib_save.mk @@ -15,6 +15,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,dbaccess_nolib_save, \ $(eval $(call gb_CppunitTest_use_externals,dbaccess_nolib_save,\ boost_headers \ + libxml2 \ )) $(eval $(call gb_CppunitTest_use_libraries,dbaccess_nolib_save, \ diff --git a/embeddedobj/CppunitTest_embeddedobj_general.mk b/embeddedobj/CppunitTest_embeddedobj_general.mk index 6c4014e2fc89..68fc6b79df71 100644 --- a/embeddedobj/CppunitTest_embeddedobj_general.mk +++ b/embeddedobj/CppunitTest_embeddedobj_general.mk @@ -13,6 +13,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,embeddedobj_general)) $(eval $(call gb_CppunitTest_use_externals,embeddedobj_general,\ boost_headers \ + libxml2 \ )) $(eval $(call gb_CppunitTest_add_exception_objects,embeddedobj_general, \ diff --git a/embeddedobj/qa/cppunit/msole.cxx b/embeddedobj/qa/cppunit/msole.cxx index c06c599f8fd0..65f43a62d492 100644 --- a/embeddedobj/qa/cppunit/msole.cxx +++ b/embeddedobj/qa/cppunit/msole.cxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <test/unoapixml_test.hxx> +#include <test/unoapi_test.hxx> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/embed/XStorage.hpp> @@ -35,11 +35,11 @@ using namespace ::com::sun::star; namespace { /// Covers embeddedobj/source/msole/ fixes. -class Test : public UnoApiXmlTest +class Test : public UnoApiTest { public: Test() - : UnoApiXmlTest("/embeddedobj/qa/cppunit/data/") + : UnoApiTest("/embeddedobj/qa/cppunit/data/") { } }; diff --git a/emfio/qa/cppunit/emf/EmfImportTest.cxx b/emfio/qa/cppunit/emf/EmfImportTest.cxx index 5d134baf3488..4d91a7eb0afa 100644 --- a/emfio/qa/cppunit/emf/EmfImportTest.cxx +++ b/emfio/qa/cppunit/emf/EmfImportTest.cxx @@ -10,7 +10,7 @@ #include <sal/config.h> #include <config_fonts.h> -#include <test/unoapixml_test.hxx> +#include <test/unoapi_test.hxx> #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -37,11 +37,11 @@ using namespace css::graphic; using drawinglayer::primitive2d::Primitive2DSequence; using drawinglayer::primitive2d::Primitive2DContainer; -class Test : public UnoApiXmlTest +class Test : public UnoApiTest { public: Test() - : UnoApiXmlTest(u"/emfio/qa/cppunit/emf/data/"_ustr) + : UnoApiTest(u"/emfio/qa/cppunit/emf/data/"_ustr) { } diff --git a/filter/CppunitTest_filter_pdf.mk b/filter/CppunitTest_filter_pdf.mk index 912b84e0edb4..4fd7ca11d5bd 100644 --- a/filter/CppunitTest_filter_pdf.mk +++ b/filter/CppunitTest_filter_pdf.mk @@ -13,6 +13,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,filter_pdf)) $(eval $(call gb_CppunitTest_use_externals,filter_pdf,\ boost_headers \ + libxml2 \ )) $(eval $(call gb_CppunitTest_add_exception_objects,filter_pdf, \ diff --git a/filter/CppunitTest_filter_textfilterdetect.mk b/filter/CppunitTest_filter_textfilterdetect.mk index e931a5741a1d..988a99e2a6d0 100644 --- a/filter/CppunitTest_filter_textfilterdetect.mk +++ b/filter/CppunitTest_filter_textfilterdetect.mk @@ -14,7 +14,10 @@ $(eval $(call gb_CppunitTest_use_api,filter_textfilterdetect,\ udkapi \ )) -$(eval $(call gb_CppunitTest_use_external,filter_textfilterdetect,boost_headers)) +$(eval $(call gb_CppunitTest_use_externals,filter_textfilterdetect, \ + boost_headers \ + libxml2 \ +)) $(eval $(call gb_CppunitTest_use_libraries,filter_textfilterdetect, \ comphelper \ diff --git a/filter/qa/unit/svg.cxx b/filter/qa/unit/svg.cxx index 99417f95296c..a6aea8e995a2 100644 --- a/filter/qa/unit/svg.cxx +++ b/filter/qa/unit/svg.cxx @@ -9,7 +9,7 @@ #include <sal/config.h> -#include <test/unoapixml_test.hxx> +#include <test/unoapi_test.hxx> #include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/io/XOutputStream.hpp> @@ -30,7 +30,7 @@ using namespace ::com::sun::star; /// SVG filter tests. -class SvgFilterTest : public UnoApiXmlTest +class SvgFilterTest : public UnoApiTest { public: SvgFilterTest(); @@ -38,7 +38,7 @@ public: }; SvgFilterTest::SvgFilterTest() - : UnoApiXmlTest(u"/filter/qa/unit/data/"_ustr) + : UnoApiTest(u"/filter/qa/unit/data/"_ustr) { } diff --git a/framework/CppunitTest_framework_CheckXTitle.mk b/framework/CppunitTest_framework_CheckXTitle.mk index 59f02421f5ed..fd1cc13db5a3 100644 --- a/framework/CppunitTest_framework_CheckXTitle.mk +++ b/framework/CppunitTest_framework_CheckXTitle.mk @@ -29,7 +29,10 @@ $(eval $(call gb_CppunitTest_use_libraries,framework_CheckXTitle, \ vcl \ )) -$(eval $(call gb_CppunitTest_use_external,framework_CheckXTitle,boost_headers)) +$(eval $(call gb_CppunitTest_use_externals,framework_CheckXTitle, \ + boost_headers \ + libxml2 \ +)) $(eval $(call gb_CppunitTest_use_sdk_api,framework_CheckXTitle)) diff --git a/framework/CppunitTest_framework_accelerators.mk b/framework/CppunitTest_framework_accelerators.mk index 3df8c3116efb..3890567fcc8b 100644 --- a/framework/CppunitTest_framework_accelerators.mk +++ b/framework/CppunitTest_framework_accelerators.mk @@ -26,7 +26,10 @@ $(eval $(call gb_CppunitTest_use_libraries,framework_accelerators, \ unotest \ )) -$(eval $(call gb_CppunitTest_use_external,framework_accelerators,boost_headers)) +$(eval $(call gb_CppunitTest_use_externals,framework_accelerators, \ + boost_headers \ + libxml2 \ +)) $(eval $(call gb_CppunitTest_use_sdk_api,framework_accelerators)) diff --git a/framework/CppunitTest_framework_dispatch.mk b/framework/CppunitTest_framework_dispatch.mk index b9571ebe3ad4..a03c13fabc02 100644 --- a/framework/CppunitTest_framework_dispatch.mk +++ b/framework/CppunitTest_framework_dispatch.mk @@ -28,7 +28,10 @@ $(eval $(call gb_CppunitTest_use_libraries,framework_dispatch, \ unotest \ )) -$(eval $(call gb_CppunitTest_use_external,framework_dispatch,boost_headers)) +$(eval $(call gb_CppunitTest_use_externals,framework_dispatch, \ + boost_headers \ + libxml2 \ +)) $(eval $(call gb_CppunitTest_use_sdk_api,framework_dispatch)) diff --git a/framework/CppunitTest_framework_loadenv.mk b/framework/CppunitTest_framework_loadenv.mk index 4f5f4b8e8337..63846f46b571 100644 --- a/framework/CppunitTest_framework_loadenv.mk +++ b/framework/CppunitTest_framework_loadenv.mk @@ -29,7 +29,10 @@ $(eval $(call gb_CppunitTest_use_libraries,framework_loadenv, \ vcl \ )) -$(eval $(call gb_CppunitTest_use_external,framework_loadenv,boost_headers)) +$(eval $(call gb_CppunitTest_use_externals,framework_loadenv, \ + boost_headers \ + libxml2 \ +)) $(eval $(call gb_CppunitTest_use_sdk_api,framework_loadenv)) diff --git a/framework/CppunitTest_framework_services.mk b/framework/CppunitTest_framework_services.mk index 2e6e4a50a37f..4eebf65c2691 100644 --- a/framework/CppunitTest_framework_services.mk +++ b/framework/CppunitTest_framework_services.mk @@ -29,7 +29,10 @@ $(eval $(call gb_CppunitTest_use_libraries,framework_services, \ vcl \ )) -$(eval $(call gb_CppunitTest_use_external,framework_services,boost_headers)) +$(eval $(call gb_CppunitTest_use_externals,framework_services, \ + boost_headers \ + libxml2 \ +)) $(eval $(call gb_CppunitTest_use_sdk_api,framework_services)) diff --git a/include/test/unoapi_test.hxx b/include/test/unoapi_test.hxx index 6d04a669e44e..82baa824d2b0 100644 --- a/include/test/unoapi_test.hxx +++ b/include/test/unoapi_test.hxx @@ -17,6 +17,7 @@ #include <rtl/ref.hxx> #include <test/bootstrapfixture.hxx> #include <test/testinteractionhandler.hxx> +#include <test/xmltesttools.hxx> #include <tools/stream.hxx> #include <unotest/macros_test.hxx> #include <com/sun/star/lang/XComponent.hpp> @@ -128,7 +129,9 @@ const std::unordered_map<TestFilter, OUString> TestFilterNames{ // basic uno api test class -class OOO_DLLPUBLIC_TEST UnoApiTest : public test::BootstrapFixture, public unotest::MacrosTest +class OOO_DLLPUBLIC_TEST UnoApiTest : public test::BootstrapFixture, + public unotest::MacrosTest, + public XmlTestTools { public: UnoApiTest(OUString path); @@ -159,6 +162,15 @@ public: void createTempCopy(std::u16string_view fileName); + xmlDocUniquePtr parseExport(OUString const& rStreamName); + + /** + * Returns an xml stream of an exported file. + * To be used when the exporter doesn't create zip archives, but single files + * (like Flat ODF Export) + */ + xmlDocUniquePtr parseExportedFile(); + void skipValidation() { mbSkipValidation = true; } void setImportFilterName(TestFilter eFilterName) { meImportFilterName = eFilterName; } diff --git a/include/test/unoapixml_test.hxx b/include/test/unoapixml_test.hxx deleted file mode 100644 index 569be11790b9..000000000000 --- a/include/test/unoapixml_test.hxx +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#ifndef INCLUDED_TEST_UNOAPIXML_TEST_HXX -#define INCLUDED_TEST_UNOAPIXML_TEST_HXX - -#include <sal/config.h> - -#include <test/unoapi_test.hxx> -#include <test/xmltesttools.hxx> - -// basic uno api xml test class - -class OOO_DLLPUBLIC_TEST UnoApiXmlTest : public UnoApiTest, public XmlTestTools -{ -public: - UnoApiXmlTest(OUString path); - - xmlDocUniquePtr parseExport(OUString const& rStreamName); - - /** - * Returns an xml stream of an exported file. - * To be used when the exporter doesn't create zip archives, but single files - * (like Flat ODF Export) - */ - xmlDocUniquePtr parseExportedFile(); -}; - -#endif // INCLUDED_TEST_UNOAPIXML_TEST_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/CppunitTest_lotuswordpro_import_test.mk b/lotuswordpro/CppunitTest_lotuswordpro_import_test.mk index 6cd6c619bc66..b4cbe24bfc3c 100644 --- a/lotuswordpro/CppunitTest_lotuswordpro_import_test.mk +++ b/lotuswordpro/CppunitTest_lotuswordpro_import_test.mk @@ -9,7 +9,10 @@ $(eval $(call gb_CppunitTest_CppunitTest,lotuswordpro_import_test)) -$(eval $(call gb_CppunitTest_use_external,lotuswordpro_import_test,boost_headers)) +$(eval $(call gb_CppunitTest_use_externals,lotuswordpro_import_test, \ + boost_headers \ + libxml2 \ +)) $(eval $(call gb_CppunitTest_add_exception_objects,lotuswordpro_import_test, \ lotuswordpro/qa/cppunit/import_test \ diff --git a/oox/CppunitTest_oox_drawingml.mk b/oox/CppunitTest_oox_drawingml.mk index d670e05cd7b5..32bc5bacb3f4 100644 --- a/oox/CppunitTest_oox_drawingml.mk +++ b/oox/CppunitTest_oox_drawingml.mk @@ -13,6 +13,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,oox_drawingml)) $(eval $(call gb_CppunitTest_use_externals,oox_drawingml,\ boost_headers \ + libxml2 \ )) $(eval $(call gb_CppunitTest_add_exception_objects,oox_drawingml, \ diff --git a/oox/CppunitTest_oox_helper.mk b/oox/CppunitTest_oox_helper.mk index 755f0d6ec4ec..a430e8c1e6b8 100644 --- a/oox/CppunitTest_oox_helper.mk +++ b/oox/CppunitTest_oox_helper.mk @@ -13,6 +13,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,oox_helper)) $(eval $(call gb_CppunitTest_use_externals,oox_helper,\ boost_headers \ + libxml2 \ )) $(eval $(call gb_CppunitTest_add_exception_objects,oox_helper, \ diff --git a/oox/CppunitTest_oox_mathml.mk b/oox/CppunitTest_oox_mathml.mk index 58d04b1ad9f9..f7f65e340d71 100644 --- a/oox/CppunitTest_oox_mathml.mk +++ b/oox/CppunitTest_oox_mathml.mk @@ -13,6 +13,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,oox_mathml)) $(eval $(call gb_CppunitTest_use_externals,oox_mathml,\ boost_headers \ + libxml2 \ )) $(eval $(call gb_CppunitTest_add_exception_objects,oox_mathml, \ diff --git a/oox/CppunitTest_oox_shape.mk b/oox/CppunitTest_oox_shape.mk index f4e7384b4f51..93e169c76634 100644 --- a/oox/CppunitTest_oox_shape.mk +++ b/oox/CppunitTest_oox_shape.mk @@ -13,6 +13,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,oox_shape)) $(eval $(call gb_CppunitTest_use_externals,oox_shape,\ boost_headers \ + libxml2 \ )) $(eval $(call gb_CppunitTest_add_exception_objects,oox_shape, \ diff --git a/oox/CppunitTest_oox_vml.mk b/oox/CppunitTest_oox_vml.mk index 475c4cf6158f..2a82c3eb2644 100644 --- a/oox/CppunitTest_oox_vml.mk +++ b/oox/CppunitTest_oox_vml.mk @@ -13,6 +13,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,oox_vml)) $(eval $(call gb_CppunitTest_use_externals,oox_vml,\ boost_headers \ + libxml2 \ )) $(eval $(call gb_CppunitTest_add_exception_objects,oox_vml, \ diff --git a/oox/qa/unit/export.cxx b/oox/qa/unit/export.cxx index 76e7df34d9f4..249991d3a393 100644 --- a/oox/qa/unit/export.cxx +++ b/oox/qa/unit/export.cxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <test/unoapixml_test.hxx> +#include <test/unoapi_test.hxx> #include <com/sun/star/text/ControlCharacter.hpp> #include <com/sun/star/text/XTextDocument.hpp> @@ -17,11 +17,11 @@ using namespace ::com::sun::star; namespace { /// Covers ooox/source/export/ fixes. -class Test : public UnoApiXmlTest +class Test : public UnoApiTest { public: Test() - : UnoApiXmlTest(u"/oox/qa/unit/data/"_ustr) + : UnoApiTest(u"/oox/qa/unit/data/"_ustr) { } }; diff --git a/oox/qa/unit/mcgr.cxx b/oox/qa/unit/mcgr.cxx index 8aef8769377a..19d84e2566fe 100644 --- a/oox/qa/unit/mcgr.cxx +++ b/oox/qa/unit/mcgr.cxx @@ -7,18 +7,18 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <test/unoapixml_test.hxx> +#include <test/unoapi_test.hxx> using namespace ::com::sun::star; namespace { /// Covers tests for multi-color gradient (MCGR) feature, available since LO 7.6.0. -class TestMCGR : public UnoApiXmlTest +class TestMCGR : public UnoApiTest { public: TestMCGR() - : UnoApiXmlTest(u"/oox/qa/unit/data/"_ustr) + : UnoApiTest(u"/oox/qa/unit/data/"_ustr) { } }; diff --git a/oox/qa/unit/testscene3d.cxx b/oox/qa/unit/testscene3d.cxx index d83496885a33..089e2ec1d147 100644 --- a/oox/qa/unit/testscene3d.cxx +++ b/oox/qa/unit/testscene3d.cxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <test/unoapixml_test.hxx> +#include <test/unoapi_test.hxx> #include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/awt/Size.hpp> @@ -30,11 +30,11 @@ using namespace css; /// Covers tests for scene3d import and export, available since LO 24.8., see tdf#70039 -class TestScene3d : public UnoApiXmlTest +class TestScene3d : public UnoApiTest { public: TestScene3d() - : UnoApiXmlTest(u"/oox/qa/unit/data/"_ustr) + : UnoApiTest(u"/oox/qa/unit/data/"_ustr) { } diff --git a/oox/qa/unit/wpc_drawing_canvas.cxx b/oox/qa/unit/wpc_drawing_canvas.cxx index 8790ceda9d6e..0af8389c5891 100644 --- a/oox/qa/unit/wpc_drawing_canvas.cxx +++ b/oox/qa/unit/wpc_drawing_canvas.cxx @@ -8,7 +8,7 @@ */ #include <tools/color.hxx> -#include <test/unoapixml_test.hxx> +#include <test/unoapi_test.hxx> #include <docmodel/color/ComplexColor.hxx> #include <docmodel/uno/UnoComplexColor.hxx> @@ -35,11 +35,11 @@ namespace /// The test suite covers tests for import of Word drawing canvas (wpc), available since LO 24.2. /// Before its implementation the VML fallback was used. That lost properties because VML is not able /// to describe them or the VML import of LO has deficits. -class TestWPC : public UnoApiXmlTest +class TestWPC : public UnoApiTest { public: TestWPC() - : UnoApiXmlTest(u"/oox/qa/unit/data/"_ustr) + : UnoApiTest(u"/oox/qa/unit/data/"_ustr) { } }; diff --git a/reportdesign/CppunitTest_reportdesign_basic_test.mk b/reportdesign/CppunitTest_reportdesign_basic_test.mk index 2c79a2c6a649..693afbed6943 100644 --- a/reportdesign/CppunitTest_reportdesign_basic_test.mk +++ b/reportdesign/CppunitTest_reportdesign_basic_test.mk @@ -9,7 +9,10 @@ $(eval $(call gb_CppunitTest_CppunitTest,reportdesign_basic_test)) -$(eval $(call gb_CppunitTest_use_external,reportdesign_basic_test,boost_headers)) +$(eval $(call gb_CppunitTest_use_externals,reportdesign_basic_test, \ + boost_headers \ + libxml2 \ +)) $(eval $(call gb_CppunitTest_add_exception_objects,reportdesign_basic_test, \ reportdesign/qa/unit/ReportDesignBasicTests \ diff --git a/sc/CppunitTest_sc_anchor_test.mk b/sc/CppunitTest_sc_anchor_test.mk index 3ad9e4271c85..196189fdaddc 100644 --- a/sc/CppunitTest_sc_anchor_test.mk +++ b/sc/CppunitTest_sc_anchor_test.mk @@ -17,7 +17,10 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_anchor_test, \ sc/qa/unit/anchor \ )) -$(eval $(call gb_CppunitTest_use_external,sc_anchor_test,boost_headers)) +$(eval $(call gb_CppunitTest_use_externals,sc_anchor_test, \ + boost_headers \ + libxml2 \ +)) $(eval $(call gb_CppunitTest_use_libraries,sc_anchor_test, \ basegfx \ diff --git a/sc/CppunitTest_sc_cond_format_merge.mk b/sc/CppunitTest_sc_cond_format_merge.mk index 03b40956288e..f06e3331a3af 100644 --- a/sc/CppunitTest_sc_cond_format_merge.mk +++ b/sc/CppunitTest_sc_cond_format_merge.mk @@ -17,6 +17,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_cond_format_merge, \ $(eval $(call gb_CppunitTest_use_externals,sc_cond_format_merge, \ boost_headers \ + libxml2 \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_cond_format_merge, \ diff --git a/sc/CppunitTest_sc_functionlistobj.mk b/sc/CppunitTest_sc_functionlistobj.mk index ff4719d77b6b..f0bf7549fcc7 100644 --- a/sc/CppunitTest_sc_functionlistobj.mk +++ b/sc/CppunitTest_sc_functionlistobj.mk @@ -11,7 +11,10 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_functionlistobj)) -$(eval $(call gb_CppunitTest_use_external,sc_functionlistobj,boost_headers)) +$(eval $(call gb_CppunitTest_use_externals,sc_functionlistobj, \ + boost_headers \ + libxml2 \ +)) $(eval $(call gb_CppunitTest_use_common_precompiled_header,sc_functionlistobj)) diff --git a/sc/CppunitTest_sc_new_cond_format_api.mk b/sc/CppunitTest_sc_new_cond_format_api.mk index 3104a9ed7eb8..4ee351de12f0 100644 --- a/sc/CppunitTest_sc_new_cond_format_api.mk +++ b/sc/CppunitTest_sc_new_cond_format_api.mk @@ -17,7 +17,10 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_new_cond_format_api, \ sc/qa/extras/new_cond_format \ )) -$(eval $(call gb_CppunitTest_use_external,sc_new_cond_format_api,boost_headers)) +$(eval $(call gb_CppunitTest_use_externals,sc_new_cond_format_api, \ + boost_headers \ + libxml2 \ +)) $(eval $(call gb_CppunitTest_use_libraries,sc_new_cond_format_api, \ basegfx \ diff --git a/sc/CppunitTest_sc_pdf_export.mk b/sc/CppunitTest_sc_pdf_export.mk index ddd856b2859e..a208b0aa9553 100644 --- a/sc/CppunitTest_sc_pdf_export.mk +++ b/sc/CppunitTest_sc_pdf_export.mk @@ -17,7 +17,9 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_pdf_export, \ $(eval $(call gb_CppunitTest_use_externals,sc_pdf_export, \ boost_headers \ + libxml2 \ )) + ifeq ($(TLS),NSS) $(eval $(call gb_CppunitTest_use_externals,sc_pdf_export,\ plc4 \ diff --git a/sc/CppunitTest_sc_vba_macro_test.mk b/sc/CppunitTest_sc_vba_macro_test.mk index dc16cfd33a87..e648d1240213 100644 --- a/sc/CppunitTest_sc_vba_macro_test.mk +++ b/sc/CppunitTest_sc_vba_macro_test.mk @@ -12,6 +12,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_vba_macro_test)) $(eval $(call gb_CppunitTest_use_externals,sc_vba_macro_test, \ boost_headers \ mdds_headers \ + libxml2 \ )) $(eval $(call gb_CppunitTest_use_common_precompiled_header,sc_vba_macro_test)) diff --git a/sc/common_unoapi_tests.mk b/sc/common_unoapi_tests.mk index 7a8fc75a1673..829a478d9b71 100644 --- a/sc/common_unoapi_tests.mk +++ b/sc/common_unoapi_tests.mk @@ -14,7 +14,10 @@ define sc_unoapi_common $(eval $(call gb_CppunitTest_CppunitTest,sc_$(1))) -$(eval $(call gb_CppunitTest_use_external,sc_$(1),boost_headers)) +$(eval $(call gb_CppunitTest_use_externals,sc_$(1), \ + boost_headers \ + libxml2 \ +)) $(eval $(call gb_Library_use_common_precompiled_header,sc_$(1))) diff --git a/sc/qa/extras/htmlexporttest.cxx b/sc/qa/extras/htmlexporttest.cxx index 31e9ad4a8fda..b59d14802d7e 100644 --- a/sc/qa/extras/htmlexporttest.cxx +++ b/sc/qa/extras/htmlexporttest.cxx @@ -11,13 +11,13 @@ #include <comphelper/propertyvalue.hxx> #include <test/htmltesttools.hxx> -#include <test/unoapixml_test.hxx> +#include <test/unoapi_test.hxx> -class ScHTMLExportTest : public UnoApiXmlTest, public HtmlTestTools +class ScHTMLExportTest : public UnoApiTest, public HtmlTestTools { public: ScHTMLExportTest() - : UnoApiXmlTest(u"/sc/qa/extras/testdocuments/"_ustr) + : UnoApiTest(u"/sc/qa/extras/testdocuments/"_ustr) {} void testHtmlSkipImage() diff --git a/sc/qa/unit/SparklineImportExportTest.cxx b/sc/qa/unit/SparklineImportExportTest.cxx index 44ae4918bcee..eb96498313a5 100644 --- a/sc/qa/unit/SparklineImportExportTest.cxx +++ b/sc/qa/unit/SparklineImportExportTest.cxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <test/unoapixml_test.hxx> +#include <test/unoapi_test.hxx> #include <document.hxx> #include <comphelper/servicehelper.hxx> #include <Sparkline.hxx> @@ -17,11 +17,11 @@ using namespace css; /** Test import, export or roundtrip of sparklines for ODF and OOXML */ -class SparklineImportExportTest : public UnoApiXmlTest +class SparklineImportExportTest : public UnoApiTest { public: SparklineImportExportTest() - : UnoApiXmlTest(u"sc/qa/unit/data"_ustr) + : UnoApiTest(u"sc/qa/unit/data"_ustr) { } diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx index 0763b5a5c18e..84a32d1ba9bd 100644 --- a/sc/qa/unit/helper/qahelper.hxx +++ b/sc/qa/unit/helper/qahelper.hxx @@ -14,7 +14,7 @@ #include <cppunit/SourceLine.h> -#include <test/unoapixml_test.hxx> +#include <test/unoapi_test.hxx> #include <test/bootstrapfixture.hxx> #include <comphelper/documentconstants.hxx> @@ -145,11 +145,11 @@ protected: ScDocument* m_pDoc; }; -class SCQAHELPER_DLLPUBLIC ScModelTestBase : public UnoApiXmlTest +class SCQAHELPER_DLLPUBLIC ScModelTestBase : public UnoApiTest { public: ScModelTestBase(const OUString& path) - : UnoApiXmlTest(path) + : UnoApiTest(path) { } diff --git a/sc/qa/unit/helper/sctestviewcallback.cxx b/sc/qa/unit/helper/sctestviewcallback.cxx index 9006de61289f..5e5ada18fb15 100644 --- a/sc/qa/unit/helper/sctestviewcallback.cxx +++ b/sc/qa/unit/helper/sctestviewcallback.cxx @@ -14,7 +14,7 @@ #include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <comphelper/lok.hxx> #include <comphelper/string.hxx> -#include <test/unoapixml_test.hxx> +#include <test/unoapi_test.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/lokhelper.hxx> diff --git a/sc/qa/unit/helper/sctiledrenderingtest.cxx b/sc/qa/unit/helper/sctiledrenderingtest.cxx index f26c29ad8045..1c5d0d404f11 100644 --- a/sc/qa/unit/helper/sctiledrenderingtest.cxx +++ b/sc/qa/unit/helper/sctiledrenderingtest.cxx @@ -23,14 +23,14 @@ using namespace com::sun::star; ScTiledRenderingTest::ScTiledRenderingTest() - : UnoApiXmlTest(u"/sc/qa/unit/tiledrendering/data/"_ustr) + : UnoApiTest(u"/sc/qa/unit/tiledrendering/data/"_ustr) , m_callbackWrapper(&callback, this) { } void ScTiledRenderingTest::setUp() { - UnoApiXmlTest::setUp(); + UnoApiTest::setUp(); comphelper::LibreOfficeKit::setActive(true); } @@ -41,7 +41,7 @@ void ScTiledRenderingTest::tearDown() comphelper::LibreOfficeKit::resetCompatFlag(); - UnoApiXmlTest::tearDown(); + UnoApiTest::tearDown(); } ScModelObj* ScTiledRenderingTest::createDoc(const char* pName) diff --git a/sc/qa/unit/helper/sctiledrenderingtest.hxx b/sc/qa/unit/helper/sctiledrenderingtest.hxx index 4bd7769e57a8..9c29af771c87 100644 --- a/sc/qa/unit/helper/sctiledrenderingtest.hxx +++ b/sc/qa/unit/helper/sctiledrenderingtest.hxx @@ -9,7 +9,7 @@ #pragma once -#include <test/unoapixml_test.hxx> +#include <test/unoapi_test.hxx> #include <osl/conditn.hxx> #include <test/lokcallback.hxx> @@ -24,7 +24,7 @@ class ScTabViewShell; class ScAddress; class SfxViewShell; -class SCQAHELPER_DLLPUBLIC ScTiledRenderingTest : public UnoApiXmlTest +class SCQAHELPER_DLLPUBLIC ScTiledRenderingTest : public UnoApiTest { public: ScTiledRenderingTest(); diff --git a/sc/qa/unit/jumbosheets-test.cxx b/sc/qa/unit/jumbosheets-test.cxx index f04379ad944a..817abef3452a 100644 --- a/sc/qa/unit/jumbosheets-test.cxx +++ b/sc/qa/unit/jumbosheets-test.cxx @@ -327,7 +327,7 @@ ScJumboSheetsTest::ScJumboSheetsTest() void ScJumboSheetsTest::setUp() { - UnoApiXmlTest::setUp(); + UnoApiTest::setUp(); //Init before GetDefaultsOptions ScDLL::Init(); @@ -345,7 +345,7 @@ void ScJumboSheetsTest::tearDown() aDefaultsOption.SetInitJumboSheets(false); mod->SetDefaultsOptions(aDefaultsOption); - UnoApiXmlTest::tearDown(); + UnoApiTest::tearDown(); } CPPUNIT_TEST_SUITE_REGISTRATION(ScJumboSheetsTest); diff --git a/sccomp/CppunitTest_sccomp_swarmsolvertest.mk b/sccomp/CppunitTest_sccomp_swarmsolvertest.mk index c86c0f6fc7d8..c1966a5fce66 100644 --- a/sccomp/CppunitTest_sccomp_swarmsolvertest.mk +++ b/sccomp/CppunitTest_sccomp_swarmsolvertest.mk @@ -13,6 +13,10 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sccomp_swarmsolvertest,\ sccomp/qa/unit/SwarmSolverTest \ )) +$(eval $(call gb_CppunitTest_use_externals,sccomp_swarmsolvertest,\ + libxml2 \ +)) + $(eval $(call gb_CppunitTest_use_libraries,sccomp_swarmsolvertest,\ basegfx \ comphelper \ diff --git a/sd/CppunitTest_sd_pdf_import_test.mk b/sd/CppunitTest_sd_pdf_import_test.mk index eb3a6ecf9389..f3be2355a329 100644 --- a/sd/CppunitTest_sd_pdf_import_test.mk +++ b/sd/CppunitTest_sd_pdf_import_test.mk @@ -15,6 +15,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sd_pdf_import_test, \ $(eval $(call gb_CppunitTest_use_externals,sd_pdf_import_test, \ boost_headers \ + libxml2 \ )) $(eval $(call gb_CppunitTest_set_include,sd_pdf_import_test,\ diff --git a/sd/qa/filter/eppt/eppt.cxx b/sd/qa/filter/eppt/eppt.cxx index 460a6c10db1f..d91a8760a929 100644 --- a/sd/qa/filter/eppt/eppt.cxx +++ b/sd/qa/filter/eppt/eppt.cxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <test/unoapixml_test.hxx> +#include <test/unoapi_test.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> @@ -24,14 +24,14 @@ using namespace ::com::sun::star; namespace { /// Covers sd/source/filter/eppt/ fixes. -class Test : public UnoApiXmlTest +class Test : public UnoApiTest { public: Test(); }; Test::Test() - : UnoApiXmlTest(u"/sd/qa/filter/eppt/data/"_ustr) + : UnoApiTest(u"/sd/qa/filter/eppt/data/"_ustr) { } diff --git a/sd/qa/inc/sdtiledrenderingtest.hxx b/sd/qa/inc/sdtiledrenderingtest.hxx index 1ce66bd28cdc..4825af05f89e 100644 --- a/sd/qa/inc/sdtiledrenderingtest.hxx +++ b/sd/qa/inc/sdtiledrenderingtest.hxx @@ -9,7 +9,7 @@ #ifndef INCLUDED_SD_QA_INC_SDTILEDRENDERINGTEST_HXX #define INCLUDED_SD_QA_INC_SDTILEDRENDERINGTEST_HXX -#include <test/unoapixml_test.hxx> +#include <test/unoapi_test.hxx> #include <boost/property_tree/json_parser.hpp> @@ -21,7 +21,7 @@ class SdXImpressDocument; class SfxViewShell; -class SDQAHELPER_DLLPUBLIC SdTiledRenderingTest : public UnoApiXmlTest +class SDQAHELPER_DLLPUBLIC SdTiledRenderingTest : public UnoApiTest { public: SdTiledRenderingTest(); diff --git a/sd/qa/unit/HtmlExportTest.cxx b/sd/qa/unit/HtmlExportTest.cxx index 97087b9d9788..7ea5f8e06411 100644 --- a/sd/qa/unit/HtmlExportTest.cxx +++ b/sd/qa/unit/HtmlExportTest.cxx @@ -7,16 +7,16 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <test/unoapixml_test.hxx> +#include <test/unoapi_test.hxx> #include <test/htmltesttools.hxx> using namespace css; -class SdHTMLFilterTest : public UnoApiXmlTest, public HtmlTestTools +class SdHTMLFilterTest : public UnoApiTest, public HtmlTestTools { public: SdHTMLFilterTest() - : UnoApiXmlTest(u"/sd/qa/unit/data/"_ustr) + : UnoApiTest(u"/sd/qa/unit/data/"_ustr) { } diff --git a/sd/qa/unit/SVGExportTests.cxx b/sd/qa/unit/SVGExportTests.cxx index 6ce614adedbd..4d9505ce5fe5 100644 --- a/sd/qa/unit/SVGExportTests.cxx +++ b/sd/qa/unit/SVGExportTests.cxx @@ -10,7 +10,7 @@ #include <sal/config.h> #include <string_view> -#include <test/unoapixml_test.hxx> +#include <test/unoapi_test.hxx> #include <comphelper/scopeguard.hxx> #include <sal/macros.h> @@ -67,11 +67,11 @@ bool isValidTiledBackgroundId(const OUString& sId) } -class SdSVGFilterTest : public UnoApiXmlTest +class SdSVGFilterTest : public UnoApiTest { public: SdSVGFilterTest() - : UnoApiXmlTest(u"/sd/qa/unit/data/odp/"_ustr) + : UnoApiTest(u"/sd/qa/unit/data/odp/"_ustr) { } diff --git a/sd/qa/unit/sdmodeltestbase.hxx b/sd/qa/unit/sdmodeltestbase.hxx index e80fce16bc0c..f0f5affed889 100644 --- a/sd/qa/unit/sdmodeltestbase.hxx +++ b/sd/qa/unit/sdmodeltestbase.hxx @@ -12,7 +12,7 @@ #include <memory> #include <string_view> -#include <test/unoapixml_test.hxx> +#include <test/unoapi_test.hxx> #include <test/xmldiff.hxx> #include <drawdoc.hxx> @@ -40,11 +40,11 @@ using namespace ::com::sun::star; -class SdModelTestBase : public UnoApiXmlTest +class SdModelTestBase : public UnoApiTest { public: SdModelTestBase(const OUString& path) - : UnoApiXmlTest(path) + : UnoApiTest(path) { } diff --git a/sd/qa/unit/sdtiledrenderingtest.cxx b/sd/qa/unit/sdtiledrenderingtest.cxx index afc1d28fc469..39ddcfb40cbb 100644 --- a/sd/qa/unit/sdtiledrenderingtest.cxx +++ b/sd/qa/unit/sdtiledrenderingtest.cxx @@ -24,7 +24,7 @@ using namespace css; SdTiledRenderingTest::SdTiledRenderingTest() - : UnoApiXmlTest(u"/sd/qa/unit/tiledrendering/data/"_ustr) + : UnoApiTest(u"/sd/qa/unit/tiledrendering/data/"_ustr) , m_bFound(true) , m_nPart(0) , m_nSelectionBeforeSearchResult(0) @@ -37,7 +37,7 @@ SdTiledRenderingTest::SdTiledRenderingTest() void SdTiledRenderingTest::setUp() { - UnoApiXmlTest::setUp(); + UnoApiTest::setUp(); // prevent showing warning message box osl_setEnvironment(u"OOX_NO_SMARTART_WARNING"_ustr.pData, u"1"_ustr.pData); @@ -51,7 +51,7 @@ void SdTiledRenderingTest::tearDown() m_callbackWrapper.clear(); - UnoApiXmlTest::tearDown(); + UnoApiTest::tearDown(); } SdXImpressDocument* diff --git a/sfx2/CppunitTest_sfx2_autoredaction.mk b/sfx2/CppunitTest_sfx2_autoredaction.mk index 54082df7e807..24456445ce12 100644 --- a/sfx2/CppunitTest_sfx2_autoredaction.mk +++ b/sfx2/CppunitTest_sfx2_autoredaction.mk @@ -13,6 +13,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,sfx2_autoredaction)) $(eval $(call gb_CppunitTest_use_externals,sfx2_autoredaction,\ boost_headers \ + libxml2 \ )) $(eval $(call gb_CppunitTest_add_exception_objects,sfx2_autoredaction, \ diff --git a/sfx2/CppunitTest_sfx2_classification.mk b/sfx2/CppunitTest_sfx2_classification.mk index 2595c9c15135..2c199a845ac0 100644 --- a/sfx2/CppunitTest_sfx2_classification.mk +++ b/sfx2/CppunitTest_sfx2_classification.mk @@ -29,7 +29,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sfx2_classification, \ sfx \ )) -$(eval $(call gb_CppunitTest_use_external,sfx2_classification,boost_headers)) +$(eval $(call gb_CppunitTest_use_externals,sfx2_classification, \ + boost_headers \ + libxml2 \ +)) $(eval $(call gb_CppunitTest_use_ure,sfx2_classification)) $(eval $(call gb_CppunitTest_use_vcl,sfx2_classification)) diff --git a/sfx2/CppunitTest_sfx2_doc.mk b/sfx2/CppunitTest_sfx2_doc.mk index f1f404d13b2e..2119ce213312 100644 --- a/sfx2/CppunitTest_sfx2_doc.mk +++ b/sfx2/CppunitTest_sfx2_doc.mk @@ -13,6 +13,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,sfx2_doc)) $(eval $(call gb_CppunitTest_use_externals,sfx2_doc,\ boost_headers \ + libxml2 \ )) $(eval $(call gb_CppunitTest_add_exception_objects,sfx2_doc, \ diff --git a/sfx2/CppunitTest_sfx2_view.mk b/sfx2/CppunitTest_sfx2_view.mk index e207e4132de0..8d868c431c2d 100644 --- a/sfx2/CppunitTest_sfx2_view.mk +++ b/sfx2/CppunitTest_sfx2_view.mk @@ -13,6 +13,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,sfx2_view)) $(eval $(call gb_CppunitTest_use_externals,sfx2_view,\ boost_headers \ + libxml2 \ )) $(eval $(call gb_CppunitTest_add_exception_objects,sfx2_view, \ diff --git a/sfx2/qa/cppunit/test_misc.cxx b/sfx2/qa/cppunit/test_misc.cxx index 74e07ba210df..20a2127108b5 100644 --- a/sfx2/qa/cppunit/test_misc.cxx +++ b/sfx2/qa/cppunit/test_misc.cxx @@ -42,7 +42,7 @@ #include <com/sun/star/util/XModifyListener.hpp> #include <com/sun/star/util/XModifyBroadcaster.hpp> -#include <test/unoapixml_test.hxx> +#include <test/unoapi_test.hxx> #include <unotools/ucbstreamhelper.hxx> #include <comphelper/propertysequence.hxx> @@ -58,11 +58,11 @@ using namespace ::com::sun::star; namespace { class MiscTest - : public UnoApiXmlTest + : public UnoApiTest { public: MiscTest() - : UnoApiXmlTest(u"/sfx2/qa/cppunit/data/"_ustr) + : UnoApiTest(u"/sfx2/qa/cppunit/data/"_ustr) { } diff --git a/slideshow/CppunitTest_slideshow_engine.mk b/slideshow/CppunitTest_slideshow_engine.mk index d9a88a980f17..71519ff89898 100644 --- a/slideshow/CppunitTest_slideshow_engine.mk +++ b/slideshow/CppunitTest_slideshow_engine.mk @@ -13,6 +13,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,slideshow_engine)) $(eval $(call gb_CppunitTest_use_externals,slideshow_engine,\ boost_headers \ + libxml2 \ )) $(eval $(call gb_CppunitTest_add_exception_objects,slideshow_engine, \ diff --git a/starmath/CppunitTest_starmath_import.mk b/starmath/CppunitTest_starmath_import.mk index 0139b590bac6..6fa9aeaed12d 100644 --- a/starmath/CppunitTest_starmath_import.mk +++ b/starmath/CppunitTest_starmath_import.mk @@ -14,7 +14,10 @@ $(eval $(call gb_CppunitTest_set_include,starmath_import,\ -I$(SRCDIR)/starmath/inc \ )) -$(eval $(call gb_CppunitTest_use_external,starmath_import,boost_headers)) +$(eval $(call gb_CppunitTest_use_externals,starmath_import, \ + boost_headers \ + libxml2 \ +)) $(eval $(call gb_CppunitTest_use_sdk_api,starmath_import)) diff --git a/starmath/qa/extras/mmlexport-test.cxx b/starmath/qa/extras/mmlexport-test.cxx index 7a0f3ac90834..06dcd7348622 100644 --- a/starmath/qa/extras/mmlexport-test.cxx +++ b/starmath/qa/extras/mmlexport-test.cxx @@ -8,7 +8,7 @@ */ #include <sal/config.h> -#include <test/unoapixml_test.hxx> +#include <test/unoapi_test.hxx> #include <o3tl/cppunittraitshelper.hxx> #include <sfx2/sfxbasemodel.hxx> @@ -22,11 +22,11 @@ using namespace ::com::sun::star; -class MathMLExportTest : public UnoApiXmlTest +class MathMLExportTest : public UnoApiTest { public: MathMLExportTest() - : UnoApiXmlTest(u"starmath/qa/extras/data/"_ustr) + : UnoApiTest(u"starmath/qa/extras/data/"_ustr) { } diff --git a/svx/CppunitTest_svx_core.mk b/svx/CppunitTest_svx_core.mk index 2c4d97e29c66..8b49de847c08 100644 --- a/svx/CppunitTest_svx_core.mk +++ b/svx/CppunitTest_svx_core.mk @@ -13,6 +13,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,svx_core)) $(eval $(call gb_CppunitTest_use_externals,svx_core,\ boost_headers \ + libxml2 \ )) $(eval $(call gb_CppunitTest_add_exception_objects,svx_core, \ diff --git a/svx/qa/unit/sdr.cxx b/svx/qa/unit/sdr.cxx index 3b7139acb3e8..b85ccd64eb65 100644 --- a/svx/qa/unit/sdr.cxx +++ b/svx/qa/unit/sdr.cxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <test/unoapixml_test.hxx> +#include <test/unoapi_test.hxx> #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> #include <com/sun/star/drawing/XDrawPage.hpp> @@ -27,11 +27,11 @@ using namespace ::com::sun::star; namespace { /// Tests for svx/source/sdr/ code. -class SdrTest : public UnoApiXmlTest +class SdrTest : public UnoApiTest { public: SdrTest() - : UnoApiXmlTest(u"svx/qa/unit/data/"_ustr) + : UnoApiTest(u"svx/qa/unit/data/"_ustr) { } diff --git a/svx/qa/unit/svdraw.cxx b/svx/qa/unit/svdraw.cxx index dfd594e2d7d1..6ab24679e2ac 100644 --- a/svx/qa/unit/svdraw.cxx +++ b/svx/qa/unit/svdraw.cxx @@ -8,7 +8,7 @@ */ #include <config_poppler.h> -#include <test/unoapixml_test.hxx> +#include <test/unoapi_test.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> @@ -53,7 +53,7 @@ using namespace ::com::sun::star; namespace { /// Tests for svx/source/svdraw/ code. -class SvdrawTest : public UnoApiXmlTest +class SvdrawTest : public UnoApiTest { private: uno::Reference<xml::crypto::XSEInitializer> mxSEInitializer; @@ -61,7 +61,7 @@ private: public: SvdrawTest() - : UnoApiXmlTest(u"svx/qa/unit/data/"_ustr) + : UnoApiTest(u"svx/qa/unit/data/"_ustr) { } diff --git a/svx/qa/unit/table.cxx b/svx/qa/unit/table.cxx index f996e35a062c..c675a1de065c 100644 --- a/svx/qa/unit/table.cxx +++ b/svx/qa/unit/table.cxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <test/unoapixml_test.hxx> +#include <test/unoapi_test.hxx> #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> #include <com/sun/star/drawing/XDrawPage.hpp> @@ -32,11 +32,11 @@ using namespace ::com::sun::star; namespace { /// Tests for svx/source/table/ code. -class Test : public UnoApiXmlTest +class Test : public UnoApiTest { public: Test() - : UnoApiXmlTest(u"svx/qa/unit/data/"_ustr) + : UnoApiTest(u"svx/qa/unit/data/"_ustr) { } diff --git a/svx/qa/unit/unodraw.cxx b/svx/qa/unit/unodraw.cxx index b52d64ec0140..b2e44b7024e4 100644 --- a/svx/qa/unit/unodraw.cxx +++ b/svx/qa/unit/unodraw.cxx @@ -23,7 +23,7 @@ #include <comphelper/processfactory.hxx> #include <comphelper/propertysequence.hxx> #include <comphelper/sequenceashashmap.hxx> -#include <test/unoapixml_test.hxx> +#include <test/unoapi_test.hxx> #include <unotools/tempfile.hxx> #include <svx/unopage.hxx> #include <vcl/virdev.hxx> @@ -41,11 +41,11 @@ using namespace ::com::sun::star; namespace { /// Tests for svx/source/unodraw/ code. -class UnodrawTest : public UnoApiXmlTest +class UnodrawTest : public UnoApiTest { public: UnodrawTest() - : UnoApiXmlTest(u"svx/qa/unit/data/"_ustr) + : UnoApiTest(u"svx/qa/unit/data/"_ustr) { } }; diff --git a/sw/CppunitTest_sw_accessible_relation_set.mk b/sw/CppunitTest_sw_accessible_relation_set.mk index 5fcbef8af454..80a837641842 100644 --- a/sw/CppunitTest_sw_accessible_relation_set.mk +++ b/sw/CppunitTest_sw_accessible_relation_set.mk @@ -36,6 +36,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_accessible_relation_set, \ $(eval $(call gb_CppunitTest_use_externals,sw_accessible_relation_set,\ boost_headers \ + libxml2 \ )) $(eval $(call gb_CppunitTest_set_include,sw_accessible_relation_set,\ diff --git a/sw/qa/extras/tiledrendering/tiledrendering2.cxx b/sw/qa/extras/tiledrendering/tiledrendering2.cxx index 78e97004d5d7..55e15c4f98e0 100644 --- a/sw/qa/extras/tiledrendering/tiledrendering2.cxx +++ b/sw/qa/extras/tiledrendering/tiledrendering2.cxx @@ -351,7 +351,7 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testLoadVisibleArea) // When loading that document: OUString aURL = createFileURL(u"3pages.odt"); - UnoApiXmlTest::loadFromURL(aURL); + UnoApiTest::loadFromURL(aURL); // Then make sure only the first page is laid out: SwDocShell* pDocShell = getSwDocShell(); @@ -760,7 +760,7 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testSpellcheckVisibleArea) { // Given a document with 3 pages, the first page is visible: OUString aURL = createFileURL(u"3pages.odt"); - UnoApiXmlTest::loadFromURL(aURL); + UnoApiTest::loadFromURL(aURL); SwDocShell* pDocShell = getSwDocShell(); SwWrtShell* pWrtShell = pDocShell->GetWrtShell(); SwRootFrame* pLayout = pWrtShell->GetLayout(); @@ -789,7 +789,7 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testIdleLayoutShape) comphelper::LibreOfficeKit::setInitialClientVisibleArea(aVisibleArea); comphelper::ScopeGuard g([] { comphelper::LibreOfficeKit::setInitialClientVisibleArea({}); }); OUString aURL = createFileURL(u"3pages-shape.odt"); - UnoApiXmlTest::loadFromURL(aURL); + UnoApiTest::loadFromURL(aURL); // When doing idle layout: AnyInputCallback aAnyInput; diff --git a/sw/qa/inc/swmodeltestbase.hxx b/sw/qa/inc/swmodeltestbase.hxx index 3ae500169d69..1af5126ecf14 100644 --- a/sw/qa/inc/swmodeltestbase.hxx +++ b/sw/qa/inc/swmodeltestbase.hxx @@ -22,7 +22,7 @@ #include <com/sun/star/xml/AttributeData.hpp> #include "swqahelperdllapi.h" -#include <test/unoapixml_test.hxx> +#include <test/unoapi_test.hxx> #include <unotools/tempfile.hxx> #include <doc.hxx> @@ -56,7 +56,7 @@ class PDFiumDocument; } /// Base class for filter tests loading or roundtripping a document, then asserting the document model. -class SWQAHELPER_DLLPUBLIC SwModelTestBase : public UnoApiXmlTest +class SWQAHELPER_DLLPUBLIC SwModelTestBase : public UnoApiTest { protected: xmlBufferPtr mpXmlBuffer; diff --git a/sw/qa/unit/swmodeltestbase.cxx b/sw/qa/unit/swmodeltestbase.cxx index 690f1620ab89..5868fa4ae449 100644 --- a/sw/qa/unit/swmodeltestbase.cxx +++ b/sw/qa/unit/swmodeltestbase.cxx @@ -54,7 +54,7 @@ void SwModelTestBase::paste(std::u16string_view aFilename, const OUString& aInst } SwModelTestBase::SwModelTestBase(const OUString& pTestDocumentPath) - : UnoApiXmlTest(pTestDocumentPath) + : UnoApiTest(pTestDocumentPath) , mpXmlBuffer(nullptr) { } diff --git a/sw/qa/writerfilter/dmapper/GraphicImport.cxx b/sw/qa/writerfilter/dmapper/GraphicImport.cxx index a29fd6673bb2..7b729abb4744 100644 --- a/sw/qa/writerfilter/dmapper/GraphicImport.cxx +++ b/sw/qa/writerfilter/dmapper/GraphicImport.cxx @@ -10,7 +10,7 @@ #include <sal/config.h> #include <test/commontesttools.hxx> -#include <test/unoapixml_test.hxx> +#include <test/unoapi_test.hxx> #include <com/sun/star/awt/Point.hpp> #include <com/sun/star/awt/Size.hpp> @@ -33,11 +33,11 @@ using namespace ::com::sun::star; namespace { /// Tests for sw/source/writerfilter/dmapper/GraphicImport.cxx. -class Test : public UnoApiXmlTest +class Test : public UnoApiTest { public: Test() - : UnoApiXmlTest(u"/sw/qa/writerfilter/dmapper/data/"_ustr) + : UnoApiTest(u"/sw/qa/writerfilter/dmapper/data/"_ustr) { } }; diff --git a/sw/qa/writerfilter/dmapper/SettingsTable.cxx b/sw/qa/writerfilter/dmapper/SettingsTable.cxx index 0af5a3f7af56..a65f8b00fc9b 100644 --- a/sw/qa/writerfilter/dmapper/SettingsTable.cxx +++ b/sw/qa/writerfilter/dmapper/SettingsTable.cxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <test/unoapixml_test.hxx> +#include <test/unoapi_test.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/qa/XDumper.hpp> @@ -20,11 +20,11 @@ using namespace com::sun::star; namespace { /// Tests for sw/source/writerfilter/dmapper/SettingsTable.cxx. -class Test : public UnoApiXmlTest +class Test : public UnoApiTest { public: Test() - : UnoApiXmlTest(u"/sw/qa/writerfilter/dmapper/data/"_ustr) + : UnoApiTest(u"/sw/qa/writerfilter/dmapper/data/"_ustr) { } }; diff --git a/sw/qa/writerfilter/filter/WriterFilter.cxx b/sw/qa/writerfilter/filter/WriterFilter.cxx index 7f8cdba46d9f..c3bfb9989bc3 100644 --- a/sw/qa/writerfilter/filter/WriterFilter.cxx +++ b/sw/qa/writerfilter/filter/WriterFilter.cxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <test/unoapixml_test.hxx> +#include <test/unoapi_test.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/drawing/XDrawPageSupplier.hpp> @@ -20,11 +20,11 @@ using namespace ::com::sun::star; namespace { /// Tests for sw/source/writerfilter/filter/WriterFilter.cxx. -class Test : public UnoApiXmlTest +class Test : public UnoApiTest { public: Test() - : UnoApiXmlTest(u"/sw/qa/writerfilter/filter/data/"_ustr) + : UnoApiTest(u"/sw/qa/writerfilter/filter/data/"_ustr) { } }; diff --git a/sw/qa/writerfilter/rtftok/rtfdispatchsymbol.cxx b/sw/qa/writerfilter/rtftok/rtfdispatchsymbol.cxx index 112a42842142..72780e7a4b2b 100644 --- a/sw/qa/writerfilter/rtftok/rtfdispatchsymbol.cxx +++ b/sw/qa/writerfilter/rtftok/rtfdispatchsymbol.cxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <test/unoapixml_test.hxx> +#include <test/unoapi_test.hxx> #include <com/sun/star/text/XTextDocument.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -19,11 +19,11 @@ using namespace ::com::sun::star; namespace { /// Tests for sw/source/writerfilter/rtftok/rtfdispatchsymbol.cxx. -class Test : public UnoApiXmlTest +class Test : public UnoApiTest { public: Test() - : UnoApiXmlTest(u"/sw/qa/writerfilter/rtftok/data/"_ustr) + : UnoApiTest(u"/sw/qa/writerfilter/rtftok/data/"_ustr) { } }; diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk index 238590518a73..42f224ddfd45 100644 --- a/test/Library_subsequenttest.mk +++ b/test/Library_subsequenttest.mk @@ -45,7 +45,6 @@ $(eval $(call gb_Library_use_externals,subsequenttest,\ $(eval $(call gb_Library_add_exception_objects,subsequenttest,\ test/source/unoapi_test \ - test/source/unoapixml_test \ test/source/a11y/AccessibilityTools \ test/source/a11y/XAccessibleActionTester \ test/source/a11y/XAccessibleComponentTester \ diff --git a/test/source/unoapi_test.cxx b/test/source/unoapi_test.cxx index ec6ea6ffc46c..476005d89be2 100644 --- a/test/source/unoapi_test.cxx +++ b/test/source/unoapi_test.cxx @@ -386,4 +386,17 @@ void UnoApiTest::createTempCopy(std::u16string_view fileName) CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, e); } +xmlDocUniquePtr UnoApiTest::parseExport(OUString const& rStreamName) +{ + std::unique_ptr<SvStream> const pStream(parseExportStream(maTempFile.GetURL(), rStreamName)); + xmlDocUniquePtr pXmlDoc = parseXmlStream(pStream.get()); + return pXmlDoc; +} + +xmlDocUniquePtr UnoApiTest::parseExportedFile() +{ + auto stream(SvFileStream(maTempFile.GetURL(), StreamMode::READ | StreamMode::TEMPORARY)); + return parseXmlStream(&stream); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/test/source/unoapixml_test.cxx b/test/source/unoapixml_test.cxx deleted file mode 100644 index d07c97351066..000000000000 --- a/test/source/unoapixml_test.cxx +++ /dev/null @@ -1,41 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#include <test/unoapixml_test.hxx> - -#include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/frame/XStorable.hpp> -#include <comphelper/processfactory.hxx> -#include <comphelper/propertyvalue.hxx> - -#include <sfx2/app.hxx> -#include <sfx2/objsh.hxx> -#include <utility> - -using namespace css; - -UnoApiXmlTest::UnoApiXmlTest(OUString path) - : UnoApiTest(std::move(path)) -{ -} - -xmlDocUniquePtr UnoApiXmlTest::parseExport(OUString const& rStreamName) -{ - std::unique_ptr<SvStream> const pStream(parseExportStream(maTempFile.GetURL(), rStreamName)); - xmlDocUniquePtr pXmlDoc = parseXmlStream(pStream.get()); - return pXmlDoc; -} - -xmlDocUniquePtr UnoApiXmlTest::parseExportedFile() -{ - auto stream(SvFileStream(maTempFile.GetURL(), StreamMode::READ | StreamMode::TEMPORARY)); - return parseXmlStream(&stream); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unoxml/CppunitTest_unoxml_rdftest.mk b/unoxml/CppunitTest_unoxml_rdftest.mk index d0aebd571bff..f9f88bd5215c 100644 --- a/unoxml/CppunitTest_unoxml_rdftest.mk +++ b/unoxml/CppunitTest_unoxml_rdftest.mk @@ -19,6 +19,7 @@ $(eval $(call gb_CppunitTest_use_rdb,unoxml_rdftest,services)) $(eval $(call gb_CppunitTest_use_externals,unoxml_rdftest, \ boost_headers \ + libxml2 \ )) $(eval $(call gb_CppunitTest_use_libraries,unoxml_rdftest, \ diff --git a/vcl/CppunitTest_vcl_filter_ipdf.mk b/vcl/CppunitTest_vcl_filter_ipdf.mk index 902deedec275..13f54b903feb 100644 --- a/vcl/CppunitTest_vcl_filter_ipdf.mk +++ b/vcl/CppunitTest_vcl_filter_ipdf.mk @@ -13,6 +13,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,vcl_filter_ipdf)) $(eval $(call gb_CppunitTest_use_externals,vcl_filter_ipdf,\ boost_headers \ + libxml2 \ pdfium \ )) diff --git a/vcl/CppunitTest_vcl_font_ttf_structure_test.mk b/vcl/CppunitTest_vcl_font_ttf_structure_test.mk index 8759c800ecb4..b1fa4fe3acb4 100644 --- a/vcl/CppunitTest_vcl_font_ttf_structure_test.mk +++ b/vcl/CppunitTest_vcl_font_ttf_structure_test.mk @@ -18,7 +18,10 @@ $(eval $(call gb_CppunitTest_add_exception_objects,vcl_font_ttf_structure_test, vcl/qa/cppunit/font/TTFStructureTest \ )) -$(eval $(call gb_CppunitTest_use_externals,vcl_font_ttf_structure_test,boost_headers)) +$(eval $(call gb_CppunitTest_use_externals,vcl_font_ttf_structure_test, \ + boost_headers \ + libxml2 \ +)) $(eval $(call gb_CppunitTest_use_libraries,vcl_font_ttf_structure_test, \ basegfx \ diff --git a/vcl/CppunitTest_vcl_gen.mk b/vcl/CppunitTest_vcl_gen.mk index c65141255b64..13748755503b 100644 --- a/vcl/CppunitTest_vcl_gen.mk +++ b/vcl/CppunitTest_vcl_gen.mk @@ -30,7 +30,10 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_gen, \ vcl \ )) -$(eval $(call gb_CppunitTest_use_external,vcl_gen,boost_headers)) +$(eval $(call gb_CppunitTest_use_externals,vcl_gen, \ + boost_headers \ + libxml2 \ +)) $(eval $(call gb_CppunitTest_use_sdk_api,vcl_gen)) diff --git a/vcl/CppunitTest_vcl_pdf_encryption.mk b/vcl/CppunitTest_vcl_pdf_encryption.mk index d275b087a767..a0910e2e36eb 100644 --- a/vcl/CppunitTest_vcl_pdf_encryption.mk +++ b/vcl/CppunitTest_vcl_pdf_encryption.mk @@ -35,6 +35,7 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_pdf_encryption, \ $(eval $(call gb_CppunitTest_use_externals,vcl_pdf_encryption, \ boost_headers \ + libxml2 \ $(if $(filter PDFIUM,$(BUILD_TYPE)),pdfium) \ )) diff --git a/vcl/CppunitTest_vcl_pdfexport.mk b/vcl/CppunitTest_vcl_pdfexport.mk index e04d9d437480..59afa7f88e1b 100644 --- a/vcl/CppunitTest_vcl_pdfexport.mk +++ b/vcl/CppunitTest_vcl_pdfexport.mk @@ -32,6 +32,7 @@ $(eval $(call gb_CppunitTest_use_libraries,vcl_pdfexport, \ $(eval $(call gb_CppunitTest_use_externals,vcl_pdfexport, \ boost_headers \ + libxml2 \ $(if $(filter PDFIUM,$(BUILD_TYPE)),pdfium) \ )) diff --git a/vcl/CppunitTest_vcl_unx_generic.mk b/vcl/CppunitTest_vcl_unx_generic.mk index 4f97d5339b45..883cef16dce2 100644 --- a/vcl/CppunitTest_vcl_unx_generic.mk +++ b/vcl/CppunitTest_vcl_unx_generic.mk @@ -14,6 +14,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,vcl_unx_generic)) $(eval $(call gb_CppunitTest_use_externals,vcl_unx_generic,\ boost_headers \ harfbuzz \ + libxml2 \ )) $(eval $(call gb_CppunitTest_set_include,vcl_unx_generic,\ diff --git a/writerperfect/qa/unit/EPUBExportTest.cxx b/writerperfect/qa/unit/EPUBExportTest.cxx index e9b2bee21cc9..814dc28b2836 100644 --- a/writerperfect/qa/unit/EPUBExportTest.cxx +++ b/writerperfect/qa/unit/EPUBExportTest.cxx @@ -9,7 +9,7 @@ #include <sal/config.h> -#include <test/unoapixml_test.hxx> +#include <test/unoapi_test.hxx> #include <string_view> @@ -37,12 +37,12 @@ using namespace ::com::sun::star; namespace { /// Tests the EPUB export filter. -class EPUBExportTest : public UnoApiXmlTest +class EPUBExportTest : public UnoApiTest { protected: public: EPUBExportTest() - : UnoApiXmlTest(u"/writerperfect/qa/unit/data/writer/epubexport/"_ustr) + : UnoApiTest(u"/writerperfect/qa/unit/data/writer/epubexport/"_ustr) { } diff --git a/xmloff/qa/unit/draw.cxx b/xmloff/qa/unit/draw.cxx index c46dced7017b..d8edf6b150e8 100644 --- a/xmloff/qa/unit/draw.cxx +++ b/xmloff/qa/unit/draw.cxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <test/unoapixml_test.hxx> +#include <test/unoapi_test.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/drawing/XDrawPageSupplier.hpp> @@ -39,7 +39,7 @@ using namespace ::com::sun::star; /// Covers xmloff/source/draw/ fixes. -class XmloffDrawTest : public UnoApiXmlTest +class XmloffDrawTest : public UnoApiTest { public: XmloffDrawTest(); @@ -74,7 +74,7 @@ public: }; XmloffDrawTest::XmloffDrawTest() - : UnoApiXmlTest(u"/xmloff/qa/unit/data/"_ustr) + : UnoApiTest(u"/xmloff/qa/unit/data/"_ustr) { } diff --git a/xmloff/qa/unit/style.cxx b/xmloff/qa/unit/style.cxx index 44e7e34c4a7c..677022579a3c 100644 --- a/xmloff/qa/unit/style.cxx +++ b/xmloff/qa/unit/style.cxx @@ -10,7 +10,7 @@ #include <tools/color.hxx> #include <sal/config.h> -#include <test/unoapixml_test.hxx> +#include <test/unoapi_test.hxx> #include <com/sun/star/awt/ColorStop.hpp> #include <com/sun/star/awt/Gradient2.hpp> @@ -27,7 +27,7 @@ using namespace ::com::sun::star; /// Covers xmloff/source/style/ fixes. -class XmloffStyleTest : public UnoApiXmlTest +class XmloffStyleTest : public UnoApiTest { public: XmloffStyleTest(); @@ -35,7 +35,7 @@ public: }; XmloffStyleTest::XmloffStyleTest() - : UnoApiXmlTest(u"/xmloff/qa/unit/data/"_ustr) + : UnoApiTest(u"/xmloff/qa/unit/data/"_ustr) { } diff --git a/xmloff/qa/unit/text.cxx b/xmloff/qa/unit/text.cxx index 8efb304b4ad4..9a0c0a01cdeb 100644 --- a/xmloff/qa/unit/text.cxx +++ b/xmloff/qa/unit/text.cxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <test/unoapixml_test.hxx> +#include <test/unoapi_test.hxx> #include <com/sun/star/awt/FontWeight.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -35,14 +35,14 @@ using namespace ::com::sun::star; /// Covers xmloff/source/text/ fixes. -class XmloffStyleTest : public UnoApiXmlTest +class XmloffStyleTest : public UnoApiTest { public: XmloffStyleTest(); }; XmloffStyleTest::XmloffStyleTest() - : UnoApiXmlTest(u"/xmloff/qa/unit/data/"_ustr) + : UnoApiTest(u"/xmloff/qa/unit/data/"_ustr) { } diff --git a/xmloff/qa/unit/text/txtparae.cxx b/xmloff/qa/unit/text/txtparae.cxx index 6dedd1e584d6..a63fbcb8c546 100644 --- a/xmloff/qa/unit/text/txtparae.cxx +++ b/xmloff/qa/unit/text/txtparae.cxx @@ -7,21 +7,21 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <test/unoapixml_test.hxx> +#include <test/unoapi_test.hxx> using namespace com::sun::star; namespace { /// Covers xmloff/source/text/txtparae.cxx fixes. -class Test : public UnoApiXmlTest +class Test : public UnoApiTest { public: Test(); }; Test::Test() - : UnoApiXmlTest(u"/xmloff/qa/unit/text/data/"_ustr) + : UnoApiTest(u"/xmloff/qa/unit/text/data/"_ustr) { } diff --git a/xmloff/qa/unit/text/txtprmap.cxx b/xmloff/qa/unit/text/txtprmap.cxx index ad1103ff88e0..d677995c13d3 100644 --- a/xmloff/qa/unit/text/txtprmap.cxx +++ b/xmloff/qa/unit/text/txtprmap.cxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <test/unoapixml_test.hxx> +#include <test/unoapi_test.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/text/XTextFramesSupplier.hpp> @@ -19,7 +19,7 @@ using namespace ::com::sun::star; namespace { /// Covers xmloff/source/text/txtprmap.cxx fixes. -class Test : public UnoApiXmlTest +class Test : public UnoApiTest { public: Test(); @@ -27,7 +27,7 @@ public: } Test::Test() - : UnoApiXmlTest(u"/xmloff/qa/unit/data/"_ustr) + : UnoApiTest(u"/xmloff/qa/unit/data/"_ustr) { } diff --git a/xmlsecurity/CppunitTest_xmlsecurity_xmlsec.mk b/xmlsecurity/CppunitTest_xmlsecurity_xmlsec.mk index 777dfef1028b..48acad3a40e3 100644 --- a/xmlsecurity/CppunitTest_xmlsecurity_xmlsec.mk +++ b/xmlsecurity/CppunitTest_xmlsecurity_xmlsec.mk @@ -13,6 +13,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,xmlsecurity_xmlsec)) $(eval $(call gb_CppunitTest_use_externals,xmlsecurity_xmlsec,\ boost_headers \ + libxml2 \ )) ifneq ($(OS),WNT) diff --git a/xmlsecurity/qa/unit/signing/signing.cxx b/xmlsecurity/qa/unit/signing/signing.cxx index 68a5520a4903..8f2b6745cf2c 100644 --- a/xmlsecurity/qa/unit/signing/signing.cxx +++ b/xmlsecurity/qa/unit/signing/signing.cxx @@ -18,7 +18,7 @@ #include <nss.h> #endif -#include <test/unoapixml_test.hxx> +#include <test/unoapi_test.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/document/BrokenPackageRequest.hpp> @@ -66,7 +66,7 @@ using namespace com::sun::star; /// Testsuite for the document signing feature. -class SigningTest : public UnoApiXmlTest +class SigningTest : public UnoApiTest { protected: uno::Reference<xml::crypto::XSEInitializer> mxSEInitializer; @@ -93,13 +93,13 @@ protected: }; SigningTest::SigningTest() - : UnoApiXmlTest(u"/xmlsecurity/qa/unit/signing/data/"_ustr) + : UnoApiTest(u"/xmlsecurity/qa/unit/signing/data/"_ustr) { } void SigningTest::setUp() { - UnoApiXmlTest::setUp(); + UnoApiTest::setUp(); MacrosTest::setUpX509(m_directories, u"xmlsecurity_signing"_ustr); MacrosTest::setUpGpg(m_directories, std::u16string_view(u"xmlsecurity_signing")); @@ -122,7 +122,7 @@ void SigningTest::tearDown() { MacrosTest::tearDownGpg(); - UnoApiXmlTest::tearDown(); + UnoApiTest::tearDown(); } uno::Reference<security::XCertificate> diff --git a/xmlsecurity/qa/unit/signing/signing2.cxx b/xmlsecurity/qa/unit/signing/signing2.cxx index 84a268fd2107..268112db58fc 100644 --- a/xmlsecurity/qa/unit/signing/signing2.cxx +++ b/xmlsecurity/qa/unit/signing/signing2.cxx @@ -16,7 +16,7 @@ #include <nss.h> #endif -#include <test/unoapixml_test.hxx> +#include <test/unoapi_test.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/embed/XStorage.hpp> @@ -37,7 +37,7 @@ using namespace css; /// Testsuite for the document signing feature. -class SigningTest2 : public UnoApiXmlTest +class SigningTest2 : public UnoApiTest { protected: uno::Reference<xml::crypto::XSEInitializer> mxSEInitializer; @@ -51,13 +51,13 @@ public: }; SigningTest2::SigningTest2() - : UnoApiXmlTest(u"/xmlsecurity/qa/unit/signing/data/"_ustr) + : UnoApiTest(u"/xmlsecurity/qa/unit/signing/data/"_ustr) { } void SigningTest2::setUp() { - UnoApiXmlTest::setUp(); + UnoApiTest::setUp(); MacrosTest::setUpX509(m_directories, u"xmlsecurity_signing2"_ustr); MacrosTest::setUpGpg(m_directories, std::u16string_view(u"xmlsecurity_signing2")); @@ -80,7 +80,7 @@ void SigningTest2::tearDown() { MacrosTest::tearDownGpg(); - UnoApiXmlTest::tearDown(); + UnoApiTest::tearDown(); } /// Test if a macro signature from a ODF Database is preserved when saving commit d420dc43ed8a19a2fe10f9ebb9c3454b40ac7e85 Author: Xisco Fauli <[email protected]> AuthorDate: Wed Feb 18 10:20:18 2026 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Wed Feb 18 21:17:03 2026 +0100 CppunitTest_sw_apitests: split into different targets so it can benefit from parallelism Change-Id: I9cd5fbba4ea2438ed43825cc845a559f17b32162 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199600 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> diff --git a/sw/CppunitTest_sw_apitests.mk b/sw/CppunitTest_sw_apitests.mk deleted file mode 100644 index 04192c78b0c9..000000000000 --- a/sw/CppunitTest_sw_apitests.mk +++ /dev/null @@ -1,111 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -#************************************************************************* -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -#************************************************************************* - -$(eval $(call gb_CppunitTest_CppunitTest,sw_apitests)) - -$(eval $(call gb_CppunitTest_use_external,sw_apitests,boost_headers)) - -$(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_apitests)) - -$(eval $(call gb_CppunitTest_add_exception_objects,sw_apitests, \ - sw/qa/api/SwXAutoTextContainer \ - sw/qa/api/SwXBodyText \ - sw/qa/api/SwXBookmark \ - sw/qa/api/SwXBookmarks \ - sw/qa/api/SwXChapterNumbering \ - sw/qa/api/SwXDocumentIndex \ - sw/qa/api/SwXDocumentIndexes \ - sw/qa/api/SwXDocumentIndexMark \ - sw/qa/api/SwXDocumentSettings \ - sw/qa/api/SwXFieldEnumeration \ - sw/qa/api/SwXFrames \ - sw/qa/api/SwXFootnote \ - sw/qa/api/SwXFootnoteProperties \ - sw/qa/api/SwXFootnoteText \ - sw/qa/api/SwXFootnotes \ - sw/qa/api/SwXHeadFootText \ - sw/qa/api/SwXNumberingRules \ - sw/qa/api/SwXParagraphEnumeration \ - sw/qa/api/SwXReferenceMark \ - sw/qa/api/SwXStyleFamilies \ - sw/qa/api/SwXReferenceMarks \ - sw/qa/api/SwXTableCellText \ - sw/qa/api/SwXTextEmbeddedObjects \ - sw/qa/api/SwXTextFrame \ - sw/qa/api/SwXTextField \ - sw/qa/api/SwXTextFieldMasters \ - sw/qa/api/SwXTextFieldTypes \ - sw/qa/api/SwXTextSections \ - sw/qa/api/SwXTextTable \ - sw/qa/api/SwXTextTables \ -)) - -$(eval $(call gb_CppunitTest_use_libraries,sw_apitests, \ - basegfx \ - comphelper \ - cppu \ - cppuhelper \ - drawinglayer \ - docmodel \ - editeng \ - for \ - forui \ - i18nlangtag \ - msfilter \ - oox \ - sal \ - salhelper \ - sax \ - sb \ - sw \ - sfx \ - sot \ - svl \ - svt \ - svx \ - svxcore \ - subsequenttest \ - test \ - tl \ - tk \ - ucbhelper \ - unotest \ - utl \ - $(call gb_Helper_optional,SCRIPTING, \ - vbahelper) \ - vcl \ - xo \ -)) - -$(eval $(call gb_CppunitTest_set_include,sw_apitests,\ - -I$(SRCDIR)/sw/inc \ - $$(INCLUDE) \ -)) - -$(eval $(call gb_CppunitTest_use_api,sw_apitests,\ - offapi \ - udkapi \ -)) - -$(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_rdb,sw_apitests,services)) - -$(eval $(call gb_CppunitTest_use_uiconfigs,sw_apitests, \ - svt \ - svx \ -)) - -$(call gb_CppunitTest_get_target,sw_apitests): $(call gb_AllLangPackage_get_target,autotextshare) - -# vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_apitests_SwXAutoTextContainer.mk b/sw/CppunitTest_sw_apitests_SwXAutoTextContainer.mk new file mode 100644 index 000000000000..50d0fe5920b4 --- /dev/null +++ b/sw/CppunitTest_sw_apitests_SwXAutoTextContainer.mk @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#************************************************************************* + +$(eval $(call sw_unoapi_common,SwXAutoTextContainer)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_apitests_SwXBodyText.mk b/sw/CppunitTest_sw_apitests_SwXBodyText.mk new file mode 100644 index 000000000000..f5697ef7edc0 --- /dev/null +++ b/sw/CppunitTest_sw_apitests_SwXBodyText.mk @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#************************************************************************* + +$(eval $(call sw_unoapi_common,SwXBodyText)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_apitests_SwXBookmark.mk b/sw/CppunitTest_sw_apitests_SwXBookmark.mk new file mode 100644 index 000000000000..6a2d3d6840d2 --- /dev/null +++ b/sw/CppunitTest_sw_apitests_SwXBookmark.mk @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#************************************************************************* + +$(eval $(call sw_unoapi_common,SwXBookmark)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_apitests_SwXBookmarks.mk b/sw/CppunitTest_sw_apitests_SwXBookmarks.mk new file mode 100644 index 000000000000..1f2bffebfd8f --- /dev/null +++ b/sw/CppunitTest_sw_apitests_SwXBookmarks.mk @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#************************************************************************* + +$(eval $(call sw_unoapi_common,SwXBookmarks)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_apitests_SwXChapterNumbering.mk b/sw/CppunitTest_sw_apitests_SwXChapterNumbering.mk new file mode 100644 index 000000000000..e36a7994cd65 --- /dev/null +++ b/sw/CppunitTest_sw_apitests_SwXChapterNumbering.mk @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#************************************************************************* + +$(eval $(call sw_unoapi_common,SwXChapterNumbering)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_apitests_SwXDocumentIndex.mk b/sw/CppunitTest_sw_apitests_SwXDocumentIndex.mk new file mode 100644 index 000000000000..133fd821a935 --- /dev/null +++ b/sw/CppunitTest_sw_apitests_SwXDocumentIndex.mk @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#************************************************************************* + +$(eval $(call sw_unoapi_common,SwXDocumentIndex)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_apitests_SwXDocumentIndexMark.mk b/sw/CppunitTest_sw_apitests_SwXDocumentIndexMark.mk new file mode 100644 index 000000000000..39c4880fd365 --- /dev/null +++ b/sw/CppunitTest_sw_apitests_SwXDocumentIndexMark.mk @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#************************************************************************* + +$(eval $(call sw_unoapi_common,SwXDocumentIndexMark)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_apitests_SwXDocumentIndexes.mk b/sw/CppunitTest_sw_apitests_SwXDocumentIndexes.mk new file mode 100644 index 000000000000..8f6dac303e15 --- /dev/null +++ b/sw/CppunitTest_sw_apitests_SwXDocumentIndexes.mk @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#************************************************************************* + +$(eval $(call sw_unoapi_common,SwXDocumentIndexes)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_apitests_SwXDocumentSettings.mk b/sw/CppunitTest_sw_apitests_SwXDocumentSettings.mk new file mode 100644 index 000000000000..c7d13ae884c6 --- /dev/null +++ b/sw/CppunitTest_sw_apitests_SwXDocumentSettings.mk @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#************************************************************************* + +$(eval $(call sw_unoapi_common,SwXDocumentSettings)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_apitests_SwXFieldEnumeration.mk b/sw/CppunitTest_sw_apitests_SwXFieldEnumeration.mk new file mode 100644 index 000000000000..2ece2e33087b --- /dev/null +++ b/sw/CppunitTest_sw_apitests_SwXFieldEnumeration.mk @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#************************************************************************* + +$(eval $(call sw_unoapi_common,SwXFieldEnumeration)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_apitests_SwXFootnote.mk b/sw/CppunitTest_sw_apitests_SwXFootnote.mk new file mode 100644 index 000000000000..a8131875fbdd --- /dev/null +++ b/sw/CppunitTest_sw_apitests_SwXFootnote.mk @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#************************************************************************* + +$(eval $(call sw_unoapi_common,SwXFootnote)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_apitests_SwXFootnoteProperties.mk b/sw/CppunitTest_sw_apitests_SwXFootnoteProperties.mk new file mode 100644 index 000000000000..695e22e7cdb0 --- /dev/null +++ b/sw/CppunitTest_sw_apitests_SwXFootnoteProperties.mk @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#************************************************************************* + +$(eval $(call sw_unoapi_common,SwXFootnoteProperties)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_apitests_SwXFootnoteText.mk b/sw/CppunitTest_sw_apitests_SwXFootnoteText.mk new file mode 100644 index 000000000000..fc8bcced864c --- /dev/null +++ b/sw/CppunitTest_sw_apitests_SwXFootnoteText.mk @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#************************************************************************* + +$(eval $(call sw_unoapi_common,SwXFootnoteText)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_apitests_SwXFootnotes.mk b/sw/CppunitTest_sw_apitests_SwXFootnotes.mk new file mode 100644 index 000000000000..dd37b06ef4c4 --- /dev/null +++ b/sw/CppunitTest_sw_apitests_SwXFootnotes.mk @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#************************************************************************* + +$(eval $(call sw_unoapi_common,SwXFootnotes)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_apitests_SwXFrames.mk b/sw/CppunitTest_sw_apitests_SwXFrames.mk new file mode 100644 index 000000000000..d57be82b3e23 --- /dev/null +++ b/sw/CppunitTest_sw_apitests_SwXFrames.mk @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#************************************************************************* + +$(eval $(call sw_unoapi_common,SwXFrames)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_apitests_SwXHeadFootText.mk b/sw/CppunitTest_sw_apitests_SwXHeadFootText.mk new file mode 100644 index 000000000000..724bda338157 --- /dev/null +++ b/sw/CppunitTest_sw_apitests_SwXHeadFootText.mk @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#************************************************************************* + +$(eval $(call sw_unoapi_common,SwXHeadFootText)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_apitests_SwXNumberingRules.mk b/sw/CppunitTest_sw_apitests_SwXNumberingRules.mk new file mode 100644 index 000000000000..817b6176caf8 --- /dev/null +++ b/sw/CppunitTest_sw_apitests_SwXNumberingRules.mk @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#************************************************************************* + +$(eval $(call sw_unoapi_common,SwXNumberingRules)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_apitests_SwXParagraphEnumeration.mk b/sw/CppunitTest_sw_apitests_SwXParagraphEnumeration.mk new file mode 100644 index 000000000000..d8830b42babe --- /dev/null +++ b/sw/CppunitTest_sw_apitests_SwXParagraphEnumeration.mk @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#************************************************************************* + +$(eval $(call sw_unoapi_common,SwXParagraphEnumeration)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_apitests_SwXReferenceMark.mk b/sw/CppunitTest_sw_apitests_SwXReferenceMark.mk new file mode 100644 index 000000000000..5daab73cf58d --- /dev/null +++ b/sw/CppunitTest_sw_apitests_SwXReferenceMark.mk @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#************************************************************************* + +$(eval $(call sw_unoapi_common,SwXReferenceMark)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_apitests_SwXReferenceMarks.mk b/sw/CppunitTest_sw_apitests_SwXReferenceMarks.mk new file mode 100644 index 000000000000..b1d2067c9b98 --- /dev/null +++ b/sw/CppunitTest_sw_apitests_SwXReferenceMarks.mk @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#************************************************************************* + +$(eval $(call sw_unoapi_common,SwXReferenceMarks)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_apitests_SwXStyleFamilies.mk b/sw/CppunitTest_sw_apitests_SwXStyleFamilies.mk new file mode 100644 index 000000000000..a4d93c5a9fb2 --- /dev/null +++ b/sw/CppunitTest_sw_apitests_SwXStyleFamilies.mk @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#************************************************************************* + +$(eval $(call sw_unoapi_common,SwXStyleFamilies)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_apitests_SwXTableCellText.mk b/sw/CppunitTest_sw_apitests_SwXTableCellText.mk new file mode 100644 index 000000000000..422b60a8647b --- /dev/null +++ b/sw/CppunitTest_sw_apitests_SwXTableCellText.mk @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#************************************************************************* + +$(eval $(call sw_unoapi_common,SwXTableCellText)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_apitests_SwXTextEmbeddedObjects.mk b/sw/CppunitTest_sw_apitests_SwXTextEmbeddedObjects.mk new file mode 100644 index 000000000000..d704802fea3b --- /dev/null +++ b/sw/CppunitTest_sw_apitests_SwXTextEmbeddedObjects.mk @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#************************************************************************* + +$(eval $(call sw_unoapi_common,SwXTextEmbeddedObjects)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_apitests_SwXTextField.mk b/sw/CppunitTest_sw_apitests_SwXTextField.mk new file mode 100644 index 000000000000..a25a30bcf84f --- /dev/null +++ b/sw/CppunitTest_sw_apitests_SwXTextField.mk @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#************************************************************************* + +$(eval $(call sw_unoapi_common,SwXTextField)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_apitests_SwXTextFieldMasters.mk b/sw/CppunitTest_sw_apitests_SwXTextFieldMasters.mk new file mode 100644 index 000000000000..11b106b9faf5 --- /dev/null +++ b/sw/CppunitTest_sw_apitests_SwXTextFieldMasters.mk @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#************************************************************************* + +$(eval $(call sw_unoapi_common,SwXTextFieldMasters)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_apitests_SwXTextFieldTypes.mk b/sw/CppunitTest_sw_apitests_SwXTextFieldTypes.mk new file mode 100644 index 000000000000..69589887b81f --- /dev/null +++ b/sw/CppunitTest_sw_apitests_SwXTextFieldTypes.mk @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#************************************************************************* + +$(eval $(call sw_unoapi_common,SwXTextFieldTypes)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_apitests_SwXTextFrame.mk b/sw/CppunitTest_sw_apitests_SwXTextFrame.mk new file mode 100644 index 000000000000..340df527498c --- /dev/null +++ b/sw/CppunitTest_sw_apitests_SwXTextFrame.mk @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#************************************************************************* + +$(eval $(call sw_unoapi_common,SwXTextFrame)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_apitests_SwXTextSections.mk b/sw/CppunitTest_sw_apitests_SwXTextSections.mk new file mode 100644 index 000000000000..cf7253f2434c --- /dev/null +++ b/sw/CppunitTest_sw_apitests_SwXTextSections.mk @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#************************************************************************* + +$(eval $(call sw_unoapi_common,SwXTextSections)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_apitests_SwXTextTable.mk b/sw/CppunitTest_sw_apitests_SwXTextTable.mk new file mode 100644 index 000000000000..8e564cf95e9a --- /dev/null +++ b/sw/CppunitTest_sw_apitests_SwXTextTable.mk @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#************************************************************************* + +$(eval $(call sw_unoapi_common,SwXTextTable)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/CppunitTest_sw_apitests_SwXTextTables.mk b/sw/CppunitTest_sw_apitests_SwXTextTables.mk new file mode 100644 index 000000000000..2f6e967db8e9 --- /dev/null +++ b/sw/CppunitTest_sw_apitests_SwXTextTables.mk @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#************************************************************************* + +$(eval $(call sw_unoapi_common,SwXTextTables)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk index 22b6a57804df..6e2c389849a7 100644 --- a/sw/Module_sw.mk +++ b/sw/Module_sw.mk @@ -17,6 +17,7 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # +include $(SRCDIR)/sw/common_unoapi_tests.mk include $(SRCDIR)/sw/layoutwriter_setup.mk include $(SRCDIR)/sw/ooxmlexport_setup.mk include $(SRCDIR)/sw/rtfexport_setup.mk @@ -152,7 +153,36 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\ CppunitTest_sw_globalfilter \ CppunitTest_sw_accessible_relation_set \ CppunitTest_sw_apiterminate \ - CppunitTest_sw_apitests \ + CppunitTest_sw_apitests_SwXAutoTextContainer \ + CppunitTest_sw_apitests_SwXBodyText \ + CppunitTest_sw_apitests_SwXBookmark \ + CppunitTest_sw_apitests_SwXBookmarks \ + CppunitTest_sw_apitests_SwXChapterNumbering \ + CppunitTest_sw_apitests_SwXDocumentIndex \ + CppunitTest_sw_apitests_SwXDocumentIndexes \ + CppunitTest_sw_apitests_SwXDocumentIndexMark \ + CppunitTest_sw_apitests_SwXDocumentSettings \ + CppunitTest_sw_apitests_SwXFieldEnumeration \ + CppunitTest_sw_apitests_SwXFrames \ + CppunitTest_sw_apitests_SwXFootnote \ + CppunitTest_sw_apitests_SwXFootnoteProperties \ + CppunitTest_sw_apitests_SwXFootnoteText \ + CppunitTest_sw_apitests_SwXFootnotes \ + CppunitTest_sw_apitests_SwXHeadFootText \ + CppunitTest_sw_apitests_SwXNumberingRules \ + CppunitTest_sw_apitests_SwXParagraphEnumeration \ + CppunitTest_sw_apitests_SwXReferenceMark \ + CppunitTest_sw_apitests_SwXStyleFamilies \ + CppunitTest_sw_apitests_SwXReferenceMarks \ + CppunitTest_sw_apitests_SwXTableCellText \ + CppunitTest_sw_apitests_SwXTextEmbeddedObjects \ + CppunitTest_sw_apitests_SwXTextFrame \ + CppunitTest_sw_apitests_SwXTextField \ + CppunitTest_sw_apitests_SwXTextFieldMasters \ + CppunitTest_sw_apitests_SwXTextFieldTypes \ + CppunitTest_sw_apitests_SwXTextSections \ + CppunitTest_sw_apitests_SwXTextTable \ + CppunitTest_sw_apitests_SwXTextTables \ CppunitTest_sw_autocorrect \ CppunitTest_sw_unowriter \ CppunitTest_sw_core_text \ diff --git a/sw/common_unoapi_tests.mk b/sw/common_unoapi_tests.mk new file mode 100644 index 000000000000..0a0105b3ca8e --- /dev/null +++ b/sw/common_unoapi_tests.mk @@ -0,0 +1,90 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#************************************************************************* + +# template for unoapi tests +define sw_unoapi_common + +$(eval $(call gb_CppunitTest_CppunitTest,sw_apitests_$(1))) + +$(eval $(call gb_CppunitTest_use_externals,sw_apitests_$(1), \ + boost_headers \ + libxml2 \ +)) + + +$(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_apitests_$(1))) + +$(eval $(call gb_CppunitTest_add_exception_objects,sw_apitests_$(1), \ + sw/qa/api/$(1) \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,sw_apitests_$(1), \ + basegfx \ + comphelper \ + cppu \ + cppuhelper \ + drawinglayer \ + docmodel \ + editeng \ + for \ + forui \ + i18nlangtag \ + msfilter \ + oox \ + sal \ + salhelper \ + sax \ + sb \ + sw \ + sfx \ + sot \ + svl \ + svt \ + svx \ + svxcore \ + subsequenttest \ + test \ + tl \ + tk \ + ucbhelper \ + unotest \ + utl \ + $(call gb_Helper_optional,SCRIPTING, \ + vbahelper) \ + vcl \ + xo \ +)) + +$(eval $(call gb_CppunitTest_set_include,sw_apitests_$(1),\ + -I$(SRCDIR)/sw/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_CppunitTest_use_api,sw_apitests_$(1),\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_CppunitTest_use_ure,sw_apitests_$(1))) +$(eval $(call gb_CppunitTest_use_vcl,sw_apitests_$(1))) +$(eval $(call gb_CppunitTest_use_configuration,sw_apitests_$(1))) + +$(eval $(call gb_CppunitTest_use_rdb,sw_apitests_$(1),services)) + +$(eval $(call gb_CppunitTest_use_uiconfigs,sw_apitests_$(1), \ + svt \ + svx \ +)) + +$(call gb_CppunitTest_get_target,sw_apitests_$(1)): $(call gb_AllLangPackage_get_target,autotextshare) +endef + +# vim: set noet sw=4 ts=4: diff --git a/sw/qa/api/SwXAutoTextContainer.cxx b/sw/qa/api/SwXAutoTextContainer.cxx index c87952f091fb..c39a50580cf1 100644 --- a/sw/qa/api/SwXAutoTextContainer.cxx +++ b/sw/qa/api/SwXAutoTextContainer.cxx @@ -83,4 +83,6 @@ public: CPPUNIT_TEST_SUITE_REGISTRATION(SwXAutoTextContainer); } +CPPUNIT_PLUGIN_IMPLEMENT(); + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/qa/api/SwXBodyText.cxx b/sw/qa/api/SwXBodyText.cxx index 3d727d9910ad..56ecad4fd7e8 100644 --- a/sw/qa/api/SwXBodyText.cxx +++ b/sw/qa/api/SwXBodyText.cxx @@ -80,4 +80,6 @@ Reference<XInterface> SwXBodyText::init() CPPUNIT_TEST_SUITE_REGISTRATION(SwXBodyText); } +CPPUNIT_PLUGIN_IMPLEMENT(); + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/qa/api/SwXBookmark.cxx b/sw/qa/api/SwXBookmark.cxx index d2233c9b9ace..67c54d2870db 100644 --- a/sw/qa/api/SwXBookmark.cxx +++ b/sw/qa/api/SwXBookmark.cxx @@ -82,4 +82,6 @@ private: CPPUNIT_TEST_SUITE_REGISTRATION(SwXBookmark); } +CPPUNIT_PLUGIN_IMPLEMENT(); + -e ... etc. - the rest is truncated
