oox/source/export/drawingml.cxx | 3 ++- oox/source/export/shapes.cxx | 9 ++++----- sw/source/filter/ww8/docxattributeoutput.cxx | 4 ++++ 3 files changed, 10 insertions(+), 6 deletions(-)
New commits: commit d4d753f93a031791bfb9cd9ea5dfaba4bfdff7f4 Author: Michael Meeks <[email protected]> AuthorDate: Mon Oct 6 20:41:56 2025 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Wed Nov 5 09:36:01 2025 +0100 oox: blurRad defaults to 0 in its users: outerShdw, innerShdw, and reflection Change-Id: I681a238398b82ac85eeb2c32f09d501488394706 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192013 Reviewed-by: Michael Meeks <[email protected]> Tested-by: Jenkins (cherry picked from commit 995e669b87a79aebdade412b5a01f237f8758f5a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193420 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index b5bc60c6a9d3..56513d465e57 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -5779,7 +5779,8 @@ void DrawingML::WriteShapeEffect( std::u16string_view sName, const Sequence< Pro { sal_Int64 nVal = 0; rOuterShdwProp.Value >>= nVal; - aOuterShdwAttrList->add( XML_blurRad, OString::number( nVal ) ); + if (nVal != 0) + aOuterShdwAttrList->add( XML_blurRad, OString::number( nVal ) ); } else if( rOuterShdwProp.Name == "dir" ) { commit d2cc2fea378d01eedf278278cdeb19754d3be4fa Author: Michael Meeks <[email protected]> AuthorDate: Mon Oct 6 20:50:39 2025 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Wed Nov 5 09:35:55 2025 +0100 oox: don't write empty cNvPr descriptions to reduce diff noise. Change-Id: I360dc8eb9dbfb618fff03c96d9447db21b5ddafe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191997 Reviewed-by: Mike Kaganski <[email protected]> Tested-by: Jenkins (cherry picked from commit daba89f6b6d53c10fbd380b3608fc80f25de1bc0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193419 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index febfbcaa9430..fb285eeb6a13 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -1425,9 +1425,8 @@ void ShapeExport::WriteGraphicObjectShapePart( const Reference< XShape >& xShape presentation::ClickAction eClickAction = presentation::ClickAction_NONE; OUString sDescr, sURL, sBookmark, sPPAction; - bool bHaveDesc; - if ( ( bHaveDesc = GetProperty( xShapeProps, u"Description"_ustr ) ) ) + if ( GetProperty( xShapeProps, u"Description"_ustr ) ) mAny >>= sDescr; if ( GetProperty( xShapeProps, u"URL"_ustr ) ) mAny >>= sURL; @@ -1437,9 +1436,9 @@ void ShapeExport::WriteGraphicObjectShapePart( const Reference< XShape >& xShape mAny >>= eClickAction; pFS->startElementNS( mnXmlNamespace, XML_cNvPr, - XML_id, OString::number(GetNewShapeID(xShape)), - XML_name, GetShapeName(xShape), - XML_descr, sax_fastparser::UseIf(sDescr, bHaveDesc)); + XML_id, OString::number(GetNewShapeID(xShape)), + XML_name, GetShapeName(xShape), + XML_descr, sax_fastparser::UseIf(sDescr, !sDescr.isEmpty())); if (eClickAction != presentation::ClickAction_NONE) { commit d42d448c3a5702b989f6c6dbdae6b90c6f7524f0 Author: Noel Grandin <[email protected]> AuthorDate: Fri Oct 31 14:37:37 2025 +0200 Commit: Xisco Fauli <[email protected]> CommitDate: Wed Nov 5 09:35:48 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]> (cherry picked from commit dcf6f8729f2764d038e0dc929b37b4da0668965f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193366 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 8008b94bfd0d..88cde2665198 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -6700,8 +6700,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 );
