sw/source/filter/ww8/docxattributeoutput.cxx | 4 ++++ 1 file changed, 4 insertions(+)
New commits: commit dcf6f8729f2764d038e0dc929b37b4da0668965f Author: Noel Grandin <[email protected]> AuthorDate: Fri Oct 31 14:37:37 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Mon Nov 3 17:14:12 2025 +0100 mso-test: fix ordering of w:rFonts element when writing footer When loading and then saving the document from ooo94120-1.doc, the w:rFonts element is in the wrong order under the w:rPr element. Use our existing mechanism to enforce correct ordering. Change-Id: If6aa30ee3114e292456710449dbd0c675dd4c950 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193323 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Miklos Vajna <[email protected]> (cherry picked from commit 5b105939807b8d5016aec65a173283134301cbc2) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193350 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 16d212b47ff8..9a8910d504de 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -6691,8 +6691,12 @@ void DocxAttributeOutput::WriteOutliner(const OutlinerParaObject& rParaObj) // Write run properties. m_pSerializer->startElementNS(XML_w, XML_rPr); + // mark() before paragraph mark properties child elements. + InitCollectedRunProperties(); aAttrIter.OutAttr(nCurrentPos); WriteCollectedRunProperties(); + // mergeTopMarks() after paragraph mark properties child elements. + m_pSerializer->mergeTopMarks(Tag_InitCollectedRunProperties); m_pSerializer->endElementNS(XML_w, XML_rPr); bool bTextAtr = aAttrIter.IsTextAttr( nCurrentPos );
