From c37f2b927715ebbeffcc1d7a1e9d646f1611c4ec Mon Sep 17 00:00:00 2001 From: László Németh Date: Fri, 2 Oct 2020 12:55:04 +0200 Subject: tdf#136850 DOCX: fix change tracking in floating tables MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Deleted text still reappeared as normal text in floating tables in the case of combination with tracked paragraph property changes. Follow-up of commit 288db6eb47fbbd2b3ca34ffea0686d8ed8ed9be9 (tdf#132271 DOCX: import change tracking in floating tables) and commit 464a7b0631335a8f8729512b8c27f864747f56a7 (tdf#136667 DOCX import: fix crash of floating tables). Change-Id: I2c8f63054520ce28306c063ef638756f7d8342e9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103832 Tested-by: Jenkins Reviewed-by: László Németh --- writerfilter/source/dmapper/DomainMapper_Impl.cxx | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'writerfilter/source/dmapper') diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index cd985e4fd995..cd78ab36bd0a 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -6809,11 +6809,12 @@ void DomainMapper_Impl::ExecuteFrameConversion() { if( m_xFrameStartRange.is() && m_xFrameEndRange.is() && !m_bDiscardHeaderFooter ) { + std::vector redPos, redLen; try { uno::Reference< text::XTextAppendAndConvert > xTextAppendAndConvert( GetTopTextAppend(), uno::UNO_QUERY_THROW ); // convert redline ranges to cursor movement and character length - std::vector redPos, redLen; + for( size_t i = 0; i < aFramedRedlines.size(); i+=3) { uno::Reference< text::XTextRange > xRange; @@ -6863,7 +6864,20 @@ void DomainMapper_Impl::ExecuteFrameConversion() } m_bIsActualParagraphFramed = false; - aFramedRedlines.clear(); + + if (redPos.size() == aFramedRedlines.size()/3) + { + for( sal_Int32 i = aFramedRedlines.size() - 1; i >= 0; --i) + { + // keep redlines of floating tables to process them in CloseSectionGroup() + if ( redPos[i/3] != -1 ) + { + aFramedRedlines.erase(aFramedRedlines.begin() + i); + } + } + } + else + aFramedRedlines.clear(); } m_xFrameStartRange = nullptr; m_xFrameEndRange = nullptr; -- cgit v1.2.3