filter/qa/pdf.cxx | 9 --------- sc/qa/unit/helper/sctiledrenderingtest.cxx | 8 -------- sd/qa/unit/import-tests.cxx | 5 ----- sd/qa/unit/sdtiledrenderingtest.cxx | 7 ------- sw/qa/core/txtnode/txtnode.cxx | 3 --- sw/qa/extras/tiledrendering/tiledrendering.cxx | 3 --- sw/qa/extras/uiwriter/uiwriter5.cxx | 5 ----- sw/qa/extras/uiwriter/uiwriter9.cxx | 5 ----- sw/qa/uibase/uiview/uiview.cxx | 3 --- sw/qa/unit/swtiledrenderingtest.cxx | 5 +---- test/source/unoapi_test.cxx | 4 ++++ 11 files changed, 5 insertions(+), 52 deletions(-)
New commits: commit 3696d3d9b9b6f7a8b5b80133f55e4bd94e3c860d Author: Xisco Fauli <[email protected]> AuthorDate: Tue Feb 17 12:52:53 2026 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Tue Feb 17 16:29:31 2026 +0100 UnoApiTest: deactivate lok in tearDown Change-Id: I8fbacbb7fe0e3ec3e9fc4801e345b2ffbdc9c8cb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199537 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins diff --git a/filter/qa/pdf.cxx b/filter/qa/pdf.cxx index c13b7f57d8a8..791a7494a28d 100644 --- a/filter/qa/pdf.cxx +++ b/filter/qa/pdf.cxx @@ -41,7 +41,6 @@ public: } void setUp() override; - void tearDown() override; void doTestCommentsInMargin(bool commentsInMarginEnabled); }; @@ -52,14 +51,6 @@ void Test::setUp() MacrosTest::setUpX509(m_directories, u"filter_pdf"_ustr); } -void Test::tearDown() -{ - UnoApiTest::tearDown(); - - if (comphelper::LibreOfficeKit::isActive()) - comphelper::LibreOfficeKit::setActive(false); -} - CPPUNIT_TEST_FIXTURE(Test, testSignCertificateSubjectName) { std::shared_ptr<vcl::pdf::PDFium> pPDFium = vcl::pdf::PDFiumLibrary::get(); diff --git a/sc/qa/unit/helper/sctiledrenderingtest.cxx b/sc/qa/unit/helper/sctiledrenderingtest.cxx index b20122038889..f26c29ad8045 100644 --- a/sc/qa/unit/helper/sctiledrenderingtest.cxx +++ b/sc/qa/unit/helper/sctiledrenderingtest.cxx @@ -37,18 +37,10 @@ void ScTiledRenderingTest::setUp() void ScTiledRenderingTest::tearDown() { - if (mxComponent.is()) - { - mxComponent->dispose(); - mxComponent.clear(); - } - m_callbackWrapper.clear(); comphelper::LibreOfficeKit::resetCompatFlag(); - comphelper::LibreOfficeKit::setActive(false); - UnoApiXmlTest::tearDown(); } diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index 000f441f4499..d8dd86e541ab 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -1890,11 +1890,6 @@ CPPUNIT_TEST_FIXTURE(SdImportTest, testPDFImportShared) CPPUNIT_ASSERT_EQUAL_MESSAGE("Page number doesn't match expected", sal_Int32(i), rGraphic.getPageNumber()); } - - mxComponent->dispose(); - mxComponent.clear(); - - comphelper::LibreOfficeKit::setActive(false); } #if defined(IMPORT_PDF_ELEMENTS) diff --git a/sd/qa/unit/sdtiledrenderingtest.cxx b/sd/qa/unit/sdtiledrenderingtest.cxx index b53c421cb8f0..afc1d28fc469 100644 --- a/sd/qa/unit/sdtiledrenderingtest.cxx +++ b/sd/qa/unit/sdtiledrenderingtest.cxx @@ -46,17 +46,10 @@ void SdTiledRenderingTest::setUp() void SdTiledRenderingTest::tearDown() { - if (mxComponent.is()) - { - mxComponent->dispose(); - mxComponent.clear(); - } - if (m_pXmlBuffer) xmlBufferFree(m_pXmlBuffer); m_callbackWrapper.clear(); - comphelper::LibreOfficeKit::setActive(false); UnoApiXmlTest::tearDown(); } diff --git a/sw/qa/core/txtnode/txtnode.cxx b/sw/qa/core/txtnode/txtnode.cxx index 322a68590570..e6bb5396c9ae 100644 --- a/sw/qa/core/txtnode/txtnode.cxx +++ b/sw/qa/core/txtnode/txtnode.cxx @@ -201,9 +201,6 @@ CPPUNIT_TEST_FIXTURE(SwCoreTxtnodeTest, testTitleFieldInvalidate) // Tear down LOK. pWrtShell->GetSfxViewShell()->setLibreOfficeKitViewCallback(nullptr); - mxComponent->dispose(); - mxComponent.clear(); - comphelper::LibreOfficeKit::setActive(false); } CPPUNIT_TEST_FIXTURE(SwCoreTxtnodeTest, testFlyAnchorUndo) diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx index 59204db2fb55..f40a83238271 100644 --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx @@ -2123,9 +2123,6 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testTdf115088) // Check the resulting text in the document. (it was 1Text 1 1 1) CPPUNIT_ASSERT_EQUAL(u"1 1Text 1 1"_ustr, pXTextDocument->getText()->getString()); - - mxComponent->dispose(); - mxComponent.clear(); } CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testRedlineField) diff --git a/sw/qa/extras/uiwriter/uiwriter5.cxx b/sw/qa/extras/uiwriter/uiwriter5.cxx index 94ced3becc03..3cd3476233fa 100644 --- a/sw/qa/extras/uiwriter/uiwriter5.cxx +++ b/sw/qa/extras/uiwriter/uiwriter5.cxx @@ -1866,11 +1866,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testOleSaveWhileEdit) // Without the accompanying fix in place, this test would have failed: the OLE object lost its // replacement on save if the edit was active while saving. CPPUNIT_ASSERT(xNameAccess->hasByName(u"ObjectReplacements/Object 1"_ustr)); - - // Dispose the document while LOK is still active to avoid leaks. - mxComponent->dispose(); - mxComponent.clear(); - comphelper::LibreOfficeKit::setActive(false); } CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testTdf105330) diff --git a/sw/qa/extras/uiwriter/uiwriter9.cxx b/sw/qa/extras/uiwriter/uiwriter9.cxx index 8363ee9c9e38..b749a795ef2f 100644 --- a/sw/qa/extras/uiwriter/uiwriter9.cxx +++ b/sw/qa/extras/uiwriter/uiwriter9.cxx @@ -1293,11 +1293,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest9, testTdf158375_ole_object_disable) uno::Reference<document::XEmbeddedObjectSupplier2> xEmbedSupplier(xShape, uno::UNO_QUERY); auto xEmbeddedObj = xEmbedSupplier->getExtendedControlOverEmbeddedObject(); CPPUNIT_ASSERT_EQUAL(embed::EmbedStates::LOADED, xEmbeddedObj->getCurrentState()); - - // Dispose the document while LOK is still active to avoid leaks. - mxComponent->dispose(); - mxComponent.clear(); - comphelper::LibreOfficeKit::setActive(false); } CPPUNIT_TEST_FIXTURE(SwUiWriterTest9, testTdf146190) diff --git a/sw/qa/uibase/uiview/uiview.cxx b/sw/qa/uibase/uiview/uiview.cxx index 3fb6d5a10cbb..abe816bcb094 100644 --- a/sw/qa/uibase/uiview/uiview.cxx +++ b/sw/qa/uibase/uiview/uiview.cxx @@ -541,10 +541,7 @@ CPPUNIT_TEST_FIXTURE(SwUibaseUiviewTest, testRedlineRenderModeInvalidate) // Tear down LOK: pWrtShell->GetSfxViewShell()->setLibreOfficeKitViewCallback(nullptr); - mxComponent->dispose(); - mxComponent.clear(); comphelper::LibreOfficeKit::setPartInInvalidation(false); - comphelper::LibreOfficeKit::setActive(false); } CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sw/qa/unit/swtiledrenderingtest.cxx b/sw/qa/unit/swtiledrenderingtest.cxx index 5efe20a6ed2c..eb654608746b 100644 --- a/sw/qa/unit/swtiledrenderingtest.cxx +++ b/sw/qa/unit/swtiledrenderingtest.cxx @@ -57,13 +57,10 @@ void SwTiledRenderingTest::tearDown() { pWrtShell->GetSfxViewShell()->setLibreOfficeKitViewCallback(nullptr); } - mxComponent->dispose(); - mxComponent.clear(); } m_callbackWrapper.clear(); - comphelper::LibreOfficeKit::setActive(false); - test::BootstrapFixture::tearDown(); + SwModelTestBase::tearDown(); } SwXTextDocument* SwTiledRenderingTest::createDoc(const char* pName) diff --git a/test/source/unoapi_test.cxx b/test/source/unoapi_test.cxx index 543fb9e898b7..ec6ea6ffc46c 100644 --- a/test/source/unoapi_test.cxx +++ b/test/source/unoapi_test.cxx @@ -14,6 +14,7 @@ #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/XStorable.hpp> +#include <comphelper/lok.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/propertyvalue.hxx> #include <comphelper/sequence.hxx> @@ -60,6 +61,9 @@ void UnoApiTest::tearDown() if (mxComponent.is()) dispose(); + if (comphelper::LibreOfficeKit::isActive()) + comphelper::LibreOfficeKit::setActive(false); + test::BootstrapFixture::tearDown(); }
