From 70a9c644c63248719f1f4248e288df7ee06635cc Mon Sep 17 00:00:00 2001 From: Jan-Marek Glogowski Date: Thu, 20 Feb 2020 20:20:47 +0100 Subject: 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 --- writerfilter/source/dmapper/DomainMapper.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'writerfilter') diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index b4490712ccdd..0787b96fc1cd 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -3168,6 +3168,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)) @@ -3177,7 +3179,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); @@ -3464,6 +3465,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)) @@ -3493,7 +3496,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 ); -- cgit v1.2.3