oox/qa/unit/export.cxx | 52 ---------------------------------------- oox/qa/unit/vml.cxx | 3 -- oox/source/export/vmlexport.cxx | 1 3 files changed, 56 deletions(-)
New commits: commit 53454bc2e197033c1b7ea3125e6cb834bbe4f06b Author: Xisco Fauli <[email protected]> AuthorDate: Tue Nov 25 10:04:49 2025 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Tue Nov 25 13:05:37 2025 +0100 related tdf#153183: drop all the other skipValidation Change-Id: Ie63fbe3d7f4f6ccab32ac6984c4a4b386c128a64 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194513 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> Code-Style: Xisco Fauli <[email protected]> diff --git a/oox/qa/unit/export.cxx b/oox/qa/unit/export.cxx index e420376f5f16..3fb8e911ef61 100644 --- a/oox/qa/unit/export.cxx +++ b/oox/qa/unit/export.cxx @@ -837,10 +837,6 @@ CPPUNIT_TEST_FIXTURE(Test, testFontworkFontProperties) // They differ in font properties e.g. font weight and character spacing. loadFromFile(u"tdf128568_FontworkFontProperties.odt"); - // FIXME: tdf#153183 validation error in OOXML export: Errors: 1 - // Attribute 'ID' is not allowed to appear in element 'v:shape'. - skipValidation(); - // Save to DOCX: save(TestFilter::DOCX); @@ -873,10 +869,6 @@ CPPUNIT_TEST_FIXTURE(Test, testVMLFontworkSlantUp) // and such is not understand by LibreOffice. loadFromFile(u"tdf153296_VML_export_SlantUp.odt"); - // FIXME: tdf#153183 validation error in OOXML export: Errors: 1 - // Attribute 'ID' is not allowed to appear in element 'v:shape'. - skipValidation(); - // Save to DOCX: save(TestFilter::DOCX); @@ -900,10 +892,6 @@ CPPUNIT_TEST_FIXTURE(Test, testVMLFontworkArchUp) // was not exported as VML Fontwork but as a rectangle. loadFromFile(u"tdf153296_VML_export_ArchUpCurve.odt"); - // FIXME: tdf#153183 validation error in OOXML export: Errors: 1 - // Attribute 'ID' is not allowed to appear in element 'v:shape'. - skipValidation(); - // Save to DOCX: save(TestFilter::DOCX); @@ -922,10 +910,6 @@ CPPUNIT_TEST_FIXTURE(Test, testVMLAdjustmentExport) // adjustment values were not exported at all. loadFromFile(u"tdf153246_VML_export_Fontwork_Adjustment.odt"); - // FIXME: tdf#153183 validation error in OOXML export: Errors: 1 - // Attribute 'ID' is not allowed to appear in element 'v:shape'. - skipValidation(); - // Save to DOCX: save(TestFilter::DOCX); @@ -950,10 +934,6 @@ CPPUNIT_TEST_FIXTURE(Test, testFontworkDirectColor) // and fill color was replaced with character color. loadFromFile(u"tdf51195_Fontwork_DirectColor.odt"); - // FIXME: tdf#153183 validation error in OOXML export: Errors: 1 - // Attribute 'ID' is not allowed to appear in element 'v:shape'. - skipValidation(); - // Save to DOCX: save(TestFilter::DOCX); @@ -985,10 +965,6 @@ CPPUNIT_TEST_FIXTURE(Test, testFontworkThemeColor) // exported as theme color at all, and it was replaced with character color. loadFromFile(u"tdf51195_Fontwork_ThemeColor.fodt"); - // FIXME: tdf#153183 validation error in OOXML export: Errors: 1 - // Attribute 'ID' is not allowed to appear in element 'v:shape'. - skipValidation(); - // Save to DOCX: save(TestFilter::DOCX); @@ -1033,10 +1009,6 @@ CPPUNIT_TEST_FIXTURE(Test, testFontworkDistance) // them. Make sure we force them to zero on export to docx, otherwise Word might wrap the text. loadFromFile(u"tdf51195_Fontwork_Distance.odt"); - // FIXME: tdf#153183 validation error in OOXML export: Errors: 1 - // Attribute 'ID' is not allowed to appear in element 'v:shape'. - skipValidation(); - // Save to DOCX: save(TestFilter::DOCX); @@ -1056,10 +1028,6 @@ CPPUNIT_TEST_FIXTURE(Test, testFontworkLinGradientRGBColor) // Without fix the gradient was not exported at all. loadFromFile(u"tdf51195_Fontwork_linearGradient.fodt"); - // FIXME: tdf#153183 validation error in OOXML export: Errors: 1 - // Attribute 'ID' is not allowed to appear in element 'v:shape'. - skipValidation(); - // Save to DOCX: save(TestFilter::DOCX); @@ -1103,10 +1071,6 @@ CPPUNIT_TEST_FIXTURE(Test, testFontworkAxialGradientTransparency) // Without fix the gradient was not exported at all. loadFromFile(u"tdf51195_Fontwork_axialGradient.fodt"); - // FIXME: tdf#153183 validation error in OOXML export: Errors: 1 - // Attribute 'ID' is not allowed to appear in element 'v:shape'. - skipValidation(); - // Save to DOCX: save(TestFilter::DOCX); @@ -1153,10 +1117,6 @@ CPPUNIT_TEST_FIXTURE(Test, testFontworkRadialGradient) // Without fix the gradient was not exported at all. loadFromFile(u"tdf51195_Fontwork_radialGradient.fodt"); - // FIXME: tdf#153183 validation error in OOXML export: Errors: 1 - // Attribute 'ID' is not allowed to appear in element 'v:shape'. - skipValidation(); - // Save to DOCX: save(TestFilter::DOCX); @@ -1195,10 +1155,6 @@ CPPUNIT_TEST_FIXTURE(Test, testFontworkEllipticalGradient) // Without fix the gradient was not exported at all. loadFromFile(u"tdf51195_Fontwork_ellipticalGradient.fodt"); - // FIXME: tdf#153183 validation error in OOXML export: Errors: 1 - // Attribute 'ID' is not allowed to appear in element 'v:shape'. - skipValidation(); - // Save to DOCX: save(TestFilter::DOCX); @@ -1239,10 +1195,6 @@ CPPUNIT_TEST_FIXTURE(Test, testFontworkSquareGradient) // Without fix the gradient was not exported at all. loadFromFile(u"tdf51195_Fontwork_squareGradient.fodt"); - // FIXME: tdf#153183 validation error in OOXML export: Errors: 1 - // Attribute 'ID' is not allowed to appear in element 'v:shape'. - skipValidation(); - // Save to DOCX: save(TestFilter::DOCX); @@ -1281,10 +1233,6 @@ CPPUNIT_TEST_FIXTURE(Test, testFontworkRectGradient) // Without fix the gradient was not exported at all. loadFromFile(u"tdf51195_Fontwork_rectGradient.fodt"); - // FIXME: tdf#153183 validation error in OOXML export: Errors: 1 - // Attribute 'ID' is not allowed to appear in element 'v:shape'. - skipValidation(); - // Save to DOCX: save(TestFilter::DOCX); diff --git a/oox/qa/unit/vml.cxx b/oox/qa/unit/vml.cxx index 2eecdd93fab2..c9aed769874d 100644 --- a/oox/qa/unit/vml.cxx +++ b/oox/qa/unit/vml.cxx @@ -209,9 +209,6 @@ CPPUNIT_TEST_FIXTURE(OoxVmlTest, testWriterFontworkTrimTrue) // had reduced the shape height. loadFromFile(u"tdf153260_VML_trim_export.odt"); - // FIXME: tdf#153183 validation error in OOXML export: Errors: 1 - // Attribute 'ID' is not allowed to appear in element 'v:shape'. - skipValidation(); saveAndReload(TestFilter::DOCX); uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(mxComponent, uno::UNO_QUERY); diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx index 01c3d578d1eb..3fe320726136 100644 --- a/oox/source/export/vmlexport.cxx +++ b/oox/source/export/vmlexport.cxx @@ -1074,7 +1074,6 @@ void VMLExport::Commit( EscherPropertyContainer& rProps, const tools::Rectangle& // note that XML_ID is different from XML_id (although it looks like a LO // implementation distinction without valid justification to me). - // FIXME: XML_ID produces invalid file, see tdf#153183 bAlreadyWritten[ESCHER_Prop_wzName] = true; } break;
