From a38a22c7e55bf076f96589492e8f42f6c2f7639c Mon Sep 17 00:00:00 2001 From: Xisco Fauli Date: Mon, 28 Oct 2024 14:36:38 +0100 Subject: UnoApiTest: rename load to loadFromURL and use it everywhere Change-Id: Ie67eebec74f783fa0c29acfb23bb83bc582812b2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175724 Reviewed-by: Xisco Fauli Tested-by: Jenkins --- sd/qa/filter/eppt/eppt.cxx | 2 +- sd/qa/unit/SdrPdfImportTest.cxx | 2 +- sd/qa/unit/sdmodeltestbase.hxx | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'sd') diff --git a/sd/qa/filter/eppt/eppt.cxx b/sd/qa/filter/eppt/eppt.cxx index ef84dfc46cb1..0d3c554e4b76 100644 --- a/sd/qa/filter/eppt/eppt.cxx +++ b/sd/qa/filter/eppt/eppt.cxx @@ -56,7 +56,7 @@ CPPUNIT_TEST_FIXTURE(Test, testOOXMLCustomShapeBitmapFill) CPPUNIT_TEST_FIXTURE(Test, testThemeExport) { // Given a document with a master slide and a theme, lt1 is set to 0x000002: - mxComponent = loadFromDesktop(u"private:factory/simpress"_ustr); + loadFromURL(u"private:factory/simpress"_ustr); { uno::Reference xDrawPagesSupplier(mxComponent, uno::UNO_QUERY); uno::Reference xDrawPage( diff --git a/sd/qa/unit/SdrPdfImportTest.cxx b/sd/qa/unit/SdrPdfImportTest.cxx index b6ee1b41c3d8..da4298d5fe7c 100644 --- a/sd/qa/unit/SdrPdfImportTest.cxx +++ b/sd/qa/unit/SdrPdfImportTest.cxx @@ -238,7 +238,7 @@ CPPUNIT_TEST_FIXTURE(SdrPdfImportTest, testAnnotationsImportExport) pPDFAnnotation2->getSubType()); // Pop-up annotation // Load document again - mxComponent = loadFromDesktop(maTempFile.GetURL()); + loadFromURL(maTempFile.GetURL()); auto pNewImpressDocument = dynamic_cast(mxComponent.get()); sd::ViewShell* pNewViewShell = pNewImpressDocument->GetDocShell()->GetViewShell(); CPPUNIT_ASSERT(pNewViewShell); diff --git a/sd/qa/unit/sdmodeltestbase.hxx b/sd/qa/unit/sdmodeltestbase.hxx index 18b1488ec340..000e5992fa6d 100644 --- a/sd/qa/unit/sdmodeltestbase.hxx +++ b/sd/qa/unit/sdmodeltestbase.hxx @@ -49,7 +49,7 @@ public: void createSdImpressDoc(const char* pName = nullptr, const char* pPassword = nullptr) { if (!pName) - load(u"private:factory/simpress"_ustr); + loadFromURL(u"private:factory/simpress"_ustr); else loadFromFile(OUString::createFromAscii(pName), pPassword); @@ -63,7 +63,7 @@ public: void createSdDrawDoc(const char* pName = nullptr, const char* pPassword = nullptr) { if (!pName) - load(u"private:factory/sdraw"_ustr); + loadFromURL(u"private:factory/sdraw"_ustr); else loadFromFile(OUString::createFromAscii(pName), pPassword); -- cgit