core.git: vcl/qa

[Xisco Fauli (via logerrit)]

 vcl/qa/cppunit/pdfexport/pdfexport.cxx  |   33 ++++++++++++++++++--------------
 vcl/qa/cppunit/pdfexport/pdfexport2.cxx |    3 --
 2 files changed, 19 insertions(+), 17 deletions(-)

New commits:
commit f09775c69bbdd5c43ad375f4869c0d329bccebf2
Author:     Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Wed Jul 31 12:08:13 2024 +0200
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Jul 31 13:19:48 2024 +0200

    CppunitTest_vcl_pdfexport: simplify a bit more
    
    after 159d823c7b7502ee07d897d74c4e74c6e1873596
    "tdf#153040 PDF export: disable export of form fields as PDF forms by
    default"
    
    Change-Id: I1da61a7ccddc362b8d8ab08f7e48c7da57d47337
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171308
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx 
b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
index d033b71bb11c..897ab39df7d1 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
@@ -44,8 +44,7 @@ public:
     }
 
     void saveAsPDF(std::u16string_view rFile);
-    void load(std::u16string_view rFile, vcl::filter::PDFDocument& rDocument,
-              bool bUseExportFormFields = false);
+    void load(std::u16string_view rFile, vcl::filter::PDFDocument& rDocument);
 };
 
 void PdfExportTest::saveAsPDF(std::u16string_view rFile)
@@ -56,16 +55,8 @@ void PdfExportTest::saveAsPDF(std::u16string_view rFile)
     saveWithParams(aMediaDescriptor.getAsConstPropertyValueList());
 }
 
-void PdfExportTest::load(std::u16string_view rFile, vcl::filter::PDFDocument& 
rDocument,
-                         bool bUseExportFormFields)
+void PdfExportTest::load(std::u16string_view rFile, vcl::filter::PDFDocument& 
rDocument)
 {
-    if (bUseExportFormFields)
-    {
-        uno::Sequence<beans::PropertyValue> 
aFilterData(comphelper::InitPropertySequence({
-            { "ExportFormFields", uno::Any(bUseExportFormFields) },
-        }));
-        aMediaDescriptor[u"FilterData"_ustr] <<= aFilterData;
-    }
     saveAsPDF(rFile);
 
     // Parse the export result.
@@ -874,8 +865,12 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testAlternativeText)
 
 CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf105972)
 {
+    uno::Sequence<beans::PropertyValue> 
aFilterData(comphelper::InitPropertySequence({
+        { "ExportFormFields", uno::Any(true) },
+    }));
+    aMediaDescriptor[u"FilterData"_ustr] <<= aFilterData;
     vcl::filter::PDFDocument aDocument;
-    load(u"tdf105972.fodt", aDocument, /*bUseExportFormFields=*/true);
+    load(u"tdf105972.fodt", aDocument);
 
     // The document has one page.
     std::vector<vcl::filter::PDFObjectElement*> aPages = aDocument.GetPages();
@@ -938,8 +933,13 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf105972)
 
 CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf148442)
 {
+    uno::Sequence<beans::PropertyValue> 
aFilterData(comphelper::InitPropertySequence({
+        { "ExportFormFields", uno::Any(true) },
+    }));
+    aMediaDescriptor[u"FilterData"_ustr] <<= aFilterData;
+
     vcl::filter::PDFDocument aDocument;
-    load(u"tdf148442.odt", aDocument, /*bUseExportFormFields=*/true);
+    load(u"tdf148442.odt", aDocument);
 
     // The document has one page.
     std::vector<vcl::filter::PDFObjectElement*> aPages = aDocument.GetPages();
@@ -1007,8 +1007,13 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf148442)
 
 CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf118244_radioButtonGroup)
 {
+    uno::Sequence<beans::PropertyValue> 
aFilterData(comphelper::InitPropertySequence({
+        { "ExportFormFields", uno::Any(true) },
+    }));
+    aMediaDescriptor[u"FilterData"_ustr] <<= aFilterData;
+
     vcl::filter::PDFDocument aDocument;
-    load(u"tdf118244_radioButtonGroup.odt", aDocument, 
/*bUseExportFormFields=*/true);
+    load(u"tdf118244_radioButtonGroup.odt", aDocument);
 
     // The document has one page.
     std::vector<vcl::filter::PDFObjectElement*> aPages = aDocument.GetPages();
diff --git a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx 
b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx
index 1b00d1cc52c0..702b71db7eff 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx
@@ -5282,7 +5282,6 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf157390)
 // tdf#162205 - Verifies bidi portions on vertical left-to-right pages are 
rendered correctly
 CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf162205Ltr)
 {
-    aMediaDescriptor[u"FilterName"_ustr] <<= u"writer_pdf_Export"_ustr;
     saveAsPDF(u"tdf162205-ltr.fodt");
 
     auto pPdfDocument = parsePDFExport();
@@ -5338,7 +5337,6 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf162205Ltr)
 // tdf#162205 - Verifies bidi portions on vertical left-to-right pages are 
rendered correctly
 CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf162205Rtl)
 {
-    aMediaDescriptor[u"FilterName"_ustr] <<= u"writer_pdf_Export"_ustr;
     saveAsPDF(u"tdf162205-rtl.fodt");
 
     auto pPdfDocument = parsePDFExport();
@@ -5394,7 +5392,6 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf162205Rtl)
 // tdf#162194 - Verifies soft hyphens inside ligatures are rendered correctly.
 CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf162194SoftHyphen)
 {
-    aMediaDescriptor[u"FilterName"_ustr] <<= u"writer_pdf_Export"_ustr;
     saveAsPDF(u"tdf162194-soft-hyphen.fodt");
 
     auto pPdfDocument = parsePDFExport();