sw/qa/core/header_footer/HeaderFooterTest.cxx | 9 ++++++++- sw/qa/extras/ooxmlexport/ooxmlexport21.cxx | 21 ++++++++++++++++++++- sw/qa/extras/ooxmlexport/ooxmlexport23.cxx | 23 ++++++++++++++++++++++- sw/qa/extras/ooxmlexport/ooxmlexport24.cxx | 13 ++++++++++++- 4 files changed, 62 insertions(+), 4 deletions(-)
New commits: commit 4c5cfff60e22b0bfa162b54e9b66e07f220c02fb Author: Xisco Fauli <[email protected]> AuthorDate: Thu Nov 20 12:21:08 2025 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Thu Nov 20 20:20:37 2025 +0100 sw_ooxmlexport24: do not skip DOCX export validation Change-Id: I65c51f080b8e9e616c360a4fefe488a6045bfe7d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194263 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport24.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport24.cxx index dadd7ca40c85..82aa7a352080 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport24.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport24.cxx @@ -40,7 +40,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) { } }; @@ -261,6 +261,10 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf55427_footnote2endnote) }; createSwDoc("tdf55427_footnote2endnote.odt"); verify(); + + // FIXME: validation error in OOXML export: Errors: 6 + skipValidation(); + saveAndReload(TestFilter::DOCX); verify(/*bIsExport*/ true); } @@ -284,6 +288,9 @@ DECLARE_OOXMLEXPORT_TEST(testTdf104150, "tdf104150.docx") DECLARE_OOXMLEXPORT_TEST(testTdf103976, "tdf103976.docx") { + // FIXME: validation error in OOXML export: Errors: 8 + skipValidation(); + uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<container::XIndexAccess> xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY); @@ -471,6 +478,10 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf107684) CPPUNIT_TEST_FIXTURE(Test, testTdf107618) { createSwDoc("tdf107618.doc"); + + // FIXME: validation error in OOXML export: Errors: 2 + skipValidation(); + saveAndReload(TestFilter::DOCX); // This was false, header was lost on export. uno::Reference<beans::XPropertySet> xPageStyle( commit c456e3adf6351600c783ba9fb53fc870d7f6fd45 Author: Xisco Fauli <[email protected]> AuthorDate: Thu Nov 20 12:08:23 2025 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Thu Nov 20 20:20:33 2025 +0100 sw_ooxmlexport23: do not skip DOCX export validation Change-Id: Ie6a12eecf429ae80dff7b6e9d2349410ea8594f1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194262 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport23.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport23.cxx index b248a098a1fd..e7b725f8a88c 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport23.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport23.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) { } }; @@ -136,6 +136,9 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf128245) DECLARE_OOXMLEXPORT_TEST(testTdf124367, "tdf124367.docx") { + // FIXME: validation error in OOXML export: Errors: 5 + skipValidation(); + uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<container::XIndexAccess> xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY); @@ -270,6 +273,10 @@ DECLARE_OOXMLEXPORT_TEST(testTdf129353, "tdf129353.docx") CPPUNIT_TEST_FIXTURE(Test, testTdf77796) { createSwDoc("tdf77796.docx"); + + // FIXME: validation error in OOXML export: Errors: 1 + skipValidation(); + save(TestFilter::DOCX); xmlDocUniquePtr pXml = parseExport(u"word/document.xml"_ustr); CPPUNIT_ASSERT(pXml); @@ -326,6 +333,9 @@ DECLARE_OOXMLEXPORT_TEST(testTdf120394, "tdf120394.docx") DECLARE_OOXMLEXPORT_TEST(testTdf133605, "tdf133605.docx") { + // FIXME: validation error in OOXML export: Errors: 2 + skipValidation(); + CPPUNIT_ASSERT_EQUAL(1, getPages()); { uno::Reference<beans::XPropertySet> xPara(getParagraph(3), uno::UNO_QUERY); @@ -355,6 +365,9 @@ DECLARE_OOXMLEXPORT_TEST(testTdf133605, "tdf133605.docx") DECLARE_OOXMLEXPORT_TEST(testTdf133605_2, "tdf133605_2.docx") { + // FIXME: validation error in OOXML export: Errors: 2 + skipValidation(); + // About the same document as tdf133605.docx, but number definition has level definitions in random order CPPUNIT_ASSERT_EQUAL(1, getPages()); { @@ -386,6 +399,10 @@ DECLARE_OOXMLEXPORT_TEST(testTdf133605_2, "tdf133605_2.docx") CPPUNIT_TEST_FIXTURE(Test, testTdf123757) { createSwDoc("tdf123757.docx"); + + // FIXME: validation error in OOXML export: Errors: 1 + skipValidation(); + save(TestFilter::DOCX); xmlDocUniquePtr pXml = parseExport(u"word/document.xml"_ustr); CPPUNIT_ASSERT(pXml); @@ -797,6 +814,10 @@ CPPUNIT_TEST_FIXTURE(Test, testStrikeoutGroupShapeText) CPPUNIT_TEST_FIXTURE(Test, testTdf131539) { createSwDoc("tdf131539.odt"); + + // FIXME: validation error in OOXML export: Errors: 4 + skipValidation(); + save(TestFilter::DOCX); CPPUNIT_ASSERT_EQUAL(2, getShapes()); CPPUNIT_ASSERT_EQUAL(1, getPages()); commit 876bde611650826200971f68d2ec7556154fc616 Author: Xisco Fauli <[email protected]> AuthorDate: Thu Nov 20 11:23:33 2025 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Thu Nov 20 20:20:29 2025 +0100 sw_core_header_footer: do not skip DOCX export validation Change-Id: I0ce1e1058d1d155bac6709b500d116814ac1d036 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194260 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins diff --git a/sw/qa/core/header_footer/HeaderFooterTest.cxx b/sw/qa/core/header_footer/HeaderFooterTest.cxx index 0b2c23012d67..70253e9ddd59 100644 --- a/sw/qa/core/header_footer/HeaderFooterTest.cxx +++ b/sw/qa/core/header_footer/HeaderFooterTest.cxx @@ -43,7 +43,7 @@ public: void checkShapeInFirstPageHeader(); HeaderFooterTest() - : SwModelTestBase(u"/sw/qa/core/header_footer/data/"_ustr, /*bSkipValidation*/ true) + : SwModelTestBase(u"/sw/qa/core/header_footer/data/"_ustr) { } }; @@ -415,6 +415,9 @@ CPPUNIT_TEST_FIXTURE(HeaderFooterTest, testImageInFooter) CPPUNIT_ASSERT_EQUAL(2, getPages()); CPPUNIT_ASSERT_EQUAL(2, getShapes()); + // FIXME: validation error in OOXML export: Errors: 4 + skipValidation(); + saveAndReload(TestFilter::DOCX); CPPUNIT_ASSERT_EQUAL(2, getPages()); @@ -657,6 +660,10 @@ CPPUNIT_TEST_FIXTURE(HeaderFooterTest, testFirstPageFooterEnabled) }; createSwDoc("TestFirstFooterDisabled.docx"); verify(); + + // FIXME: validation error in OOXML export: Errors: 7 + skipValidation(); + saveAndReload(TestFilter::DOCX); verify(); } commit dedac12c802b126afb00be66f3ed8391549bc0bf Author: Xisco Fauli <[email protected]> AuthorDate: Thu Nov 20 11:11:41 2025 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Thu Nov 20 20:20:24 2025 +0100 sw_ooxmlexport21: do not skip DOCX export validation Change-Id: Ifce158a13c782c10b5e4462f049280658b9c66d3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194259 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx index 742a20c49573..1c0f9240d9da 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx @@ -37,7 +37,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) { } }; @@ -69,6 +69,9 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf161631) DECLARE_OOXMLEXPORT_TEST(testTdf158597, "tdf158597.docx") { + // FIXME: validation error in OOXML export: Errors: 8 + skipValidation(); + // test with 2 properties: font size, italic (toggle) { uno::Reference<text::XTextRange> xParagraph(getParagraph(1)); @@ -563,6 +566,9 @@ DECLARE_OOXMLEXPORT_TEST(testTdf160077_layoutInCell, "tdf160077_layoutInCell.doc DECLARE_OOXMLEXPORT_TEST(testTdf160077_layoutInCellB, "tdf160077_layoutInCellB.docx") { + // FIXME: validation error in OOXML export: Errors: 317 + skipValidation(); + // given an in-table, group-shape vertically aligned -1.35 cm (above) the top page margin // (which is actually forced to layoutInCell, so that turns into 1.35cm above the cell margin) @@ -683,6 +689,9 @@ DECLARE_OOXMLEXPORT_TEST(testTdf160077_layoutInCellD, "tdf160077_layoutInCellD.d DECLARE_OOXMLEXPORT_TEST(testTdf153909_followTextFlow, "tdf153909_followTextFlow.docx") { + // FIXME: validation error in OOXML export: Errors: 11 + skipValidation(); + // given a compat12 VML document with wrap-through blue rect that doesn't mention allowInCell // Although MSO's UI reports "layoutInCell" for the rectangle, it isn't specified or honored @@ -919,6 +928,9 @@ DECLARE_OOXMLEXPORT_TEST(testTdf131098_imageFill, "tdf131098_imageFill.docx") DECLARE_OOXMLEXPORT_TEST(testTdf154369, "tdf154369.docx") { + // FIXME: validation error in OOXML export: Errors: 2 + skipValidation(); + //Unit test for bug fix in tdf#154369 // Docx file contains ordered list formatted with Heading 1 style, font color set as Accent 1 from theme xmlDocUniquePtr pXmlDoc = parseLayoutDump(); @@ -1274,6 +1286,10 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf146269) CPPUNIT_TEST_FIXTURE(Test, testTdf164065) { createSwDoc("tdf164065.docx"); + + // FIXME: validation error in OOXML export: Errors: 4 + skipValidation(); + save(TestFilter::DOCX); CPPUNIT_ASSERT_EQUAL(1, getShapes()); @@ -1301,6 +1317,9 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf164474) CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount()); } + // FIXME: validation error in OOXML export: Errors: 2 + skipValidation(); + // Test also after save-and-reload: saveAndReload(TestFilter::DOCX); {
