oox/qa/unit/export.cxx | 3 --- sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx | 10 +++++++++- 2 files changed, 9 insertions(+), 4 deletions(-)
New commits: commit a7f62535f26d9adecfd2ff018f33766391cc65fc Author: Xisco Fauli <[email protected]> AuthorDate: Thu Nov 20 21:03:52 2025 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Fri Nov 21 08:48:24 2025 +0100 sw_ooxmlfieldexport: do not skip DOCX export validation Change-Id: Iab0c9a47d59d432229f110fa4008d3af27c807f1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194288 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> diff --git a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx index 5baaf63f00e3..9aa727cedbd8 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx @@ -25,7 +25,7 @@ class Test : public SwModelTestBase { public: - Test() : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr, /*bSkipValidation*/ true) {} + Test() : SwModelTestBase(u"/sw/qa/extras/ooxmlexport/data/"_ustr) {} }; DECLARE_OOXMLEXPORT_TEST(testFdo47669, "fdo47669.docx") @@ -440,6 +440,10 @@ CPPUNIT_TEST_FIXTURE(Test, testFDO78654 ) CPPUNIT_TEST_FIXTURE(Test, testfdo78599) { createSwDoc("fdo78599.docx"); + + // FIXME: validation error in OOXML export: Errors: 6 + skipValidation(); + saveAndReload(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); //docx file after RT is getting corrupted. @@ -728,6 +732,10 @@ CPPUNIT_TEST_FIXTURE(Test, testfdo81946) CPPUNIT_TEST_FIXTURE(Test, testfdo82492) { createSwDoc("fdo82492.docx"); + + // FIXME: validation error in OOXML export: Errors: 1 + skipValidation(); + saveAndReload(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); commit f1b5bd3e4749ee6d7b7ce72e1446a34804347176 Author: Xisco Fauli <[email protected]> AuthorDate: Thu Nov 20 20:55:24 2025 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Fri Nov 21 08:48:16 2025 +0100 oox_export: remove obsolete comments Change-Id: I054e3873026cdc25d28fe0223a2c1c50d9a9fe76 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194287 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> diff --git a/oox/qa/unit/export.cxx b/oox/qa/unit/export.cxx index 33c8d1d29736..ca8a8cff9f41 100644 --- a/oox/qa/unit/export.cxx +++ b/oox/qa/unit/export.cxx @@ -81,7 +81,6 @@ CPPUNIT_TEST_FIXTURE(Test, testInsertCheckboxContentControlOdt) dispatchCommand(mxComponent, u".uno:InsertCheckboxContentControl"_ustr, {}); save(TestFilter::DOCX); - // validate(maTempFile.GetFileName(), test::OOXML); // Enable when unrelated errors are fixed. } CPPUNIT_TEST_FIXTURE(Test, testInsertCheckboxContentControlDocx) @@ -94,7 +93,6 @@ CPPUNIT_TEST_FIXTURE(Test, testInsertCheckboxContentControlDocx) dispatchCommand(mxComponent, u".uno:InsertCheckboxContentControl"_ustr, {}); save(TestFilter::DOCX); - // validate(maTempFile.GetFileName(), test::OOXML); // Enable when unrelated errors are fixed. } { @@ -124,7 +122,6 @@ CPPUNIT_TEST_FIXTURE(Test, testInsertCheckboxContentControlDocx) // Loading should not show the "corrupted" dialog, which would assert. saveAndReload(TestFilter::DOCX); - // validate(maTempFile.GetFileName(), test::OOXML); // Enable when unrelated errors are fixed. } }
