diff options
| author | László Németh <nemeth@numbertext.org> | 2019-07-23 11:51:58 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2019-07-23 17:57:10 +0200 |
| commit | 5ab9cbe7f8d0c0bfd6a2fe1de2e14dfe201d008b (patch) | |
| tree | 3976316fb3fe4a31a9872ee4cc1dc880044a0237 /writerfilter | |
| parent | ff706aa45cc41fb71b31a8c648b08cf3f1669c7e (diff) | |
tdf#126516 DOCX change tracking: fix paragraph style rejection
by keeping paragraph-level ParagraphFormat redlines.
(regression from commit a5abe0fc4d435d3a7a7de8bf55ec74087fdd299a
"tdf#125546 DOCX import: fix overgrowth of change tracking entries")
Change-Id: I1357a9e082f990c8a7d1d1aa6f93a06c3dfee5a8
Reviewed-on: https://gerrit.libreoffice.org/76154
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index f566f6d4aa4a..632eb860e146 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -2148,13 +2148,13 @@ void DomainMapper_Impl::CheckRedline( uno::Reference< text::XTextRange > const& bool bUsedRange = m_aRedlines.top().size() > 0 || (GetTopContextOfType(CONTEXT_CHARACTER) && GetTopContextOfType(CONTEXT_CHARACTER)->Redlines().size() > 0); - // only export ParagraphFormat, when there is no other redline in the same text portion to avoid missing redline compression - if( !bUsedRange && GetTopContextOfType(CONTEXT_PARAGRAPH) ) + // only export ParagraphFormat, when there is no other redline in the same text portion to avoid missing redline compression, + // but always export the first ParagraphFormat redline in a paragraph to keep the paragraph style change data for rejection + if( (!bUsedRange || !m_bParaChanged) && GetTopContextOfType(CONTEXT_PARAGRAPH) ) { std::vector<RedlineParamsPtr>& avRedLines = GetTopContextOfType(CONTEXT_PARAGRAPH)->Redlines(); for( const auto& rRedline : avRedLines ) CreateRedline( xRange, rRedline ); - return; } if( GetTopContextOfType(CONTEXT_CHARACTER) ) { |