oox/source/export/drawingml.cxx | 8 ++++---- sd/source/filter/eppt/pptx-animations.cxx | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-)
New commits: commit 2fa6ff886dd846c59d3287c4827adef42ed6f59c Author: Michael Meeks <[email protected]> AuthorDate: Fri Oct 3 17:58:59 2025 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Mon Oct 6 10:27:22 2025 +0200 pptx export: re-order attributes to better match MSO. This helps to minimize the diff. Change-Id: I8a16932725094ca047350503f65c673fa85f8398 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191939 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 85aa932240f6..00e44b50e843 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -2695,14 +2695,14 @@ void DrawingML::WriteRunProperties( const Reference< XPropertySet >& rRun, bool } mpFS->startElementNS( XML_a, nElement, - XML_b, bold, - XML_i, italic, XML_lang, sax_fastparser::UseIf(usLanguage, !usLanguage.isEmpty()), XML_sz, OString::number(nSize), - // For Condensed character spacing spc value is negative. + XML_b, bold, + XML_i, italic, + XML_u, underline, + // For Condensed character spacing spc value is negative. XML_spc, sax_fastparser::UseIf(OString::number(nCharKerning), nCharKerning != 0), XML_strike, strikeout, - XML_u, underline, XML_baseline, sax_fastparser::UseIf(OString::number(nCharEscapement*1000), nCharEscapement != 0), XML_cap, cap ); diff --git a/sd/source/filter/eppt/pptx-animations.cxx b/sd/source/filter/eppt/pptx-animations.cxx index dbe264019c75..0abbbd8f8ffa 100644 --- a/sd/source/filter/eppt/pptx-animations.cxx +++ b/sd/source/filter/eppt/pptx-animations.cxx @@ -917,13 +917,13 @@ void PPTXAnimationExport::WriteAnimationNodeCommonPropsStart() if (fRepeatCount != 0) sRepeatCount = OString::number(static_cast<sal_Int32>(fRepeatCount * 1000.0)); - mpFS->startElementNS( - XML_p, XML_cTn, XML_id, OString::number(GetNextAnimationNodeId(rXNode)), XML_dur, sDuration, - XML_autoRev, sax_fastparser::UseIf("1", bAutoReverse), XML_restart, pRestart, XML_nodeType, - pNodeType, XML_fill, pFill, XML_presetClass, pPresetClass, XML_presetID, - sax_fastparser::UseIf(OString::number(nPresetId), bPresetId), XML_presetSubtype, - sax_fastparser::UseIf(OString::number(nPresetSubType), bPresetSubType), XML_repeatCount, - sRepeatCount); + mpFS->startElementNS(XML_p, XML_cTn, XML_id, OString::number(GetNextAnimationNodeId(rXNode)), + XML_dur, sDuration, XML_restart, pRestart, XML_presetID, + sax_fastparser::UseIf(OString::number(nPresetId), bPresetId), + XML_presetClass, pPresetClass, XML_fill, pFill, XML_nodeType, pNodeType, + XML_autoRev, sax_fastparser::UseIf("1", bAutoReverse), XML_presetSubtype, + sax_fastparser::UseIf(OString::number(nPresetSubType), bPresetSubType), + XML_repeatCount, sRepeatCount); WriteAnimationCondList(mpContext->getBeginCondList(), XML_stCondLst); WriteAnimationCondList(mpContext->getEndCondList(), XML_endCondLst);
