sw/qa/extras/ooxmlexport/ooxmlexport16.cxx | 41 ++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-)
New commits: commit 715c72ff4dfe7cab10f1b48ff914f7dca833834f Author: Xisco Fauli <[email protected]> AuthorDate: Fri Nov 21 12:40:42 2025 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Fri Nov 21 15:34:57 2025 +0100 sw_ooxmlexport16: do not skip DOCX export validation Change-Id: I5b4a9a82104e97c49b444aad129be33a4891efab Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194318 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx index 00b5f4eb2e4d..3e5169d4588c 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx @@ -35,7 +35,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) {} }; CPPUNIT_TEST_FIXTURE(Test, testTdf143860NonPrimitiveCustomShape) @@ -114,6 +114,10 @@ CPPUNIT_TEST_FIXTURE(Test, testWrapPolygonCustomShape) CPPUNIT_TEST_FIXTURE(Test, testFrameWrapTextMode) { createSwDoc("tdf143432_Frame_WrapTextMode.odt"); + + //FIXME: validation error in OOXML export: Errors: 2 + skipValidation(); + save(TestFilter::DOCX); CPPUNIT_ASSERT_EQUAL(2, getShapes()); CPPUNIT_ASSERT_EQUAL(1, getPages()); @@ -146,6 +150,10 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf134219ContourWrap_glow_rotate) // Test fails on reload without fix with left: expected 1461 actual 2455; right: expected 1302 // actual 4177; top: expected 1522 actual 2457; bottom: expected 1296, actual 4179 verify(); + + //FIXME: validation error in OOXML export: Errors: 1 + skipValidation(); + saveAndReload(TestFilter::DOCX); verify(); } @@ -212,6 +220,9 @@ DECLARE_OOXMLEXPORT_TEST(testTdf151384Hyperlink, "151384Hyperlink.odt") DECLARE_OOXMLEXPORT_TEST(testTdf66039, "tdf66039.docx") { + //FIXME: validation error in OOXML export: Errors: 4 + skipValidation(); + // This bugdoc has a groupshape (WPG) with a table inside its each member shape. // Before there was no table after import at all. From now, there must be 2 tables. uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY); @@ -486,6 +497,9 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf148671) DECLARE_OOXMLEXPORT_TEST(testTdf140668, "tdf140668.docx") { + //FIXME: validation error in OOXML export: Errors: 3 + skipValidation(); + // Don't crash when document is opened CPPUNIT_ASSERT_EQUAL(1, getPages()); } @@ -498,12 +512,18 @@ DECLARE_OOXMLEXPORT_TEST(testTdf149649, "tdf149649.docx") DECLARE_OOXMLEXPORT_TEST(testTdf138771, "tdf138771.docx") { + //FIXME: validation error in OOXML export: Errors: 1 + skipValidation(); + // Don't crash when document is imported CPPUNIT_ASSERT_EQUAL(1, getPages()); } DECLARE_OOXMLEXPORT_TEST(testTdf168017, "tdf168017.docx") { + //FIXME: validation error in OOXML export: Errors: 20 + skipValidation(); + // Don't crash when document is imported } @@ -516,6 +536,10 @@ DECLARE_OOXMLEXPORT_TEST(testTdf125936_numberingSuperscript, "tdf125936_numberin CPPUNIT_TEST_FIXTURE(Test, testTdf134619_numberingProps) { createSwDoc("tdf134619_numberingProps.doc"); + + //FIXME: validation error in OOXML export: Errors: 2 + skipValidation(); + saveAndReload(TestFilter::DOCX); // Get the third paragraph's numbering style's 1st level's bullet size uno::Reference<text::XTextRange> xParagraph = getParagraph(3); @@ -703,6 +727,10 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf146171_invalid_change_date) CPPUNIT_TEST_FIXTURE(Test, testTdf139580) { createSwDoc("tdf139580.odt"); + + //FIXME: validation error in OOXML export: Errors: 21 + skipValidation(); + saveAndReload(TestFilter::DOCX); // Without the fix in place, this test would have crashed at export time CPPUNIT_ASSERT_EQUAL(2, getShapes()); @@ -863,6 +891,9 @@ DECLARE_OOXMLEXPORT_TEST(testTdf153874, "image_through_shape.docx") DECLARE_OOXMLEXPORT_TEST(testTextBoxZOrder, "testTextBoxZOrder.docx") { + //FIXME: validation error in OOXML export: Errors: 1 + skipValidation(); + // Collect the z-order values of the textboxes std::vector<sal_uInt64> ShapeZorders; std::vector<sal_uInt64> FrameZorders; @@ -1107,6 +1138,10 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf143726) CPPUNIT_TEST_FIXTURE(Test, testTdf152153) { createSwDoc("embedded_images.odt"); + + //FIXME: validation error in OOXML export: Errors: 2 + skipValidation(); + saveAndReload(TestFilter::DOCX); uno::Reference<packages::zip::XZipFileAccess2> xNameAccess @@ -1128,6 +1163,10 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf152153) CPPUNIT_TEST_FIXTURE(Test, testTdf152152) { createSwDoc("artistic_effects.docx"); + + //FIXME: validation error in OOXML export: Errors: 2 + skipValidation(); + saveAndReload(TestFilter::DOCX); uno::Reference<packages::zip::XZipFileAccess2> xNameAccess
