sd/qa/unit/SdrPdfImportTest.cxx | 4 -- sw/qa/extras/globalfilter/globalfilter.cxx | 12 ++------ sw/qa/extras/uiwriter/uiwriter8.cxx | 37 ++++++++----------------- sw/qa/extras/uiwriter/uiwriter9.cxx | 11 ++++--- vcl/qa/cppunit/pdfexport/PDFEncryptionTest.cxx | 8 +---- 5 files changed, 25 insertions(+), 47 deletions(-)
New commits: commit e2fdcab62279bc82d5bf3fe751bfe82829b9a840 Author: Xisco Fauli <[email protected]> AuthorDate: Tue Feb 3 14:43:09 2026 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Tue Feb 3 17:07:56 2026 +0100 qa: use UnoApiTest::save in some places Change-Id: Ic5cc63c137d4ffe242608ba13680f8a792dd7426 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198594 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> diff --git a/sd/qa/unit/SdrPdfImportTest.cxx b/sd/qa/unit/SdrPdfImportTest.cxx index ee80166c32a0..364feeca7089 100644 --- a/sd/qa/unit/SdrPdfImportTest.cxx +++ b/sd/qa/unit/SdrPdfImportTest.cxx @@ -224,13 +224,11 @@ CPPUNIT_TEST_FIXTURE(SdrPdfImportTest, testAnnotationsImportExport) } { // save as PDF and check annotations - uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY); comphelper::SequenceAsHashMap aMediaDescriptor; - aMediaDescriptor[u"FilterName"_ustr] <<= u"writer_pdf_Export"_ustr; uno::Sequence<beans::PropertyValue> aFilterData( comphelper::InitPropertySequence({ { "ExportBookmarks", uno::Any(true) } })); aMediaDescriptor[u"FilterData"_ustr] <<= aFilterData; - xStorable->storeToURL(maTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList()); + save(TestFilter::PDF_WRITER, aMediaDescriptor.getAsConstPropertyValueList()); // Check PDF for annotations auto pPDFDocument = parsePDFExport(); diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx b/sw/qa/extras/globalfilter/globalfilter.cxx index 8f46e9675c31..85532ee6de96 100644 --- a/sw/qa/extras/globalfilter/globalfilter.cxx +++ b/sw/qa/extras/globalfilter/globalfilter.cxx @@ -1255,13 +1255,11 @@ CPPUNIT_TEST_FIXTURE(Test, testListLabelPDFExport) // check PDF export of the list items (label in particular) comphelper::SequenceAsHashMap aMediaDescriptor; - aMediaDescriptor[u"FilterName"_ustr] <<= u"writer_pdf_Export"_ustr; // Enable PDF/UA uno::Sequence<beans::PropertyValue> aFilterData( comphelper::InitPropertySequence({ { "PDFUACompliance", uno::Any(true) } })); aMediaDescriptor[u"FilterData"_ustr] <<= aFilterData; - css::uno::Reference<frame::XStorable> xStorable(mxComponent, css::uno::UNO_QUERY_THROW); - xStorable->storeToURL(maTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList()); + save(TestFilter::PDF_WRITER, aMediaDescriptor.getAsConstPropertyValueList()); // Parse the export result with pdfium. std::unique_ptr<vcl::pdf::PDFiumDocument> pPdfDocument = parsePDFExport(); @@ -1662,13 +1660,11 @@ CPPUNIT_TEST_FIXTURE(Test, testTableOfContentLinksHaveContentSet) // Export as PDF comphelper::SequenceAsHashMap aMediaDescriptor; - aMediaDescriptor[u"FilterName"_ustr] <<= u"writer_pdf_Export"_ustr; // Enable PDF/UA uno::Sequence<beans::PropertyValue> aFilterData( comphelper::InitPropertySequence({ { "PDFUACompliance", uno::Any(true) } })); aMediaDescriptor[u"FilterData"_ustr] <<= aFilterData; - css::uno::Reference<frame::XStorable> xStorable(mxComponent, css::uno::UNO_QUERY_THROW); - xStorable->storeToURL(maTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList()); + save(TestFilter::PDF_WRITER, aMediaDescriptor.getAsConstPropertyValueList()); // Parse the export result with pdfium. std::unique_ptr<vcl::pdf::PDFiumDocument> pPdfDocument = parsePDFExport(); @@ -1726,13 +1722,11 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf143311) // check PDF export comphelper::SequenceAsHashMap aMediaDescriptor; - aMediaDescriptor[u"FilterName"_ustr] <<= u"writer_pdf_Export"_ustr; // Enable PDF/UA uno::Sequence<beans::PropertyValue> aFilterData( comphelper::InitPropertySequence({ { "PDFUACompliance", uno::Any(true) } })); aMediaDescriptor[u"FilterData"_ustr] <<= aFilterData; - css::uno::Reference<frame::XStorable> xStorable(mxComponent, css::uno::UNO_QUERY_THROW); - xStorable->storeToURL(maTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList()); + save(TestFilter::PDF_WRITER, aMediaDescriptor.getAsConstPropertyValueList()); vcl::filter::PDFDocument aDocument; SvFileStream aStream(maTempFile.GetURL(), StreamMode::READ); diff --git a/sw/qa/extras/uiwriter/uiwriter8.cxx b/sw/qa/extras/uiwriter/uiwriter8.cxx index 8d3529910b33..2b0e72ce8e5f 100644 --- a/sw/qa/extras/uiwriter/uiwriter8.cxx +++ b/sw/qa/extras/uiwriter/uiwriter8.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/text/XPageCursor.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <comphelper/propertysequence.hxx> +#include <comphelper/propertyvalue.hxx> #include <boost/property_tree/json_parser.hpp> #include <frameformats.hxx> #include <tools/json_writer.hxx> @@ -680,13 +681,10 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf145584) uno::Sequence<beans::PropertyValue> aFilterData( comphelper::InitPropertySequence({ { "Selection", uno::Any(true) } })); - uno::Sequence<beans::PropertyValue> aDescriptor( - comphelper::InitPropertySequence({ { "FilterName", uno::Any(u"writer_pdf_Export"_ustr) }, - { "FilterData", uno::Any(aFilterData) }, - { "URL", uno::Any(maTempFile.GetURL()) } })); - // Without the fix in place, this test would have crashed here - dispatchCommand(mxComponent, u".uno:ExportToPDF"_ustr, aDescriptor); + save(TestFilter::PDF_WRITER, { + comphelper::makePropertyValue(u"FilterData"_ustr, aFilterData), + }); std::unique_ptr<vcl::pdf::PDFiumDocument> pPdfDocument = parsePDFExport(); CPPUNIT_ASSERT_EQUAL(1, pPdfDocument->getPageCount()); @@ -717,12 +715,9 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf131728) uno::Sequence<beans::PropertyValue> aFilterData(comphelper::InitPropertySequence( { { "ExportBookmarksToPDFDestination", uno::Any(true) } })); - uno::Sequence<beans::PropertyValue> aDescriptor( - comphelper::InitPropertySequence({ { "FilterName", uno::Any(u"writer_pdf_Export"_ustr) }, - { "FilterData", uno::Any(aFilterData) }, - { "URL", uno::Any(maTempFile.GetURL()) } })); - - dispatchCommand(mxComponent, u".uno:ExportToPDF"_ustr, aDescriptor); + save(TestFilter::PDF_WRITER, { + comphelper::makePropertyValue(u"FilterData"_ustr, aFilterData), + }); std::unique_ptr<vcl::pdf::PDFiumDocument> pPdfDocument = parsePDFExport(); CPPUNIT_ASSERT_EQUAL(1, pPdfDocument->getPageCount()); @@ -759,12 +754,9 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf95239) uno::Sequence<beans::PropertyValue> aFilterData(comphelper::InitPropertySequence( { { "ExportBookmarksToPDFDestination", uno::Any(true) } })); - uno::Sequence<beans::PropertyValue> aDescriptor( - comphelper::InitPropertySequence({ { "FilterName", uno::Any(u"writer_pdf_Export"_ustr) }, - { "FilterData", uno::Any(aFilterData) }, - { "URL", uno::Any(maTempFile.GetURL()) } })); - - dispatchCommand(mxComponent, u".uno:ExportToPDF"_ustr, aDescriptor); + save(TestFilter::PDF_WRITER, { + comphelper::makePropertyValue(u"FilterData"_ustr, aFilterData), + }); std::unique_ptr<vcl::pdf::PDFiumDocument> pPdfDocument = parsePDFExport(); CPPUNIT_ASSERT_EQUAL(2, pPdfDocument->getPageCount()); @@ -814,13 +806,10 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf152575) uno::Sequence<beans::PropertyValue> aFilterData( comphelper::InitPropertySequence({ { "ExportNotesInMargin", uno::Any(true) } })); - uno::Sequence<beans::PropertyValue> aDescriptor( - comphelper::InitPropertySequence({ { "FilterName", uno::Any(u"writer_pdf_Export"_ustr) }, - { "FilterData", uno::Any(aFilterData) }, - { "URL", uno::Any(maTempFile.GetURL()) } })); - // Without the fix in place, this test would have crashed here - dispatchCommand(mxComponent, u".uno:ExportToPDF"_ustr, aDescriptor); + save(TestFilter::PDF_WRITER, { + comphelper::makePropertyValue(u"FilterData"_ustr, aFilterData), + }); std::unique_ptr<vcl::pdf::PDFiumDocument> pPdfDocument = parsePDFExport(); CPPUNIT_ASSERT_EQUAL(3, pPdfDocument->getPageCount()); diff --git a/sw/qa/extras/uiwriter/uiwriter9.cxx b/sw/qa/extras/uiwriter/uiwriter9.cxx index 46c500d3c7fa..45328ada1f0d 100644 --- a/sw/qa/extras/uiwriter/uiwriter9.cxx +++ b/sw/qa/extras/uiwriter/uiwriter9.cxx @@ -762,13 +762,14 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest9, testPDFExportCrash) uno::Sequence<beans::PropertyValue> aFilterData( comphelper::InitPropertySequence({ { "PDFUACompliance", uno::Any(true) } })); - uno::Sequence<beans::PropertyValue> aDescriptor( - comphelper::InitPropertySequence({ { "FilterName", uno::Any(u"writer_pdf_Export"_ustr) }, - { "FilterData", uno::Any(aFilterData) }, - { "URL", uno::Any(maTempFile.GetURL()) } })); // Without the fix in place, this test would have crashed here - dispatchCommand(mxComponent, u".uno:ExportToPDF"_ustr, aDescriptor); + save(TestFilter::PDF_WRITER, { + comphelper::makePropertyValue(u"FilterData"_ustr, aFilterData), + }); + + std::unique_ptr<vcl::pdf::PDFiumDocument> pPdfDocument = parsePDFExport(); + CPPUNIT_ASSERT_EQUAL(1, pPdfDocument->getPageCount()); } CPPUNIT_TEST_FIXTURE(SwUiWriterTest9, testTdf159049) diff --git a/vcl/qa/cppunit/pdfexport/PDFEncryptionTest.cxx b/vcl/qa/cppunit/pdfexport/PDFEncryptionTest.cxx index ec261042165a..038dc70d1258 100644 --- a/vcl/qa/cppunit/pdfexport/PDFEncryptionTest.cxx +++ b/vcl/qa/cppunit/pdfexport/PDFEncryptionTest.cxx @@ -71,14 +71,12 @@ CPPUNIT_TEST_FIXTURE(PDFEncryptionTest, testEncryptionRoundtrip_PDF_1_7) loadFromURL(u"private:factory/swriter"_ustr); // Save PDF - uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY); - maMediaDescriptor["FilterName"] <<= OUString("writer_pdf_Export"); uno::Sequence<beans::PropertyValue> aFilterData = comphelper::InitPropertySequence( { { "SelectPdfVersion", uno::Any(sal_Int32(17)) }, { "EncryptFile", uno::Any(true) }, { "DocumentOpenPassword", uno::Any(u"secret"_ustr) } }); maMediaDescriptor["FilterData"] <<= aFilterData; - xStorable->storeToURL(maTempFile.GetURL(), maMediaDescriptor.getAsConstPropertyValueList()); + save(TestFilter::PDF_WRITER, maMediaDescriptor.getAsConstPropertyValueList()); // Load the exported result in PDFium std::unique_ptr<vcl::pdf::PDFiumDocument> pPdfDocument = parsePDFExport("secret"_ostr); @@ -92,14 +90,12 @@ CPPUNIT_TEST_FIXTURE(PDFEncryptionTest, testEncryptionRoundtrip_PDF_2_0) loadFromURL(u"private:factory/swriter"_ustr); // Save PDF - uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY); - maMediaDescriptor["FilterName"] <<= OUString("writer_pdf_Export"); uno::Sequence<beans::PropertyValue> aFilterData = comphelper::InitPropertySequence( { { "SelectPdfVersion", uno::Any(sal_Int32(20)) }, { "EncryptFile", uno::Any(true) }, { "DocumentOpenPassword", uno::Any(u"secret"_ustr) } }); maMediaDescriptor["FilterData"] <<= aFilterData; - xStorable->storeToURL(maTempFile.GetURL(), maMediaDescriptor.getAsConstPropertyValueList()); + save(TestFilter::PDF_WRITER, maMediaDescriptor.getAsConstPropertyValueList()); // Load the exported result in PDFium std::unique_ptr<vcl::pdf::PDFiumDocument> pPdfDocument = parsePDFExport("secret"_ostr);
