diff options
| author | László Németh <nemeth@numbertext.org> | 2018-07-19 12:08:31 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-07-20 12:58:51 +0200 |
| commit | 04b53321ca56844521787563914fad21513fd58d (patch) | |
| tree | fb95e721f813b849fdcb4a53877d0ab86d41d9f0 /writerfilter | |
| parent | a32d9ec1fa48296ffba713bc4593cad45a1c83ad (diff) | |
tdf#104797 DOCX change tracking: handle moveFrom and moveTo
data as deletion and insertion instead of importing them
as normal (unmodified) texts (messing up document content
and losing change tracking information).
Change-Id: I9c0a7da83f3e8235d65d47afdb99ffe188f52704
Reviewed-on: https://gerrit.libreoffice.org/57723
Reviewed-by: László Németh <nemeth@numbertext.org>
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-on: https://gerrit.libreoffice.org/57729
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 4 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index cbcce6bda2ef..9eab98638e99 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -3833,13 +3833,15 @@ void DomainMapper::HandleRedline( Sprm& rSprm ) case XML_mod: case XML_ins: case XML_del: + case XML_moveTo: + case XML_moveFrom: case XML_ParagraphFormat: case XML_tableRowInsert: case XML_tableRowDelete: case XML_tableCellInsert: case XML_tableCellDelete: break; - default: OSL_FAIL( "redline token other than mod, ins, del or table row" ); break; + default: OSL_FAIL( "redline token other than mod, ins, del, moveTo, moveFrom or table row" ); break; } m_pImpl->EndParaMarkerChange( ); m_pImpl->SetCurrentRedlineIsRead(); diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 8a9c038d8c2f..321866daf85a 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1860,9 +1860,11 @@ void DomainMapper_Impl::CreateRedline(uno::Reference<text::XTextRange> const& xR case XML_mod: sType = getPropertyName( PROP_FORMAT ); break; + case XML_moveTo: case XML_ins: sType = getPropertyName( PROP_INSERT ); break; + case XML_moveFrom: case XML_del: sType = getPropertyName( PROP_DELETE ); break; |