sw/qa/extras/ooxmlexport/ooxmlexport26.cxx | 29 ++++++++++++++++++ sw/qa/extras/ooxmlexport/ooxmlexport3.cxx | 45 ++++++++++++++++++++++++++++- 2 files changed, 72 insertions(+), 2 deletions(-)
New commits: commit 5b116ec2d2bda944ee8d0ab7e05a72eee855f99a Author: Xisco Fauli <[email protected]> AuthorDate: Fri Nov 21 13:39:52 2025 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Fri Nov 21 19:19:35 2025 +0100 sw_ooxmlexport3: do not skip DOCX export validation Change-Id: I8d7cc7997dc51bccd6577d1fad10f17605d45b31 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194323 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx index dad7d38a79f3..852e7900f1dd 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx @@ -27,7 +27,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(testFdo68418, "fdo68418.docx") @@ -243,6 +243,10 @@ CPPUNIT_TEST_FIXTURE(Test, testStyleInheritance) CPPUNIT_TEST_FIXTURE(Test, testCalendar1) { createSwDoc("calendar1.docx"); + + //FIXME: validation error in OOXML export: Errors: 1 + skipValidation(); + save(TestFilter::DOCX); // Document has a non-trivial table style, test the roundtrip of it. xmlDocUniquePtr pXmlStyles = parseExport(u"word/styles.xml"_ustr); @@ -291,6 +295,10 @@ CPPUNIT_TEST_FIXTURE(Test, testCalendar2) createSwDoc("calendar2.docx"); verify(); + + //FIXME: validation error in OOXML export: Errors: 7 + skipValidation(); + saveAndReload(TestFilter::DOCX); verify(); @@ -312,6 +320,9 @@ CPPUNIT_TEST_FIXTURE(Test, testCalendar2) DECLARE_OOXMLEXPORT_TEST(testCalendar3, "calendar3.docx") { + //FIXME: validation error in OOXML export: Errors: 8 + skipValidation(); + // TableStyle:firstRow (for header rows 1 and 2) color and size overrides document rPrDefault uno::Reference<text::XTextTable> xTable(getParagraphOrTable(1), uno::UNO_QUERY); uno::Reference<text::XTextRange> xCell(xTable->getCellByName(u"A2"_ustr), uno::UNO_QUERY); @@ -331,6 +342,9 @@ DECLARE_OOXMLEXPORT_TEST(testCalendar3, "calendar3.docx") DECLARE_OOXMLEXPORT_TEST(testCalendar4, "calendar4.docx") { + //FIXME: validation error in OOXML export: Errors: 8 + skipValidation(); + // TableStyle:fontsize - overrides DocDefaults, but not Style. // In this case the style does not define anything (but does copy-inherit the DocDefaults size 36) uno::Reference<text::XTextTable> xTable(getParagraphOrTable(1), uno::UNO_QUERY); @@ -340,6 +354,9 @@ DECLARE_OOXMLEXPORT_TEST(testCalendar4, "calendar4.docx") DECLARE_OOXMLEXPORT_TEST(testCalendar5, "calendar5.docx") { + //FIXME: validation error in OOXML export: Errors: 6 + skipValidation(); + // check text portions with and without direct formatting uno::Reference<text::XTextTable> xTable(getParagraphOrTable(1), uno::UNO_QUERY); uno::Reference<text::XTextRange> xCell(xTable->getCellByName(u"A1"_ustr), uno::UNO_QUERY); @@ -358,6 +375,10 @@ DECLARE_OOXMLEXPORT_TEST(testCalendar5, "calendar5.docx") CPPUNIT_TEST_FIXTURE(Test, testTcBorders) { createSwDoc("testTcBorders.docx"); + + //FIXME: validation error in OOXML export: Errors: 9 + skipValidation(); + save(TestFilter::DOCX); //fdo#76635 : Table borders are not getting preserved. @@ -407,6 +428,10 @@ CPPUNIT_TEST_FIXTURE(Test, testQuicktables) CPPUNIT_TEST_FIXTURE(Test, testFdo71302) { createSwDoc("fdo71302.docx"); + + //FIXME: validation error in OOXML export: Errors: 1 + skipValidation(); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlStyles = parseExport(u"word/styles.xml"_ustr); @@ -596,6 +621,9 @@ CPPUNIT_TEST_FIXTURE(Test, testPgMargin) DECLARE_OOXMLEXPORT_TEST(testImageCrop, "ImageCrop.docx") { + //FIXME: validation error in OOXML export: Errors: 1 + skipValidation(); + uno::Reference<drawing::XShape> image = getShape(1); uno::Reference<beans::XPropertySet> imageProperties(image, uno::UNO_QUERY); css::text::GraphicCrop aGraphicCropStruct; @@ -1034,12 +1062,19 @@ CPPUNIT_TEST_FIXTURE(Test, testGlossaryWithEmail) DECLARE_OOXMLEXPORT_TEST(testFdo71785, "fdo71785.docx") { + //FIXME: validation error in OOXML export: Errors: 6 + skipValidation(); + // crashtest } CPPUNIT_TEST_FIXTURE(Test, testCrashWhileSave) { createSwDoc("testCrashWhileSave.docx"); + + //FIXME: validation error in OOXML export: Errors: 1 + skipValidation(); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/footer1.xml"_ustr); CPPUNIT_ASSERT(getXPath(pXmlDoc, "/w:ftr/w:tbl/w:tr/w:tc[1]/w:p[1]/w:pPr/w:pStyle", "val").match("Normal")); @@ -1158,6 +1193,10 @@ CPPUNIT_TEST_FIXTURE(Test, testNumberingLevels) CPPUNIT_TEST_FIXTURE(Test, testVerticalBorders) { createSwDoc("calendar3.docx"); + + //FIXME: validation error in OOXML export: Errors: 8 + skipValidation(); + save(TestFilter::DOCX); // tdf#130799: Inside vertical borders of a table should not be missing. @@ -1249,6 +1288,10 @@ CPPUNIT_TEST_FIXTURE(Test, testRelativeAnchorWidthFromInsideOutsideMargin) CPPUNIT_TEST_FIXTURE(Test, testBodyPrUpright) { createSwDoc("tdf123610_handle_upright.docx"); + + //FIXME: validation error in OOXML export: Errors: 1 + skipValidation(); + save(TestFilter::DOCX); // tdf#123610: Check grab-bag attribute upright to keep text upright regardless of shape rotation. commit 729d7c4cc44eaf2ab586af7d54a9f9ba44227f9c Author: Xisco Fauli <[email protected]> AuthorDate: Fri Nov 21 12:47:39 2025 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Fri Nov 21 19:19:26 2025 +0100 sw_ooxmlexport26: do not skip DOCX export validation Change-Id: I96e51913c2100362e20c27495ed19c7d492ff46c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194319 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport26.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport26.cxx index e6843941a6d0..00fbb93c57c3 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport26.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport26.cxx @@ -17,7 +17,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) { } }; @@ -25,6 +25,10 @@ public: CPPUNIT_TEST_FIXTURE(Test, testTdf126245) { createSwDoc("tdf126245.docx"); + + //FIXME: validation error in OOXML export: Errors: 1 + skipValidation(); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); // export change tracking rejection data for tracked numbering change @@ -35,6 +39,10 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf126245) CPPUNIT_TEST_FIXTURE(Test, testTdf124491) { createSwDoc("tdf124491.docx"); + + //FIXME: validation error in OOXML export: Errors: 5 + skipValidation(); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); // import format change of empty lines, FIXME: change w:r with w:pPr in export @@ -131,6 +139,10 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf136667) CPPUNIT_TEST_FIXTURE(Test, testTdf136850) { createSwDoc("tdf136850.docx"); + + //FIXME: validation error in OOXML export: Errors: 5 + skipValidation(); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); // import change tracking in floating tables @@ -162,6 +174,10 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf165330) CPPUNIT_TEST_FIXTURE(Test, testTdf125546) { createSwDoc("tdf125546.docx"); + + //FIXME: validation error in OOXML export: Errors: 5 + skipValidation(); + save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); // compress redlines (it was 15) @@ -360,6 +376,10 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf81100) }; createSwDoc("tdf81100.docx"); verify(); + + //FIXME: validation error in OOXML export: Errors: 6 + skipValidation(); + saveAndReload(TestFilter::DOCX); verify(/*bIsExport*/ true); @@ -494,6 +514,10 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf121597TrackedDeletionOfMultipleParagraphs) CPPUNIT_TEST_FIXTURE(Test, testTdf141660) { createSwDoc("tdf141660.docx"); + + //FIXME: validation error in OOXML export: Errors: 1 + skipValidation(); + save(TestFilter::DOCX); CPPUNIT_ASSERT_EQUAL(1, getPages()); xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); @@ -645,6 +669,9 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf147892) DECLARE_OOXMLEXPORT_TEST(testTdf123054, "tdf123054.docx") { + //FIXME: validation error in OOXML export: Errors: 64 + skipValidation(); + CPPUNIT_ASSERT_EQUAL(u"No Spacing"_ustr, getProperty<OUString>(getParagraph(20), u"ParaStyleName"_ustr)); }
