sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 3 -- sw/qa/extras/ooxmlexport/ooxmlexport2.cxx | 9 ------- sw/qa/extras/ooxmlexport/ooxmlexport3.cxx | 36 ------------------------------ sw/qa/extras/ooxmlexport/ooxmlexport4.cxx | 9 ------- 4 files changed, 57 deletions(-)
New commits: commit 9dbcbe39fba8f2eca03416114970eb65e9c5c2d7 Author: Noel Grandin <[email protected]> AuthorDate: Thu Jan 8 16:45:26 2026 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Sat Jan 10 14:21:33 2026 +0100 these tests pass validation now Change-Id: Iefbff01adfc975d3ad50ff65ab964beb44d4c8d7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196855 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Jenkins diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 4bc3eaa4d005..8e9b577f567e 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -573,9 +573,6 @@ DECLARE_OOXMLEXPORT_TEST(testAfterlines, "afterlines.docx") DECLARE_OOXMLEXPORT_TEST(testParagraphMark, "paragraph-mark.docx") { - // FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - // The problem was that we didn't handle the situation when an empty paragraph's marker had both a char style and some direct formatting. // This was 11. diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx index b9cb46325755..8ab476cf61fb 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx @@ -279,9 +279,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf158023Export) { createSwDoc("tdf158023_export.docx"); - // FIXME: validation error in OOXML export: Errors: 3 - skipValidation(); - saveAndReload(TestFilter::DOCX); CPPUNIT_ASSERT_EQUAL(u"left [ right ] left ( right ) left lbrace right rbrace"_ustr, getFormula(getRun(getParagraph(1), 1))); } @@ -614,9 +611,6 @@ DECLARE_OOXMLEXPORT_TEST(testTextFrameBorders, "textframe-borders.docx") DECLARE_OOXMLEXPORT_TEST(testTextframeGradient, "textframe-gradient.docx") { - // FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - CPPUNIT_ASSERT_EQUAL(2, getShapes()); uno::Reference<beans::XPropertySet> xFrame(getShape(1), uno::UNO_QUERY); @@ -741,9 +735,6 @@ DECLARE_OOXMLEXPORT_TEST(testPageBackground, "page-background.docx") DECLARE_OOXMLEXPORT_TEST(testFdo65265, "fdo65265.docx") { - // FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - // Redline (tracked changes) of text formatting were not exported uno::Reference<text::XTextRange> xParagraph1 = getParagraph(1); uno::Reference<text::XTextRange> xParagraph2 = getParagraph(2); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx index 8f0bbf5cb521..d8f9e6744236 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx @@ -246,9 +246,6 @@ 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); @@ -298,9 +295,6 @@ CPPUNIT_TEST_FIXTURE(Test, testCalendar2) createSwDoc("calendar2.docx"); verify(); - //FIXME: validation error in OOXML export: Errors: 7 - skipValidation(); - saveAndReload(TestFilter::DOCX); verify(); @@ -322,9 +316,6 @@ 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); @@ -344,9 +335,6 @@ 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); @@ -356,9 +344,6 @@ 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); @@ -378,9 +363,6 @@ 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. @@ -431,9 +413,6 @@ 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); @@ -608,9 +587,6 @@ 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; @@ -1049,9 +1025,6 @@ CPPUNIT_TEST_FIXTURE(Test, testGlossaryWithEmail) DECLARE_OOXMLEXPORT_TEST(testFdo71785, "fdo71785.docx") { - //FIXME: validation error in OOXML export: Errors: 6 - skipValidation(); - // crashtest } @@ -1059,9 +1032,6 @@ 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")); @@ -1181,9 +1151,6 @@ 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. @@ -1276,9 +1243,6 @@ 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. diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx index 65cdd96a54dd..252b169e6092 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx @@ -1079,9 +1079,6 @@ CPPUNIT_TEST_FIXTURE(Test, testContentTypeXLSM) { createSwDoc("fdo76098.docx"); - //FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"[Content_Types].xml"_ustr); @@ -1126,9 +1123,6 @@ CPPUNIT_TEST_FIXTURE(Test, testFDO78292) { createSwDoc("FDO78292.docx"); - //FIXME: validation error in OOXML export: Errors: 9 - skipValidation(); - save(TestFilter::DOCX); //text node is a leaf node, it should not have any children xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); @@ -1214,9 +1208,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf92521) DECLARE_OOXMLEXPORT_TEST(testTdf102466, "tdf102466.docx") { - //FIXME: validation error in OOXML export: Errors: 16 - skipValidation(); - // the problem was: file is truncated: the first page is missing. // More precisely, the table in the first page was clipped. {
