From 4a93b46e4652e73ed3460e4c66999d94e50db4b7 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Thu, 26 Apr 2018 12:03:12 +0200 Subject: tdf#117246 RTF import: don't loose page breaks inside nested groups Regression from e3f254ab8211fbab7541cde2100a35c875b0c240 (RTF import: fix spurious page breaks at doc end (related: rhbz#1065629), 2014-02-27), the problem was that now we update the parser state to remember the next section break should set the break type of the current section to "next page", but this state should be remembered once the RTF group ends ("}" character), otherwise \page will be represented with a continuous break, i.e. lost. Change-Id: I69a8413f45e17e11d6d676c7bfd13ca7560b4d43 Reviewed-on: https://gerrit.libreoffice.org/53498 Reviewed-by: Miklos Vajna Tested-by: Jenkins --- writerfilter/source/rtftok/rtfdocumentimpl.cxx | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'writerfilter') diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 371c16181d18..14eba29aa4a5 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -3332,6 +3332,15 @@ RTFError RTFDocumentImpl::popState() // don't do it again in the outer state later. m_aStates.top().nTableRowWidthAfter = 0; + if (m_nResetBreakOnSectBreak != RTF_invalid && !m_aStates.empty()) + { + // Section break type created for \page still has an effect in the + // outer state as well. + RTFValue::Pointer_t pType = aState.aSectionSprms.find(NS_ooxml::LN_EG_SectPrContents_type); + if (pType) + m_aStates.top().aSectionSprms.set(NS_ooxml::LN_EG_SectPrContents_type, pType); + } + return RTFError::OK; } -- cgit