diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2024-01-03 11:49:02 +0600 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2024-01-03 07:51:28 +0100 |
commit | a01a642ebbdb8c16f1b54b4634c277b9f665192f (patch) | |
tree | e0c598848fbb375ddbe9e1cf4db42df1e27746a9 /vcl | |
parent | 8ecd20b447ab5e58fa77c19fce09c0f239d1fafc (diff) |
UnoApiTest::loadFromURL -> UnoApiTest::loadFromFile
The old name was misleading (it doesn't take an URL, but a filename);
also, now it's easier to grep for it - doesn't get mixed with
vcl::graphic::loadFromURL.
Change-Id: Ib88d2194200a6a54d2326971e0306ba39f0c7025
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161578
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/qa/cppunit/gen/gen.cxx | 2 | ||||
-rw-r--r-- | vcl/qa/cppunit/pdfexport/pdfexport.cxx | 6 | ||||
-rw-r--r-- | vcl/qa/cppunit/pdfexport/pdfexport2.cxx | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/vcl/qa/cppunit/gen/gen.cxx b/vcl/qa/cppunit/gen/gen.cxx index 29d950113282..56a9d5b6ea19 100644 --- a/vcl/qa/cppunit/gen/gen.cxx +++ b/vcl/qa/cppunit/gen/gen.cxx @@ -28,7 +28,7 @@ public: Bitmap load(const char* pName) { - loadFromURL(OUString::createFromAscii(pName)); + loadFromFile(OUString::createFromAscii(pName)); SfxBaseModel* pModel = dynamic_cast<SfxBaseModel*>(mxComponent.get()); CPPUNIT_ASSERT(pModel); SfxObjectShell* pShell = pModel->GetObjectShell(); diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx b/vcl/qa/cppunit/pdfexport/pdfexport.cxx index 020d5c4c49d1..d5515facb56f 100644 --- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx +++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx @@ -51,7 +51,7 @@ public: void PdfExportTest::saveAsPDF(std::u16string_view rFile) { // Import the bugdoc and export as PDF. - loadFromURL(rFile); + loadFromFile(rFile); uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY); xStorable->storeToURL(maTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList()); } @@ -191,7 +191,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf107868) #if !defined MACOSX && !defined _WIN32 // Import the bugdoc and print to PDF. - loadFromURL(u"tdf107868.odt"); + loadFromFile(u"tdf107868.odt"); uno::Reference<view::XPrintable> xPrintable(mxComponent, uno::UNO_QUERY); CPPUNIT_ASSERT(xPrintable.is()); uno::Sequence<beans::PropertyValue> aOptions(comphelper::InitPropertySequence( @@ -431,7 +431,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testSofthyphenPos) #if !defined MACOSX && !defined _WIN32 // Import the bugdoc and print to PDF. - loadFromURL(u"softhyphen_pdf.odt"); + loadFromFile(u"softhyphen_pdf.odt"); uno::Reference<view::XPrintable> xPrintable(mxComponent, uno::UNO_QUERY); CPPUNIT_ASSERT(xPrintable.is()); uno::Sequence<beans::PropertyValue> aOptions(comphelper::InitPropertySequence( diff --git a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx index deffb16785ce..130d77be8ef3 100644 --- a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx +++ b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx @@ -71,7 +71,7 @@ public: void PdfExportTest2::saveAsPDF(std::u16string_view rFile) { // Import the bugdoc and export as PDF. - loadFromURL(rFile); + loadFromFile(rFile); uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY); xStorable->storeToURL(maTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList()); } @@ -273,7 +273,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf129085) CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTocLink) { // Load the Writer document. - loadFromURL(u"toc-link.fodt"); + loadFromFile(u"toc-link.fodt"); // Update the ToC. uno::Reference<text::XDocumentIndexesSupplier> xDocumentIndexesSupplier(mxComponent, @@ -441,7 +441,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf147164) CPPUNIT_TEST_FIXTURE(PdfExportTest2, testReduceImage) { // Load the Writer document. - loadFromURL(u"reduce-image.fodt"); + loadFromFile(u"reduce-image.fodt"); // Save as PDF. uno::Reference<css::lang::XMultiServiceFactory> xFactory = getMultiServiceFactory(); @@ -3875,7 +3875,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testFormControlAnnot) CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf142129) { - loadFromURL(u"master.odm"); + loadFromFile(u"master.odm"); // update linked section dispatchCommand(mxComponent, ".uno:UpdateAllLinks", {}); @@ -4858,7 +4858,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf156528) CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf113866) { - loadFromURL(u"tdf113866.odt"); + loadFromFile(u"tdf113866.odt"); // Set -- Printer Settings->Options->Print text in Black -- to true SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument*>(mxComponent.get()); |