distro-configs/Jenkins/macosx_clang_dbgutil | 1 distro-configs/Jenkins/windows_msc_dbgutil_32 | 1 distro-configs/Jenkins/windows_msc_dbgutil_64 | 1 oox/source/export/vmlexport.cxx | 13 ++++++++-- sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 3 -- sw/qa/extras/ooxmlexport/ooxmlexport10.cxx | 21 ---------------- sw/qa/extras/ooxmlexport/ooxmlexport11.cxx | 21 ---------------- sw/qa/extras/ooxmlexport/ooxmlexport12.cxx | 18 -------------- sw/qa/extras/ooxmlexport/ooxmlexport13.cxx | 18 -------------- sw/qa/extras/ooxmlexport/ooxmlexport14.cxx | 18 -------------- sw/qa/extras/ooxmlexport/ooxmlexport15.cxx | 24 ------------------ sw/qa/extras/ooxmlexport/ooxmlexport16.cxx | 33 -------------------------- sw/qa/extras/ooxmlexport/ooxmlexport17.cxx | 8 ------ sw/qa/extras/ooxmlexport/ooxmlexport18.cxx | 12 --------- sw/qa/extras/ooxmlexport/ooxmlexport2.cxx | 3 -- sw/qa/extras/ooxmlexport/ooxmlexport20.cxx | 33 -------------------------- sw/qa/extras/ooxmlexport/ooxmlexport21.cxx | 15 ----------- sw/qa/extras/ooxmlexport/ooxmlexport23.cxx | 9 ------- sw/qa/extras/ooxmlexport/ooxmlexport24.cxx | 9 ------- sw/qa/extras/ooxmlexport/ooxmlexport25.cxx | 5 --- sw/qa/extras/ooxmlexport/ooxmlexport26.cxx | 12 --------- sw/qa/extras/ooxmlexport/ooxmlexport4.cxx | 15 ----------- sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 6 ---- sw/qa/extras/ooxmlexport/ooxmlexport7.cxx | 4 --- sw/qa/extras/ooxmlexport/ooxmlexport8.cxx | 3 -- 25 files changed, 14 insertions(+), 292 deletions(-)
New commits: commit 9c7700455bf9004b70e741614b0347c819c47b8d Author: Noel Grandin <[email protected]> AuthorDate: Mon Jan 12 21:02:56 2026 +0200 Commit: Xisco Fauli <[email protected]> CommitDate: Wed Jan 14 10:03:40 2026 +0100 officeotron says that o:spt needs to be numeric Change-Id: I9d2f995d7cdc2feae547b61e60f75ed608277386 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197137 Reviewed-by: Michael Stahl <[email protected]> Tested-by: Jenkins (cherry picked from commit ad70c58224084f8f390cd01713f8fd03962680d0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197218 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx index 5800219fa47a..0613426e6fe5 100644 --- a/oox/source/export/vmlexport.cxx +++ b/oox/source/export/vmlexport.cxx @@ -1260,12 +1260,21 @@ sal_uInt32 VMLExport::GenerateShapeId() OString VMLExport::GetVMLShapeTypeDefinition( std::string_view sShapeID, const bool bIsPictureFrame ) { + // officeotron says that o:spt needs to be numeric + sal_Int32 nSptId = 0; + std::string_view sRest; + if (o3tl::starts_with(sShapeID, "ole_rId", &sRest)) + nSptId = o3tl::toInt32(sRest); + else + nSptId = o3tl::toInt32(sShapeID); + SAL_WARN_IF(nSptId == 0, "oox", "o:spt needs to be numeric, but we have " << sShapeID); + assert(nSptId != 0); OString sShapeType; if ( !bIsPictureFrame ) // We don't have a shape definition for host control in presetShapeDefinitions.xml // So use a definition copied from DOCX file created with MSO sShapeType = OString::Concat("<v:shapetype id=\"_x0000_t") + sShapeID + - "\" coordsize=\"21600,21600\" o:spt=\"" + sShapeID + + "\" coordsize=\"21600,21600\" o:spt=\"" + OString::number(nSptId) + "\" path=\"m,l,21600l21600,21600l21600,xe\"> " "<v:stroke joinstyle=\"miter\"/> " "<v:path shadowok=\"f\" o:extrusionok=\"f\" strokeok=\"f\" fillok=\"f\" o:connecttype=\"rect\"/> " @@ -1275,7 +1284,7 @@ OString VMLExport::GetVMLShapeTypeDefinition( // We don't have a shape definition for picture frame in presetShapeDefinitions.xml // So use a definition copied from DOCX file created with MSO sShapeType = OString::Concat("<v:shapetype id=\"_x0000_t") + sShapeID + - "\" coordsize=\"21600,21600\" o:spt=\"" + sShapeID + + "\" coordsize=\"21600,21600\" o:spt=\"" + OString::number(nSptId) + "\" o:preferrelative=\"t\" path=\"m@4@5l@4@11@9@11@9@5xe\" filled=\"f\" stroked=\"f\"> " "<v:stroke joinstyle=\"miter\"/> " "<v:formulas> " diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 019ba34c476b..bdcf851d157d 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -44,9 +44,6 @@ CPPUNIT_TEST_FIXTURE(Test, testfdo81381) { createSwDoc("fdo81381.docx"); - // FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:r[1]/w:object[1]/o:OLEObject[1]", "DrawAspect", u"Icon"); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx index 51532b3cb6d8..6238bfd89e69 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx @@ -45,9 +45,6 @@ public: DECLARE_OOXMLEXPORT_TEST(testWPGtextboxes, "testWPGtextboxes.docx") { - // FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - CPPUNIT_ASSERT_EQUAL(2, getShapes()); auto MyShape = getShape(1); @@ -169,9 +166,6 @@ CPPUNIT_TEST_FIXTURE(Test, testFloattableNestedCellStartDOCXExport) DECLARE_OOXMLEXPORT_TEST(testWpgOnly, "wpg-only.docx") { - // FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - uno::Reference<drawing::XShape> xShape = getShape(1); // Check position, it was nearly 0. This is a shape, so use getPosition(), not a property. CPPUNIT_ASSERT_EQUAL(oox::drawingml::convertEmuToHmm(548005), xShape->getPosition().X); @@ -679,9 +673,6 @@ DECLARE_OOXMLEXPORT_TEST(testLargeTwips, "large-twips.docx" ) DECLARE_OOXMLEXPORT_TEST(testNegativeCellMarginTwips, "negative-cell-margin-twips.docx") { - // FIXME: validation error in OOXML export: Errors: 4 - skipValidation(); - // Slightly related to cp#1000043, the twips value was negative, which wrapped around somewhere, // while MSO seems to ignore that as well. xmlDocUniquePtr pXmlDoc = parseLayoutDump(); @@ -691,9 +682,6 @@ DECLARE_OOXMLEXPORT_TEST(testNegativeCellMarginTwips, "negative-cell-margin-twip DECLARE_OOXMLEXPORT_TEST(testFdo38414, "fdo38414.docx") { - // FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - // The cells in the last (4th) column were merged properly and so the result didn't have the same height. // (Since w:gridBefore is worked around by faking another cell in the row, so column count is thus 5 // instead of 4, therefore compare height of cells 4 and 5 rather than 3 and 4.) @@ -761,9 +749,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf134606) { createSwDoc("tdf134606.docx"); - // FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - save(TestFilter::DOCX); // The problem was that the importer lost the nested table structure with w:gridBefore xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); @@ -795,9 +780,6 @@ DECLARE_OOXMLEXPORT_TEST(testChartSize, "chart-size.docx") DECLARE_OOXMLEXPORT_TEST(testInlineGroupshape, "inline-groupshape.docx") { - // FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - // Inline groupshape was in the background, so it was hidden sometimes by other shapes. CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(getShape(1), u"Opaque"_ustr)); } @@ -827,9 +809,6 @@ DECLARE_OOXMLEXPORT_TEST(testCaption, "caption.docx") DECLARE_OOXMLEXPORT_TEST(testGroupshapeTrackedchanges, "groupshape-trackedchanges.docx") { - // FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - uno::Reference<drawing::XShapes> xGroup(getShape(1), uno::UNO_QUERY); uno::Reference<drawing::XShape> xShape(xGroup->getByIndex(0), uno::UNO_QUERY); // Shape text was completely missing, ensure inserted text is available. diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx index 4f23f1127db9..869fdb02eca1 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx @@ -89,9 +89,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf116436_rowFill) { createSwDoc("tdf116436_rowFill.odt"); - // FIXME: validation error in OOXML export: Errors: 8 - skipValidation(); - saveAndReload(TestFilter::DOCX); CPPUNIT_ASSERT_EQUAL(1, getPages()); uno::Reference<text::XTextTablesSupplier> xTextTablesSupplier(mxComponent, uno::UNO_QUERY); @@ -363,9 +360,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf117988, "tdf117988.docx") DECLARE_OOXMLEXPORT_TEST(testTdf94801, "tdf94801.docx") { - // FIXME: validation error in OOXML export: Errors: 81 - skipValidation(); - // This was a 2-page document with unwanted line breaking in table cells, because // the table was narrower, than defined (< 1/100 mm loss during twip to 1/100 mm conversion) CPPUNIT_ASSERT_EQUAL(1, getPages()); @@ -539,9 +533,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf114703, "tdf114703.docx") DECLARE_OOXMLEXPORT_TEST(testTdf113258, "tdf113258.docx") { - // FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - uno::Reference<text::XTextRange> xShape(getShape(1), uno::UNO_QUERY); // This was 494, i.e. automatic spacing resulted in non-zero paragraph top // margin for the first paragraph in a shape. @@ -551,9 +542,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf113258, "tdf113258.docx") DECLARE_OOXMLEXPORT_TEST(testTdf113258_noBeforeAutospacing, "tdf113258_noBeforeAutospacing.docx") { - // FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - uno::Reference<text::XTextRange> xShape(getShape(1), uno::UNO_QUERY); // This was 0, i.e. disabled automatic spacing still resulted in zero paragraph // top margin for the first paragraph in a shape. @@ -618,9 +606,6 @@ CPPUNIT_TEST_FIXTURE(Test, testPageBreak_after) { createSwDoc("pageBreak_after.odt"); - // FIXME: validation error in OOXML export: Errors: 4 - skipValidation(); - saveAndReload(TestFilter::DOCX); // The problem was that the page breakAfter put the empty page BEFORE the table xmlDocUniquePtr pDump = parseLayoutDump(); @@ -790,9 +775,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf116801, "tdf116801.docx") DECLARE_OOXMLEXPORT_TEST(testTdf107969, "tdf107969.docx") { - // FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - // A VML object in a footnote's tracked changes caused write past end of document.xml at export to docx. // After that, importing after export failed with // SAXParseException: '[word/document.xml line 2]: Extra content at the end of the document', Stream 'word/document.xml'. @@ -805,9 +787,6 @@ DECLARE_OOXMLEXPORT_TEST(testOpenDocumentAsReadOnly, "open-as-read-only.docx") DECLARE_OOXMLEXPORT_TEST(testNoDefault, "noDefault.docx") { - // FIXME: validation error in OOXML export: Errors: 7 - skipValidation(); - uno::Reference<text::XTextTablesSupplier> xTextTablesSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<container::XIndexAccess> xTables(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY); uno::Reference<text::XTextTable> xTable(xTables->getByIndex(0), uno::UNO_QUERY); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx index e9a9ca2cacfe..9d6490d1e118 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx @@ -730,9 +730,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTd112202) createSwDoc("090716_Studentische_Arbeit_VWS.docx"); verify(); - // FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - saveAndReload(TestFilter::DOCX); verify(/*bIsExport*/ true); } @@ -997,9 +994,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf99631) { createSwDoc("tdf99631.docx"); - // FIXME: validation error in OOXML export: Errors: 4 - skipValidation(); - save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); @@ -1029,9 +1023,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf122563) { createSwDoc("tdf122563.docx"); - // FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); @@ -1064,9 +1055,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf94628) DECLARE_OOXMLEXPORT_TEST(testTdf122594, "tdf122594.docx") { - // FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - // test import/export of ActiveTable (visible sheet) of embedded XLSX OLE objects uno::Reference<text::XTextEmbeddedObjectsSupplier> xEmbeddedObjectsSupplier(mxComponent, uno::UNO_QUERY); @@ -1374,9 +1362,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf157011) // check tracked table column insertions and deletions with empty cells createSwDoc("tdf157011_ins_del_empty_cols.docx"); - // FIXME: validation error in OOXML export: Errors: 11 - skipValidation(); - save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); @@ -1492,9 +1477,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf149708) { createSwDoc("tdf149708.docx"); - // FIXME: validation error in OOXML export: Errors: 14 - skipValidation(); - save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); // keep tracked insertion of a list item diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx index 6b61b86c6bfa..bf8776fc6c41 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx @@ -57,9 +57,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf125778_lostPageBreakTOX, "tdf125778_lostPageBrea DECLARE_OOXMLEXPORT_TEST(testTdf126994_lostPageBreak, "tdf126994_lostPageBreak.docx") { - // FIXME: validation error in OOXML export: Errors: 3 - skipValidation(); - CPPUNIT_ASSERT_EQUAL_MESSAGE( "Number of Pages", 3, getPages() ); } @@ -175,9 +172,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf121659_loseColumnBrNextToShape) DECLARE_OOXMLEXPORT_TEST(testTdf95848, "tdf95848.docx") { - // FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - OUString listId; OUString listStyle; { @@ -704,9 +698,6 @@ CPPUNIT_TEST_FIXTURE(Test, testFrameSizeExport) DECLARE_OOXMLEXPORT_TEST(testTdf119201, "tdf119201.docx") { - // FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - // Visibility of shapes wasn't imported/exported, for now base printable property on that, too auto xShape(getShape(1)); CPPUNIT_ASSERT_MESSAGE("First shape should be visible.", getProperty<bool>(xShape, u"Visible"_ustr)); @@ -848,9 +839,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf123460) createSwDoc("tdf123460.docx"); verify(); - // FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - saveAndReload(TestFilter::DOCX); verify(/*bIsExport*/ true); } @@ -859,9 +847,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf146140) { createSwDoc("tdf123460.docx"); - // FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - save(TestFilter::DOCX); CPPUNIT_ASSERT_EQUAL(1, getPages()); xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); @@ -1390,9 +1375,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf128304) { createSwDoc("tdf128304.odt"); - // FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - saveAndReload(TestFilter::DOCX); CPPUNIT_ASSERT_EQUAL(4, getShapes()); CPPUNIT_ASSERT_EQUAL(1, getPages()); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx index 3e6431b89a12..c98890de9841 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx @@ -85,9 +85,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf135595_HFtableWrap) { createSwDoc("tdf135595_HFtableWrap.odt"); - // FIXME: validation error in OOXML export: Errors: 5 - skipValidation(); - saveAndReload(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseLayoutDump(); sal_Int32 nRowHeight = getXPath(pXmlDoc, "//page[1]/header/tab/row/infos/bounds", "height").toInt32(); @@ -110,9 +107,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf135595_HFtableWrap) DECLARE_OOXMLEXPORT_TEST(testTdf135943_shapeWithText_L0c15, "tdf135943_shapeWithText_LayoutInCell0_compat15.docx") { - // FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - // With compat15, layoutinCell ought to be ignored/forced to true. // HOWEVER, currently only the shape is correctly placed, while its text is un-synced separately. // So to prevent this ugly mess, just leave everything together in the historical (wrong) spot. @@ -135,9 +129,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf135943_shapeWithText_L0c15, DECLARE_OOXMLEXPORT_TEST(testTdf135595_HFtableWrap_c12, "tdf135595_HFtableWrap_c12.docx") { - // FIXME: validation error in OOXML export: Errors: 10 - skipValidation(); - xmlDocUniquePtr pXmlDoc = parseLayoutDump(); // tdf#104596: ignore wrap exception apparently does not apply if it is not "layout in table cell". // Should be only one page. Row height should be two lines at 722, not wrapped to three lines at 998. @@ -205,9 +196,6 @@ CPPUNIT_TEST_FIXTURE(Test, Tdf133065) { createSwDoc("tdf133065.odt"); - // FIXME: validation error in OOXML export: Errors: 14 - skipValidation(); - save(TestFilter::DOCX); CPPUNIT_ASSERT_EQUAL(7, getShapes()); CPPUNIT_ASSERT_EQUAL(3, getPages()); @@ -599,9 +587,6 @@ CPPUNIT_TEST_FIXTURE(Test, Tdf133035) { createSwDoc("tdf133035.docx"); - // FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - save(TestFilter::DOCX); auto pxml = parseExport(u"word/document.xml"_ustr); CPPUNIT_ASSERT(pxml); @@ -691,9 +676,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf129522_removeShadowStyle) DECLARE_OOXMLEXPORT_TEST(testTdf130167_spilloverHeaderShape, "testTdf130167_spilloverHeader.docx") { - // FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - uno::Reference<text::XTextGraphicObjectsSupplier> xTextGraphicObjectsSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<container::XIndexAccess> xNameAccess( xTextGraphicObjectsSupplier->getGraphicObjects(), uno::UNO_QUERY); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx index 1db5d94ef6af..aa92610d3f92 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx @@ -41,9 +41,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf131540) { createSwDoc("tdf131540.odt"); - //FIXME: validation error in OOXML export: Errors: 4 - skipValidation(); - saveAndReload(TestFilter::DOCX); CPPUNIT_ASSERT_EQUAL(2, getShapes()); CPPUNIT_ASSERT_EQUAL(1, getPages()); @@ -837,9 +834,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf135655) { createSwDoc("tdf135655.odt"); - //FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - save(TestFilter::DOCX); const xmlDocUniquePtr pExpDoc = parseExport(u"word/document.xml"_ustr); const OUString sXFillColVal = getXPath(pExpDoc, "/w:document/w:body/w:p/w:r/w:object/v:shape", "fillcolor"); @@ -947,9 +941,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf138345_numberingHighlight) DECLARE_OOXMLEXPORT_TEST(testTdf134063, "tdf134063.docx") { - //FIXME: validation error in OOXML export: Errors: 8 - skipValidation(); - CPPUNIT_ASSERT_EQUAL(2, getPages()); xmlDocUniquePtr pDump = parseLayoutDump(); @@ -962,9 +953,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf134063, "tdf134063.docx") DECLARE_OOXMLEXPORT_TEST(TestTdf135653, "tdf135653.docx") { - //FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - uno::Reference<beans::XPropertySet> xOLEProps(getShape(1), uno::UNO_QUERY_THROW); drawing::FillStyle nFillStyle = static_cast<drawing::FillStyle>(-1); xOLEProps->getPropertyValue(u"FillStyle"_ustr) >>= nFillStyle; @@ -982,9 +970,6 @@ DECLARE_OOXMLEXPORT_TEST(TestTdf135653, "tdf135653.docx") DECLARE_OOXMLEXPORT_TEST(testTdf135665, "tdf135665.docx") { - //FIXME: validation error in OOXML export: Errors: 4 - skipValidation(); - uno::Reference<beans::XPropertySet> xOLEProps1(getShape(1), uno::UNO_QUERY_THROW); uno::Reference<beans::XPropertySet> xOLEProps2(getShape(2), uno::UNO_QUERY_THROW); bool bSurroundContour1 = false; @@ -1060,9 +1045,6 @@ CPPUNIT_TEST_FIXTURE(Test, testRelativeAnchorHeightFromBottomMarginHasFooter) DECLARE_OOXMLEXPORT_TEST(TestTdf132483, "tdf132483.docx") { - //FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - uno::Reference<beans::XPropertySet> xOLEProps(getShape(1), uno::UNO_QUERY_THROW); sal_Int16 nVRelPos = -1; sal_Int16 nHRelPos = -1; @@ -1111,9 +1093,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf135667) { createSwDoc("tdf135667.odt"); - //FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - save(TestFilter::DOCX); xmlDocUniquePtr pXmlDocument = parseExport(u"word/document.xml"_ustr); @@ -1156,9 +1135,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf137295) DECLARE_OOXMLEXPORT_TEST(testTdf135660, "tdf135660.docx") { - //FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - CPPUNIT_ASSERT_EQUAL(1, getShapes()); const uno::Reference<drawing::XShape> xShape = getShape(1); const uno::Reference<beans::XPropertySet> xOLEProps(xShape, uno::UNO_QUERY_THROW); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx index 3e5169d4588c..4de1842e917c 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx @@ -115,9 +115,6 @@ CPPUNIT_TEST_FIXTURE(Test, testFrameWrapTextMode) { createSwDoc("tdf143432_Frame_WrapTextMode.odt"); - //FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - save(TestFilter::DOCX); CPPUNIT_ASSERT_EQUAL(2, getShapes()); CPPUNIT_ASSERT_EQUAL(1, getPages()); @@ -151,9 +148,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf134219ContourWrap_glow_rotate) // actual 4177; top: expected 1522 actual 2457; bottom: expected 1296, actual 4179 verify(); - //FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - saveAndReload(TestFilter::DOCX); verify(); } @@ -220,9 +214,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf151384Hyperlink, "151384Hyperlink.odt") DECLARE_OOXMLEXPORT_TEST(testTdf66039, "tdf66039.docx") { - //FIXME: validation error in OOXML export: Errors: 4 - skipValidation(); - // This bugdoc has a groupshape (WPG) with a table inside its each member shape. // Before there was no table after import at all. From now, there must be 2 tables. uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY); @@ -497,9 +488,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf148671) DECLARE_OOXMLEXPORT_TEST(testTdf140668, "tdf140668.docx") { - //FIXME: validation error in OOXML export: Errors: 3 - skipValidation(); - // Don't crash when document is opened CPPUNIT_ASSERT_EQUAL(1, getPages()); } @@ -512,18 +500,12 @@ DECLARE_OOXMLEXPORT_TEST(testTdf149649, "tdf149649.docx") DECLARE_OOXMLEXPORT_TEST(testTdf138771, "tdf138771.docx") { - //FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - // Don't crash when document is imported CPPUNIT_ASSERT_EQUAL(1, getPages()); } DECLARE_OOXMLEXPORT_TEST(testTdf168017, "tdf168017.docx") { - //FIXME: validation error in OOXML export: Errors: 20 - skipValidation(); - // Don't crash when document is imported } @@ -537,9 +519,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf134619_numberingProps) { createSwDoc("tdf134619_numberingProps.doc"); - //FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - saveAndReload(TestFilter::DOCX); // Get the third paragraph's numbering style's 1st level's bullet size uno::Reference<text::XTextRange> xParagraph = getParagraph(3); @@ -728,9 +707,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf139580) { createSwDoc("tdf139580.odt"); - //FIXME: validation error in OOXML export: Errors: 21 - skipValidation(); - saveAndReload(TestFilter::DOCX); // Without the fix in place, this test would have crashed at export time CPPUNIT_ASSERT_EQUAL(2, getShapes()); @@ -891,9 +867,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf153874, "image_through_shape.docx") DECLARE_OOXMLEXPORT_TEST(testTextBoxZOrder, "testTextBoxZOrder.docx") { - //FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - // Collect the z-order values of the textboxes std::vector<sal_uInt64> ShapeZorders; std::vector<sal_uInt64> FrameZorders; @@ -1139,9 +1112,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf152153) { createSwDoc("embedded_images.odt"); - //FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - saveAndReload(TestFilter::DOCX); uno::Reference<packages::zip::XZipFileAccess2> xNameAccess @@ -1164,9 +1134,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf152152) { createSwDoc("artistic_effects.docx"); - //FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - saveAndReload(TestFilter::DOCX); uno::Reference<packages::zip::XZipFileAccess2> xNameAccess diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx index ca5f5d35c0fe..28ed1b321bad 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx @@ -216,9 +216,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf135906) DECLARE_OOXMLEXPORT_TEST(testTdf146802, "tdf146802.docx") { - // FIXME: validation error in OOXML export: Errors: 7 - skipValidation(); - // There is a group shape with text box inside having an embedded VML formula, // check if something missing. CPPUNIT_ASSERT_EQUAL_MESSAGE("Where is the formula?", 2, getShapes()); @@ -1059,9 +1056,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf147978enhancedPathABVW) DECLARE_OOXMLEXPORT_TEST(testTdf148132, "tdf148132.docx") { - // FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - { uno::Reference<text::XTextRange> xParagraph = getParagraph(1); auto xLevels = getProperty< uno::Reference<container::XIndexAccess> >(xParagraph, u"NumberingRules"_ustr); @@ -1091,8 +1085,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf148132, "tdf148132.docx") DECLARE_OOXMLEXPORT_TEST(testTdf154481, "tdf154481.docx") { - // FIXME: validation error in OOXML export: Errors: 16 - skipValidation(); CPPUNIT_ASSERT_EQUAL_MESSAGE("Missing pages!", 7, getPages()); } diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx index 415000327e77..bce66556cbef 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx @@ -123,9 +123,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf147646, "tdf147646_mergedCellNumbering.docx") DECLARE_OOXMLEXPORT_TEST(testTdf153526_commentInNumbering, "tdf153526_commentInNumbering.docx") { - //FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - // an exception was prematurely ending finishParagraph, losing numbering and CRs // so before the patch, this was 6. CPPUNIT_ASSERT_EQUAL(13, getParagraphs()); @@ -170,9 +167,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf154478) { createSwDoc("tdf154478.docx"); - //FIXME: validation error in OOXML export: Errors: 4 - skipValidation(); - save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/comments.xml"_ustr); @@ -777,9 +771,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf126477) { createSwDoc("embedded_chart.odt"); - //FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - saveAndReload(TestFilter::DOCX); uno::Reference<text::XTextEmbeddedObjectsSupplier> xTEOSupplier(mxComponent, uno::UNO_QUERY); @@ -863,9 +854,6 @@ CPPUNIT_TEST_FIXTURE(Test, testExportingUnknownStyleInRedline) // This must not fail assertions createSwDoc("UnknownStyleInRedline.docx"); - //FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - saveAndReload(TestFilter::DOCX); // Check that the original unknown style name "UnknownStyle" is roundtripped // (maybe this is wrong, because Word does not do this). diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx index b9cb46325755..3dab83d08831 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx @@ -527,9 +527,6 @@ CPPUNIT_TEST_FIXTURE(Test, testFdo51550) { createSwDoc("fdo51550.odt"); - // FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - saveAndReload(TestFilter::DOCX); CPPUNIT_ASSERT_EQUAL(1, getShapes()); CPPUNIT_ASSERT_EQUAL(1, getPages()); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport20.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport20.cxx index 7e326d7151a6..f77f9aa65a4e 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport20.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport20.cxx @@ -37,9 +37,6 @@ CPPUNIT_TEST_FIXTURE(Test, testfdo79969_xlsb) { createSwDoc("fdo79969_xlsb.docx"); - //FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - save(TestFilter::DOCX); // This UT for DOCX embedded with binary excel work sheet. xmlDocUniquePtr pXmlDoc = parseExport(u"[Content_Types].xml"_ustr); @@ -179,9 +176,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf138612) { createSwDoc("tdf138612.docx"); - //FIXME: validation error in OOXML export: Errors: 6 - skipValidation(); - save(TestFilter::DOCX); xmlDocUniquePtr pXmlDocument = parseExport(u"word/document.xml"_ustr); @@ -350,9 +344,6 @@ CPPUNIT_TEST_FIXTURE(Test, testfdo79969_xlsm) { createSwDoc("fdo79969_xlsm.docx"); - //FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - save(TestFilter::DOCX); // This UT for DOCX embedded with excel work sheet. xmlDocUniquePtr pXmlDoc = parseExport(u"[Content_Types].xml"_ustr); @@ -377,9 +368,6 @@ CPPUNIT_TEST_FIXTURE(Test, testfdo80522) { createSwDoc("fdo80522.docx"); - //FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - saveAndReload(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"[Content_Types].xml"_ustr); @@ -403,9 +391,6 @@ CPPUNIT_TEST_FIXTURE(Test, testfdo80523_pptm) { createSwDoc("fdo80523_pptm.docx"); - //FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - saveAndReload(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"[Content_Types].xml"_ustr); @@ -429,9 +414,6 @@ CPPUNIT_TEST_FIXTURE(Test, testfdo80523_sldm) { createSwDoc("fdo80523_sldm.docx"); - //FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - saveAndReload(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"[Content_Types].xml"_ustr); @@ -455,9 +437,6 @@ CPPUNIT_TEST_FIXTURE(Test, testfdo80898) { createSwDoc("fdo80898.docx"); - //FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - save(TestFilter::DOCX); // This UT for DOCX embedded with binary excel work sheet. xmlDocUniquePtr pXmlDoc = parseExport(u"[Content_Types].xml"_ustr); @@ -481,9 +460,6 @@ CPPUNIT_TEST_FIXTURE(Test, testOleIconDrawAspect) { createSwDoc("tdf131537.odt"); - //FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r/w:object/o:OLEObject", "DrawAspect", @@ -590,9 +566,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf148035) { createSwDoc("tdf148035.docx"); - //FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); @@ -613,9 +586,6 @@ CPPUNIT_TEST_FIXTURE(Test, testfdo83048) { createSwDoc("fdo83048.docx"); - //FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - save(TestFilter::DOCX); // Issue was wrong SDT properties were getting exported for Date SDT xmlDocUniquePtr pXmlDoc = parseExport(u"word/footer2.xml"_ustr); @@ -857,9 +827,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf146491) { createSwDoc("tdf146491.odt"); - //FIXME: validation error in OOXML export: Errors: 93 - skipValidation(); - saveAndReload(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); // This was 12 - a page style was unnecessarily created for every section. diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx index 1c0f9240d9da..c3a894f8ce72 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx @@ -69,9 +69,6 @@ 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)); @@ -566,9 +563,6 @@ 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) @@ -689,9 +683,6 @@ 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 @@ -928,9 +919,6 @@ 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(); @@ -1287,9 +1275,6 @@ 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()); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport23.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport23.cxx index e7b725f8a88c..8846486c58e8 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport23.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport23.cxx @@ -136,9 +136,6 @@ 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); @@ -400,9 +397,6 @@ 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); @@ -815,9 +809,6 @@ 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()); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport24.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport24.cxx index 82aa7a352080..271c98396d19 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport24.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport24.cxx @@ -262,9 +262,6 @@ 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); } @@ -288,9 +285,6 @@ 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); @@ -479,9 +473,6 @@ 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( diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport25.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport25.cxx index 94a07d25bd91..8b47bd172393 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport25.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport25.cxx @@ -163,9 +163,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf169413_asciiTheme) // the document failed to reload without errors after a round-trip createSwDoc("tdf169413_asciiTheme.docx"); - // FIXME: validation error in OOXML export: Errors: 5 - skipValidation(); - saveAndReload(TestFilter::DOCX); } @@ -233,8 +230,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf167082) createSwDoc("tdf167082.docx"); - // FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); saveAndReload(TestFilter::DOCX); OUString aStyleName = getProperty<OUString>(getParagraph(3), u"ParaStyleName"_ustr); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport26.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport26.cxx index 861b0a43cc7f..ee0014db29fd 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport26.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport26.cxx @@ -26,9 +26,6 @@ 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 @@ -151,9 +148,6 @@ 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 @@ -388,9 +382,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf81100) createSwDoc("tdf81100.docx"); verify(); - //FIXME: validation error in OOXML export: Errors: 6 - skipValidation(); - saveAndReload(TestFilter::DOCX); verify(/*bIsExport*/ true); @@ -526,9 +517,6 @@ 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); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx index ea570064eb17..a442f1736cd5 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx @@ -545,9 +545,6 @@ CPPUNIT_TEST_FIXTURE(Test, testEmbeddedXlsx) createSwDoc("embedded-xlsx.docx"); verify(); - //FIXME: validation error in OOXML export: Errors: 4 - skipValidation(); - saveAndReload(TestFilter::DOCX); verify(); @@ -609,9 +606,6 @@ CPPUNIT_TEST_FIXTURE(Test, testOleObject) { createSwDoc("test_ole_object.docx"); - //FIXME: validation error in OOXML export: Errors: 3 - skipValidation(); - save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); @@ -954,9 +948,6 @@ CPPUNIT_TEST_FIXTURE(Test, testOLEObjectinHeader) { createSwDoc("2129393649.docx"); - //FIXME: validation error in OOXML export: Errors: 22 - skipValidation(); - save(TestFilter::DOCX); // fdo#76015 : Document contains oleobject in header xml. // Problem was relationship entry for oleobject from header was @@ -1053,9 +1044,6 @@ CPPUNIT_TEST_FIXTURE(Test, testContentTypeDOCX) { createSwDoc("fdo80410.docx"); - //FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"[Content_Types].xml"_ustr); @@ -1155,9 +1143,6 @@ CPPUNIT_TEST_FIXTURE(Test, testEmbeddedExcelChart) { createSwDoc("EmbeddedExcelChart.docx"); - //FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"[Content_Types].xml"_ustr); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx index 88442c16e091..af333c2118e9 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx @@ -480,9 +480,6 @@ CPPUNIT_TEST_FIXTURE(Test, testContentTypeOLE) { createSwDoc("fdo77759.docx"); - //FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"[Content_Types].xml"_ustr); @@ -756,9 +753,6 @@ CPPUNIT_TEST_FIXTURE(Test, testfdo79968_sldx) { createSwDoc("fdo79968.docx"); - //FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - save(TestFilter::DOCX); // This UT for DOCX embedded with powerpoint slide xmlDocUniquePtr pXmlDoc = parseExport(u"[Content_Types].xml"_ustr); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx index 936c07ef350f..1e1057be6661 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx @@ -687,7 +687,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf126533_axialAngle2, "tdf126533_axialAngle2.docx" { //FIXME: validation error in OOXML export: Errors: 1 skipValidation(); - // axial gradient is purple foreground/lime background in the middle (top-right to bottom-left) uno::Reference<beans::XPropertySet> xPageStyle(getStyles(u"PageStyles"_ustr)->getByName(u"Standard"_ustr), uno::UNO_QUERY); @@ -941,9 +940,6 @@ CPPUNIT_TEST_FIXTURE(Test, testCommentInitials) DECLARE_OOXMLEXPORT_TEST(testTextboxRoundedCorners, "textbox-rounded-corners.docx") { - //FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - uno::Reference<drawing::XShape> xShape = getShape(1); comphelper::SequenceAsHashMap aCustomShapeGeometry(getProperty< uno::Sequence<beans::PropertyValue> >(xShape, u"CustomShapeGeometry"_ustr)); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx index 12fcb07b6388..43366a25a5de 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx @@ -414,9 +414,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf66496, "tdf66496.docx") DECLARE_OOXMLEXPORT_TEST(testTDF91122, "tdf91122.docx") { - //FIXME: validation error in OOXML export: Errors: 2 - skipValidation(); - /* * OLE object shape: default vertical position is top in MSO, not bottom */ commit 00546dbbfb0935ac4641a712d28c64565da9f1c6 Author: Xisco Fauli <[email protected]> AuthorDate: Tue Jan 13 15:30:00 2026 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Wed Jan 14 10:03:26 2026 +0100 turn off export validation on Windows/Mac bots The build time doubled in both platforms since the validation started to validate docx files by default Change-Id: Id71c603d7116d9523b8a29f29acdf0961916648e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197198 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Jenkins (cherry picked from commit c064cf11693a8998cc4b090e48cf84b31dc42266) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197241 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/distro-configs/Jenkins/macosx_clang_dbgutil b/distro-configs/Jenkins/macosx_clang_dbgutil index ebb715a75960..d052037bef03 100644 --- a/distro-configs/Jenkins/macosx_clang_dbgutil +++ b/distro-configs/Jenkins/macosx_clang_dbgutil @@ -4,3 +4,4 @@ --enable-optimized --enable-odk --disable-online-update +--without-export-validation diff --git a/distro-configs/Jenkins/windows_msc_dbgutil_32 b/distro-configs/Jenkins/windows_msc_dbgutil_32 index b7827644df9f..6213c993a0a3 100644 --- a/distro-configs/Jenkins/windows_msc_dbgutil_32 +++ b/distro-configs/Jenkins/windows_msc_dbgutil_32 @@ -3,3 +3,4 @@ --disable-dependency-tracking --enable-odk --disable-online-update +--without-export-validation diff --git a/distro-configs/Jenkins/windows_msc_dbgutil_64 b/distro-configs/Jenkins/windows_msc_dbgutil_64 index 464cab64092e..a102fc1e17a8 100644 --- a/distro-configs/Jenkins/windows_msc_dbgutil_64 +++ b/distro-configs/Jenkins/windows_msc_dbgutil_64 @@ -2,3 +2,4 @@ INCLUDE:Jenkins/windows_wsl_common --host=x86_64-pc-cygwin --enable-dbgutil --disable-dependency-tracking +--without-export-validation
