sw/qa/core/text/text.cxx | 16 ++++++++-------- sw/qa/inc/swmodeltestbase.hxx | 2 -- sw/qa/unit/swmodeltestbase.cxx | 8 -------- 3 files changed, 8 insertions(+), 18 deletions(-)
New commits: commit c5e872e06a070ff8e90f644036981fa202c2b1e0 Author: Xisco Fauli <xiscofa...@libreoffice.org> AuthorDate: Thu Nov 3 17:37:11 2022 +0100 Commit: Xisco Fauli <xiscofa...@libreoffice.org> CommitDate: Thu Nov 3 23:21:44 2022 +0100 swmodeltestbase: remove duplicated method Change-Id: I16b785c31f0e235b6a71b6ea86b17b72e063e95d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142247 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org> diff --git a/sw/qa/core/text/text.cxx b/sw/qa/core/text/text.cxx index 8f3f18fd56d3..0bece6e95f2b 100644 --- a/sw/qa/core/text/text.cxx +++ b/sw/qa/core/text/text.cxx @@ -122,7 +122,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testBibliographyUrlPdfExport) xText->insertTextContent(xCursor, xContent, /*bAbsorb=*/false); // When exporting to PDF: - StoreToTempFile("writer_pdf_Export"); + save("writer_pdf_Export"); // Then make sure the field links the source. std::unique_ptr<vcl::pdf::PDFiumDocument> pPdfDocument = LoadPdfFromTempFile(); @@ -646,7 +646,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testContentControlPDF) pContentControl->SetAlias("mydesc"); // When exporting to PDF: - StoreToTempFile("writer_pdf_Export"); + save("writer_pdf_Export"); // Then make sure that a fillable form widget is emitted: std::unique_ptr<vcl::pdf::PDFiumDocument> pPdfDocument = LoadPdfFromTempFile(); @@ -672,7 +672,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testCheckboxContentControlPDF) pWrtShell->InsertContentControl(SwContentControlType::CHECKBOX); // When exporting to PDF: - StoreToTempFile("writer_pdf_Export"); + save("writer_pdf_Export"); // Then make sure that a checkbox form widget is emitted: std::unique_ptr<vcl::pdf::PDFiumDocument> pPdfDocument = LoadPdfFromTempFile(); @@ -697,7 +697,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testDropdownContentControlPDF) pWrtShell->InsertContentControl(SwContentControlType::DROP_DOWN_LIST); // When exporting to PDF: - StoreToTempFile("writer_pdf_Export"); + save("writer_pdf_Export"); // Then make sure that a dropdown form widget is emitted: std::unique_ptr<vcl::pdf::PDFiumDocument> pPdfDocument = LoadPdfFromTempFile(); @@ -722,7 +722,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testDateContentControlPDF) pWrtShell->InsertContentControl(SwContentControlType::DATE); // When exporting to PDF: - StoreToTempFile("writer_pdf_Export"); + save("writer_pdf_Export"); // Then make sure that a date form widget is emitted: std::unique_ptr<vcl::pdf::PDFiumDocument> pPdfDocument = LoadPdfFromTempFile(); @@ -751,7 +751,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testContentControlPDFFont) pWrtShell->InsertContentControl(SwContentControlType::RICH_TEXT); // When exporting that document to PDF: - StoreToTempFile("writer_pdf_Export"); + save("writer_pdf_Export"); // Then make sure that the widget in the PDF result has that custom font size: std::unique_ptr<vcl::pdf::PDFiumDocument> pPdfDocument = LoadPdfFromTempFile(); @@ -774,7 +774,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testComboContentControlPDF) pWrtShell->InsertContentControl(SwContentControlType::COMBO_BOX); // When exporting to PDF: - StoreToTempFile("writer_pdf_Export"); + save("writer_pdf_Export"); // Then make sure that a combo box form widget is emitted: std::unique_ptr<vcl::pdf::PDFiumDocument> pPdfDocument = LoadPdfFromTempFile(); @@ -811,7 +811,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testRichContentControlPDF) pWrtShell->SetAttrSet(aSet); // When exporting to PDF: - StoreToTempFile("writer_pdf_Export"); + save("writer_pdf_Export"); // Then make sure that a single fillable form widget is emitted: std::unique_ptr<vcl::pdf::PDFiumDocument> pPdfDocument = LoadPdfFromTempFile(); diff --git a/sw/qa/inc/swmodeltestbase.hxx b/sw/qa/inc/swmodeltestbase.hxx index db51a1f75aec..1c64baf4fbff 100644 --- a/sw/qa/inc/swmodeltestbase.hxx +++ b/sw/qa/inc/swmodeltestbase.hxx @@ -402,8 +402,6 @@ protected: */ SwDoc* getSwDoc(); - void StoreToTempFile(const OUString& rFilterName); - std::unique_ptr<vcl::pdf::PDFiumDocument> LoadPdfFromTempFile(); /** diff --git a/sw/qa/unit/swmodeltestbase.cxx b/sw/qa/unit/swmodeltestbase.cxx index b12f640fb34f..65048ffbac20 100644 --- a/sw/qa/unit/swmodeltestbase.cxx +++ b/sw/qa/unit/swmodeltestbase.cxx @@ -744,14 +744,6 @@ SwXTextDocument& SwModelTestBase::getSwXTextDocument() SwDoc* SwModelTestBase::getSwDoc() { return getSwXTextDocument().GetDocShell()->GetDoc(); } -void SwModelTestBase::StoreToTempFile(const OUString& rFilterName) -{ - uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY); - utl::MediaDescriptor aMediaDescriptor; - aMediaDescriptor["FilterName"] <<= rFilterName; - xStorable->storeToURL(maTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList()); -} - std::unique_ptr<vcl::pdf::PDFiumDocument> SwModelTestBase::LoadPdfFromTempFile() { SvFileStream aFile(maTempFile.GetURL(), StreamMode::READ);