diff options
author | László Németh <nemeth@numbertext.org> | 2019-04-26 17:24:38 +0200 |
---|---|---|
committer | László Németh <nemeth@numbertext.org> | 2019-04-29 12:14:54 +0200 |
commit | d32d9a2b3c5e3963f4a18f6c7bbf50fab2e9b2be (patch) | |
tree | 4cc080c654867aaa654965e339bd52ed6f0e9c95 /writerfilter | |
parent | c3ca559841c857bf7b39f665433d71c89d220d0f (diff) |
tdf#123460 DOCX track changes: moveFrom completely
also with the paragraph mark, not leaving an empty
paragraph at the original place of the moved text.
Note: as desktop version of MSO does, but its
online version leaves empty paragraphs interestingly.
Change-Id: I03dda8997df3efbc82e936bd31a3813323e6b5ab
Reviewed-on: https://gerrit.libreoffice.org/71382
Reviewed-by: László Németh <nemeth@numbertext.org>
Tested-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 17 | ||||
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.hxx | 4 |
2 files changed, 20 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 961a88872bff..d3daa6f9f908 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1690,6 +1690,11 @@ void DomainMapper_Impl::appendTextPortion( const OUString& rString, const Proper } } + // reset moveFrom data of non-terminating runs of the paragraph + if ( m_pParaMarkerRedlineMoveFrom.get( ) ) + { + m_pParaMarkerRedlineMoveFrom.clear(); + } CheckRedline( xTextRange ); m_bParaChanged = true; @@ -2063,6 +2068,8 @@ void DomainMapper_Impl::CreateRedline(uno::Reference<text::XTextRange> const& xR sType = getPropertyName( PROP_INSERT ); break; case XML_moveFrom: + m_pParaMarkerRedlineMoveFrom = pRedline.get(); + [[fallthrough]]; case XML_del: sType = getPropertyName( PROP_DELETE ); break; @@ -2101,6 +2108,16 @@ void DomainMapper_Impl::CheckParaMarkerRedline( uno::Reference< text::XTextRange m_currentRedline.clear(); } } + else if ( m_pParaMarkerRedlineMoveFrom.get( ) ) + { + // terminating moveFrom redline removes also the paragraph mark + m_pParaMarkerRedlineMoveFrom->m_nToken = XML_del; + CreateRedline( xRange, m_pParaMarkerRedlineMoveFrom ); + } + if ( m_pParaMarkerRedlineMoveFrom.get( ) ) + { + m_pParaMarkerRedlineMoveFrom.clear(); + } } void DomainMapper_Impl::CheckRedline( uno::Reference< text::XTextRange > const& xRange ) diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx index aabc939cbcff..793631530d66 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@ -505,6 +505,8 @@ private: RedlineParamsPtr m_currentRedline; RedlineParamsPtr m_pParaMarkerRedline; bool m_bIsParaMarkerChange; + // redline data of the terminating run, if it's a moveFrom deletion + RedlineParamsPtr m_pParaMarkerRedlineMoveFrom; /// If the current paragraph has any runs. bool m_bParaChanged; @@ -575,7 +577,7 @@ public: } void SetDocumentSettingsProperty( const OUString& rPropName, const css::uno::Any& rValue ); - static void CreateRedline(css::uno::Reference<css::text::XTextRange> const& xRange, const RedlineParamsPtr& pRedline); + void CreateRedline(css::uno::Reference<css::text::XTextRange> const& xRange, const RedlineParamsPtr& pRedline); void CheckParaMarkerRedline(css::uno::Reference<css::text::XTextRange> const& xRange); |