chart2/qa/extras/chart2export3.cxx | 6 +++++- chart2/qa/extras/charttest.hxx | 4 ++-- sw/qa/extras/ooxmlexport/ooxmlexport22.cxx | 6 +++++- sw/qa/extras/ooxmlexport/ooxmlexport25.cxx | 10 +++++++++- sw/qa/extras/uiwriter/uiwriter10.cxx | 5 ++++- 5 files changed, 25 insertions(+), 6 deletions(-)
New commits: commit 1e2c5e7cd93f494f57fd0c6d7a589d7a79a0b43e Author: Xisco Fauli <[email protected]> AuthorDate: Thu Nov 20 10:55:42 2025 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Thu Nov 20 20:20:20 2025 +0100 sw_ooxmlexport22: do not skip DOCX export validation Change-Id: I7bdacc2a2e7fd11e0e442ff34558668cb21b78f6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194256 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport22.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport22.cxx index 92bc7ef73969..9ff4f1a55c8d 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport22.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport22.cxx @@ -32,7 +32,7 @@ class Test : public SwModelTestBase { public: Test() - : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr, /*bSkipValidation*/ true) + : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr) { } }; @@ -565,6 +565,10 @@ CPPUNIT_TEST_FIXTURE(Test, testDelThenFormatDocxExport) // Given a document with <del>A<format>B</format>C</del> style redlines: // When exporting that document: createSwDoc("del-then-format.docx"); + + // FIXME: validation error in OOXML export: Errors: 1 + skipValidation(); + save(TestFilter::DOCX); // Then make sure delete "under" format uses the <w:delText> markup: commit c0e5df7ffe50a971fe7361dc1067872757f386ff Author: Xisco Fauli <[email protected]> AuthorDate: Thu Nov 20 10:45:46 2025 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Thu Nov 20 20:20:16 2025 +0100 sw_ooxmlexport25: do not skip DOCX export validation Change-Id: I512f536742ab79363eb780b4fbbbd4adb8ffa6d6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194255 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport25.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport25.cxx index 175787a0f30f..5a8e97b42744 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport25.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport25.cxx @@ -28,7 +28,7 @@ class Test : public SwModelTestBase { public: Test() - : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr, /*bSkipValidation*/ true) + : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr) { } }; @@ -128,6 +128,10 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf169413_asciiTheme) { // the document failed to reload without errors after a round-trip createSwDoc("tdf169413_asciiTheme.docx"); + + // FIXME: validation error in OOXML export: Errors: 5 + skipValidation(); + saveAndReload(TestFilter::DOCX); } @@ -194,7 +198,11 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf167082) // - Actual : Standard createSwDoc("tdf167082.docx"); + + // FIXME: validation error in OOXML export: Errors: 1 + skipValidation(); saveAndReload(TestFilter::DOCX); + OUString aStyleName = getProperty<OUString>(getParagraph(3), u"ParaStyleName"_ustr); CPPUNIT_ASSERT_EQUAL(OUString("Heading 1"), aStyleName); commit d82753f2416eafa7652e2bdfa2c1b1252ac782fb Author: Xisco Fauli <[email protected]> AuthorDate: Thu Nov 20 10:39:03 2025 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Thu Nov 20 20:20:11 2025 +0100 chart2_export3: do not skip DOCX export validation Change-Id: Ieaf7d0b4d10d558be3a57dbceb2ee42e431435fc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194254 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins diff --git a/chart2/qa/extras/chart2export3.cxx b/chart2/qa/extras/chart2export3.cxx index 8dda1c09c9ad..2022bffe7f1c 100644 --- a/chart2/qa/extras/chart2export3.cxx +++ b/chart2/qa/extras/chart2export3.cxx @@ -21,7 +21,7 @@ using beans::XPropertySet; class Chart2ExportTest3 : public ChartTest { public: - Chart2ExportTest3() : ChartTest(u"/chart2/qa/extras/data/"_ustr, /*bSkipValidation*/ true) {} + Chart2ExportTest3() : ChartTest(u"/chart2/qa/extras/data/"_ustr) {} }; CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf108107) @@ -694,6 +694,10 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testBarChartSecondaryAxisXLSX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testEmptyCharts) { loadFromFile(u"odt/testEmptyCharts.odt"); + + // FIXME: validation error in OOXML export: Errors: 1 + skipValidation(); + save(TestFilter::DOCX); // Make sure each chart exists in the respective XML diff --git a/chart2/qa/extras/charttest.hxx b/chart2/qa/extras/charttest.hxx index 0b921a191c39..a8edb86bbde9 100644 --- a/chart2/qa/extras/charttest.hxx +++ b/chart2/qa/extras/charttest.hxx @@ -62,8 +62,8 @@ using namespace css::uno; class ChartTest : public UnoApiXmlTest { public: - ChartTest(const OUString& path, bool bSkipValidation = false) - : UnoApiXmlTest(path, bSkipValidation) + ChartTest(const OUString& path) + : UnoApiXmlTest(path) { } commit 09e239a2c7584eaf47816e12409bf1c9b5f18dcb Author: Xisco Fauli <[email protected]> AuthorDate: Thu Nov 20 10:14:29 2025 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Thu Nov 20 20:20:07 2025 +0100 sw_uiwriter10: do not skip DOCX export validation Change-Id: I252580b3c293074a7d3669b18d2cd255fe2a5fa0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194253 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> diff --git a/sw/qa/extras/uiwriter/uiwriter10.cxx b/sw/qa/extras/uiwriter/uiwriter10.cxx index 9822e0c3b6f8..44f5b24a5d2c 100644 --- a/sw/qa/extras/uiwriter/uiwriter10.cxx +++ b/sw/qa/extras/uiwriter/uiwriter10.cxx @@ -42,7 +42,7 @@ class SwUiWriterTest5 : public SwModelTestBase { public: SwUiWriterTest5() - : SwModelTestBase(u"/sw/qa/extras/uiwriter/data/"_ustr, /*bSkipValidation*/ true) + : SwModelTestBase(u"/sw/qa/extras/uiwriter/data/"_ustr) { } @@ -1104,6 +1104,9 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testRedlineTableColumnDeletionWithDOCXExpo assertXPath(pXmlDoc, "//page[1]//body/tab"); assertXPath(pXmlDoc, "//page[1]//body/tab/row/cell", 2); + // FIXME: validation error in OOXML export: Errors: 1 + skipValidation(); + // Save it to a DOCX and load it back. // Exporting change tracking of the cell wasn't supported. // Also Manage Changes for the import.
