writerfilter/source/dmapper/DomainMapper.cxx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
New commits: commit 387240968cd89e294be5a7a1bec533df464f0943 Author: Justin Luth <justin.l...@collabora.com> AuthorDate: Tue Feb 14 17:47:00 2023 -0500 Commit: Justin Luth <jl...@mail.com> CommitDate: Wed Feb 15 02:52:16 2023 +0000 writerfilter: don't clear breaks when IsInComments A few lines earlier we avoided applying deferred breaks when IsInComments (and shapes), so why would we avoid clearing all breaks only for shapes? That doesn't make sense. Rearranged the code slightly to put all related items together. Change-Id: Ifbe911624b8190813fe2a57362e4ad7ccf1e712e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147031 Tested-by: Justin Luth <jl...@mail.com> Reviewed-by: Justin Luth <jl...@mail.com> diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 62f2ad548e64..35dd9940a652 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -3494,9 +3494,9 @@ void DomainMapper::lcl_startParagraphGroup() if (m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH) != m_pImpl->GetTopContext()) m_pImpl->PushProperties(CONTEXT_PARAGRAPH); - if (m_pImpl->GetTopContext()) + if (!m_pImpl->IsInShape() && !m_pImpl->IsInComments()) { - if (!m_pImpl->IsInShape() && !m_pImpl->IsInComments()) + if (m_pImpl->GetTopContext()) { const OUString& sDefaultParaStyle = m_pImpl->GetDefaultParaStyleName(); m_pImpl->GetTopContext()->Insert( PROP_PARA_STYLE_NAME, uno::Any( sDefaultParaStyle ) ); @@ -3508,15 +3508,15 @@ void DomainMapper::lcl_startParagraphGroup() m_pImpl->GetTopContext()->Insert(PROP_BREAK_TYPE, uno::Any(style::BreakType_COLUMN_BEFORE)); mbWasShapeInPara = false; } - - if (m_pImpl->isParaSdtEndDeferred()) - m_pImpl->GetTopContext()->Insert(PROP_PARA_SDT_END_BEFORE, uno::Any(true), true, PARA_GRAB_BAG); + m_pImpl->clearDeferredBreaks(); } + + if (m_pImpl->isParaSdtEndDeferred() && m_pImpl->GetTopContext()) + m_pImpl->GetTopContext()->Insert(PROP_PARA_SDT_END_BEFORE, uno::Any(true), true, PARA_GRAB_BAG); + m_pImpl->setParaSdtEndDeferred(false); + m_pImpl->SetIsFirstRun(true); m_pImpl->SetIsOutsideAParagraph(false); - if (!m_pImpl->IsInShape()) - m_pImpl->clearDeferredBreaks(); - m_pImpl->setParaSdtEndDeferred(false); } void DomainMapper::lcl_endParagraphGroup()