sw/qa/extras/htmlexport/htmlexport.cxx | 2 +- sw/qa/extras/htmlexport/htmlexport2.cxx | 18 +++++++++--------- sw/qa/extras/htmlexport/htmlmodeltestbase.hxx | 10 ---------- 3 files changed, 10 insertions(+), 20 deletions(-)
New commits: commit c28ae7b32c1e423f17da42a95cf78c958c5159ec Author: Xisco Fauli <[email protected]> AuthorDate: Mon Feb 2 17:51:00 2026 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Mon Feb 2 20:55:18 2026 +0100 SwHtmlDomExportTest: drop ExportToHTML just use save Change-Id: Id7e3e2034a8b9d274cc73ce712c922c9b1e01a45 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198568 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx b/sw/qa/extras/htmlexport/htmlexport.cxx index 4dac93fc04d2..c32cfb0ad25c 100644 --- a/sw/qa/extras/htmlexport/htmlexport.cxx +++ b/sw/qa/extras/htmlexport/htmlexport.cxx @@ -1366,7 +1366,7 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testPartiallyNumberedListHTML) } // When exporting to HTML: - ExportToHTML(); + save(TestFilter::HTML_WRITER); xmlDocUniquePtr pXmlDoc = parseXml(maTempFile); CPPUNIT_ASSERT(pXmlDoc); // if we have missing closing marks - parse error diff --git a/sw/qa/extras/htmlexport/htmlexport2.cxx b/sw/qa/extras/htmlexport/htmlexport2.cxx index bf40f5a176ac..98e750fce375 100644 --- a/sw/qa/extras/htmlexport/htmlexport2.cxx +++ b/sw/qa/extras/htmlexport/htmlexport2.cxx @@ -319,7 +319,7 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testOleEmfPreviewToHtml) createSwDoc("ole2.odt"); // When exporting to HTML: - ExportToHTML(); + save(TestFilter::HTML_WRITER); // Then make sure the <img> tag has matching file extension and data: htmlDocUniquePtr pDoc = parseHtml(maTempFile); @@ -1222,7 +1222,7 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testHTML_Tdf160017_spanClosingOrder) // Given a document with a paragraph having explicit font color and character border properties: createSwDoc("char_border_and_font_color.fodt"); // When exporting to HTML: - ExportToHTML(); + save(TestFilter::HTML_WRITER); // Parse it as XML (strict!) // Without the fix, this would fail, because span and font elements closed in wrong order CPPUNIT_ASSERT(parseXml(maTempFile)); @@ -1232,7 +1232,7 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testHTML_Tdf160390) { // This document must not hang infinitely on HTML export createSwDoc("tdf160390.fodt"); - ExportToHTML(); + save(TestFilter::HTML_WRITER); } CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testHTML_160867) @@ -1240,7 +1240,7 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testHTML_160867) // Given a document with an image with hyperlink, and text with hyperlink, both in a frame: createSwDoc("tdf160867_image_with_link.fodt"); // When exporting to HTML: - ExportToHTML(); + save(TestFilter::HTML_WRITER); // Parse it as XML (strict!) xmlDocUniquePtr pDoc = parseXml(maTempFile); CPPUNIT_ASSERT(pDoc); @@ -1280,7 +1280,7 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testHTML_161979) { // Given a document with two embedded metafiles: createSwDoc("tdf161979_metafile.fodt"); - ExportToHTML(); + save(TestFilter::HTML_WRITER); xmlDocUniquePtr pDoc = parseXml(maTempFile); CPPUNIT_ASSERT(pDoc); // First image: it has no EMF+ actions, and didn't use canvas rendering before the fix; @@ -1480,7 +1480,7 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testHTML_exportRelativeURLs) createSwDoc("URLs.odt"); // Export to HTML, using relative URLs (the default) - ExportToHTML(); + save(TestFilter::HTML_WRITER); htmlDocUniquePtr pHtmlDoc = parseHtml(maTempFile); // HTTP URL: must be absolute @@ -1561,7 +1561,7 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testHTML_162426) // Given a document with an image with style:wrap="none": createSwDoc("tdf162426_image_with_wrap_none.fodt"); // Before the fix, an assertion failed in HtmlWriter::attribute when exporting to HTML : - ExportToHTML(); + save(TestFilter::HTML_WRITER); xmlDocUniquePtr pDoc = parseXml(maTempFile); CPPUNIT_ASSERT(pDoc); @@ -1577,7 +1577,7 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testHTML_163873) // Given a document with an image with style:wrap="none": createSwDoc("tdf131728.docx"); // Before the fix, an assertion failed in HtmlWriter::attribute when exporting to HTML : - ExportToHTML(); + save(TestFilter::HTML_WRITER); xmlDocUniquePtr pDoc = parseXml(maTempFile); CPPUNIT_ASSERT(pDoc); @@ -1622,7 +1622,7 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testTextAlignStartEnd) { createSwDoc("text-align-start-end.fodt"); - ExportToHTML(); + save(TestFilter::HTML_WRITER); xmlDocUniquePtr pDoc = parseXml(maTempFile); CPPUNIT_ASSERT(pDoc); diff --git a/sw/qa/extras/htmlexport/htmlmodeltestbase.hxx b/sw/qa/extras/htmlexport/htmlmodeltestbase.hxx index 268582a490a5..e144d039ab96 100644 --- a/sw/qa/extras/htmlexport/htmlmodeltestbase.hxx +++ b/sw/qa/extras/htmlexport/htmlmodeltestbase.hxx @@ -180,8 +180,6 @@ public: void ExportToReqif(); /// Import using the C++ HTML import filter, with xhtmlns=reqif-xhtml. void ImportFromReqif(const OUString& rUrl); - /// Export using the C++ HTML export filter - void ExportToHTML(); }; OUString SwHtmlDomExportTest::GetObjectPath(const OUString& ext) @@ -213,14 +211,6 @@ void SwHtmlDomExportTest::ExportToReqif() save(TestFilter::HTML_WRITER); } -void SwHtmlDomExportTest::ExportToHTML() -{ - uno::Sequence<beans::PropertyValue> aStoreProperties = { - comphelper::makePropertyValue(u"FilterName"_ustr, u"HTML (StarWriter)"_ustr), - }; - saveWithParams(aStoreProperties); -} - void SwHtmlDomExportTest::ImportFromReqif(const OUString& rUrl) { uno::Sequence<beans::PropertyValue> aLoadProperties = {
