chart2/qa/extras/chart2export.cxx | 27 --------------------------- oox/qa/unit/export.cxx | 16 ---------------- 2 files changed, 43 deletions(-)
New commits: commit 16788014d5f1d033e556316d5809df5999af9c1e Author: Xisco Fauli <[email protected]> AuthorDate: Mon Nov 24 17:33:07 2025 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Tue Nov 25 09:57:04 2025 +0100 chart2_export: drop some skipValidation they are no longer needed Change-Id: I0e39de132b1623c5a044a5301cb9a38fdcf225ab Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194473 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> Code-Style: Xisco Fauli <[email protected]> diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index 4e8b149af20c..84cf592be6eb 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -495,9 +495,6 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testAreaChartLoad) { loadFromFile(u"docx/testAreaChartLoad.docx"); - // FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -601,9 +598,6 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testPieChartWallLineStyle) { loadFromFile(u"odt/testPieChartWallLineStyle.odt"); - // FIXME: validation error in OOXML export: Errors: 9 - skipValidation(); - save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -834,9 +828,6 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabelBordersDOCX) // Chart 2 has all its data labels with identical borders. verify(xChartDoc, 1); - // FIXME: validation error in OOXML export: Errors: 3 - skipValidation(); - saveAndReload(TestFilter::DOCX); xChartDoc.set(getChartDocFromWriter(0), uno::UNO_QUERY); @@ -852,9 +843,6 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabel3DChartDOCX) Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); - // FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -888,9 +876,6 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabelClusteredBarChartDOCX) Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); - // FIXME: validation error in OOXML export: Errors: 9 - skipValidation(); - save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -922,9 +907,6 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabelDoughnutChartDOCX) Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); - // FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -941,9 +923,6 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabelAreaChartDOCX) Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); - // FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -980,9 +959,6 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testIndividualDataLabelProps) { loadFromFile(u"xlsx/tdf122915.xlsx"); - // FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - save(TestFilter::XLSX); xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); @@ -1029,9 +1005,6 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testPieChartDataLabels) { loadFromFile(u"docx/PieChartDataLabels.docx"); - // FIXME: validation error in OOXML export: Errors: 19 - skipValidation(); - save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); commit f823d1bc50573e8debb7a1089755ad0070d4a415 Author: Xisco Fauli <[email protected]> AuthorDate: Mon Nov 24 22:19:57 2025 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Tue Nov 25 09:56:55 2025 +0100 oox_export: drop some skipValidation Change-Id: I62f04f374b0635af570e6b497b7bba099297f28e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194484 Code-Style: Xisco Fauli <[email protected]> Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> diff --git a/oox/qa/unit/export.cxx b/oox/qa/unit/export.cxx index ca8a8cff9f41..e420376f5f16 100644 --- a/oox/qa/unit/export.cxx +++ b/oox/qa/unit/export.cxx @@ -56,9 +56,6 @@ CPPUNIT_TEST_FIXTURE(Test, testRotatedShapePosition) // Given a document with a group shape and therein a rotated custom shape. loadFromFile(u"tdf141786_RotatedShapeInGroup.odt"); - // FIXME: validation error in OOXML export: Errors: 3 - skipValidation(); - // When saving that to DOCX: save(TestFilter::DOCX); @@ -130,9 +127,6 @@ CPPUNIT_TEST_FIXTURE(Test, testDmlGroupshapePolygon) // Given a document with a group shape, containing a single polygon child shape: loadFromFile(u"dml-groupshape-polygon.docx"); - // FIXME: validation error in OOXML export: Errors: 9 - skipValidation(); - // When saving that to DOCX: save(TestFilter::DOCX); @@ -151,9 +145,6 @@ CPPUNIT_TEST_FIXTURE(Test, testCustomShapeArrowExport) // Given a document with a few different kinds of arrow shapes in it: loadFromFile(u"tdf142602_CustomShapeArrows.odt"); - // FIXME: validation error in OOXML export: Errors: 11 - skipValidation(); - // When saving that to DOCX: save(TestFilter::DOCX); @@ -606,9 +597,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf109169_OctagonBevel) // but shading is generated in ctor of EnhancedCustomShape2d from the Type value. loadFromFile(u"tdf109169_OctagonBevel.odt"); - // FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - // Export to docx had not written a:fill or a:stroke attributes at all. save(TestFilter::DOCX); @@ -822,10 +810,6 @@ CPPUNIT_TEST_FIXTURE(Test, testFontworkBitmapFill) // The document has a Fontwork shape with bitmap fill. loadFromFile(u"tdf128568_FontworkBitmapFill.odt"); - // FIXME: validation error in OOXML export: Errors: 1 - // Attribute ID is not allowed in element v:shape - skipValidation(); - // Saving that to DOCX: save(TestFilter::DOCX);
