sw/qa/extras/ooxmlexport/ooxmlexport4.cxx | 15 --------------- sw/source/filter/ww8/docxattributeoutput.cxx | 8 ++++---- 2 files changed, 4 insertions(+), 19 deletions(-)
New commits: commit 6fabd7435e407e0c9329ca836666a703b49e2f4e Author: Noel Grandin <[email protected]> AuthorDate: Tue Jan 6 20:03:52 2026 +0200 Commit: Xisco Fauli <[email protected]> CommitDate: Wed Jan 7 10:34:16 2026 +0100 officeotron: w:del in wrong order under the w:rPr element, w:del needs to come before w:lang Change-Id: I0bf6ddc554c44ef978b62565d5be664af406a693 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196624 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> (cherry picked from commit 40a68f926079cbe3082cacdabffac4846f342139) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196657 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx index 00cefa910c2d..c5aeb4d1342d 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx @@ -106,9 +106,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTrackChangesDeletedParagraphMark) { createSwDoc("testTrackChangesDeletedParagraphMark.docx"); - //FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:pPr/w:rPr/w:del"); @@ -118,9 +115,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTrackChangesInsertedParagraphMark) { createSwDoc("testTrackChangesInsertedParagraphMark.docx"); - //FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:pPr/w:rPr/w:ins"); @@ -146,9 +140,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTrackChangesDeletedTableCell) { createSwDoc("testTrackChangesDeletedTableCell.docx"); - //FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[3]/w:tc/w:tcPr/w:cellDel"); @@ -158,9 +149,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTrackChangesInsertedTableCell) { createSwDoc("testTrackChangesInsertedTableCell.docx"); - //FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[3]/w:tc/w:tcPr/w:cellIns"); @@ -185,9 +173,6 @@ CPPUNIT_TEST_FIXTURE(Test, testFDO73034) { createSwDoc("FDO73034.docx"); - //FIXME: validation error in OOXML export: Errors: 1 - skipValidation(); - save(TestFilter::DOCX); xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); CPPUNIT_ASSERT(getXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:pPr/w:rPr/w:u", "val").match("single")); diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 33f009f9a60d..511336cc4f86 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -3366,6 +3366,10 @@ void DocxAttributeOutput::InitCollectedRunProperties() // Write the elements in the spec order static const sal_Int32 aOrder[] = { + FSNS( XML_w, XML_del ), + FSNS( XML_w, XML_ins ), + FSNS( XML_w, XML_moveFrom ), + FSNS( XML_w, XML_moveTo ), FSNS( XML_w, XML_rStyle ), FSNS( XML_w, XML_rFonts ), FSNS( XML_w, XML_b ), @@ -3406,10 +3410,6 @@ void DocxAttributeOutput::InitCollectedRunProperties() FSNS( XML_w, XML_specVanish ), FSNS( XML_w, XML_oMath ), FSNS( XML_w, XML_rPrChange ), - FSNS( XML_w, XML_del ), - FSNS( XML_w, XML_ins ), - FSNS( XML_w, XML_moveFrom ), - FSNS( XML_w, XML_moveTo ), FSNS( XML_w14, XML_glow ), FSNS( XML_w14, XML_shadow ), FSNS( XML_w14, XML_reflection ),
