writerfilter/source/dmapper/DomainMapper.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
New commits: commit 663bcc96fcb129b73d3be02cde27a3d2bc613471 Author: Jan-Marek Glogowski <[email protected]> AuthorDate: Thu Feb 20 20:20:47 2020 +0100 Commit: Xisco Faulí <[email protected]> CommitDate: Mon Feb 24 11:19:32 2020 +0100 tdf#130814 preserve context before page breaks ... and add a comment, so nobody tries to move these again. Change-Id: I79e6f7a1538d0839fd525870439facef3218ec65 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89239 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <[email protected]> (cherry picked from commit 70a9c644c63248719f1f4248e288df7ee06635cc) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89142 Reviewed-by: Xisco Faulí <[email protected]> diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 61136bd30a56..361b576966fe 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -3173,6 +3173,8 @@ void DomainMapper::lcl_text(const sal_uInt8 * data_, size_t len) } } + // GetTopContext() is changed by inserted breaks, but we want to keep the current context + PropertyMapPtr pContext = m_pImpl->GetTopContext(); if (!m_pImpl->GetFootnoteContext()) { if (m_pImpl->isBreakDeferred(PAGE_BREAK)) @@ -3182,7 +3184,6 @@ void DomainMapper::lcl_text(const sal_uInt8 * data_, size_t len) m_pImpl->clearDeferredBreaks(); } - PropertyMapPtr pContext = m_pImpl->GetTopContext(); if (pContext && pContext->GetFootnote().is() && m_pImpl->IsInCustomFootnote()) { pContext->GetFootnote()->setLabel(sText); @@ -3469,6 +3470,8 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, size_t len) } else { + // GetTopContext() is changed by inserted breaks, but we want to keep the current context + PropertyMapPtr pContext = m_pImpl->GetTopContext(); if (!m_pImpl->GetFootnoteContext()) { if (m_pImpl->isBreakDeferred(PAGE_BREAK)) @@ -3498,7 +3501,6 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, size_t len) m_pImpl->clearDeferredBreaks(); } - PropertyMapPtr pContext = m_pImpl->GetTopContext(); if (pContext && pContext->GetFootnote().is() && m_pImpl->IsInCustomFootnote()) { pContext->GetFootnote()->setLabel( sText ); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
