sw/source/filter/ww8/docxattributeoutput.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit 0be47a574a5fb1b6b766c4d6d12118c30c1e5432 Author: Justin Luth <[email protected]> AuthorDate: Fri Feb 13 20:36:15 2026 -0500 Commit: Miklos Vajna <[email protected]> CommitDate: Fri Feb 20 09:30:16 2026 +0100 NFC tdf#170602 docx export: always use EndParaSdtBlock() No Functional Change intended This lays some groundwork for the subsequent patches in this bug report. It is a super minor change, but I want to de-clutter this patchset as much as possible. Use the function so that all closings of a grabbagged m_aParagraph follow the same code path. Change-Id: I5ea7e44650b6551a186224b730630ccdf4180700 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199642 Reviewed-by: Justin Luth <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Miklos Vajna <[email protected]> diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index fa98e73bad46..142b14965000 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -612,7 +612,7 @@ sal_Int32 DocxAttributeOutput::StartParagraph(const ww8::WW8TableNodeInfo::Point if (bEndParaSdt || (m_aParagraphSdt.m_bStartedSdt && m_bHadSectPr)) { // This is the common case: "close sdt before the current paragraph" was requested by the next paragraph. - m_aParagraphSdt.EndSdtBlock(m_pSerializer); + EndParaSdtBlock(); } m_bHadSectPr = false; @@ -1301,7 +1301,7 @@ void DocxAttributeOutput::EndParagraph( const ww8::WW8TableNodeInfoInner::Pointe const bool bOldStartedSdt = m_aParagraphSdt.m_bStartedSdt; m_rExport.SdrExporter().writeOnlyTextOfFrame(pFrame.get()); if (!bOldStartedSdt && m_aParagraphSdt.m_bStartedSdt) - m_aParagraphSdt.EndSdtBlock(m_pSerializer); + EndParaSdtBlock(); m_aFramePr.SetFrame(nullptr); }
