From d160bca0dcb80f1b517b79221d5c3a43bbad8639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20N=C3=A9meth?= Date: Mon, 3 Jun 2019 17:26:16 +0200 Subject: [PATCH] tdf#70234 DOCX: import tracked deletion of fields MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Deleted fields in tracked changes, for example page number fields, imported as not deleted text fields. Change-Id: Id35c3ad7d293039fc8a2d0b564572dc459a25d0f Reviewed-on: https://gerrit.libreoffice.org/73397 Tested-by: Jenkins Reviewed-by: László Németh --- sw/qa/extras/ooxmlexport/data/tdf70234.docx | Bin 0 -> 12301 bytes sw/qa/extras/ooxmlexport/ooxmlexport11.cxx | 7 +++++++ .../source/dmapper/DomainMapper_Impl.cxx | 1 + 3 files changed, 8 insertions(+) create mode 100644 sw/qa/extras/ooxmlexport/data/tdf70234.docx diff --git a/sw/qa/extras/ooxmlexport/data/tdf70234.docx b/sw/qa/extras/ooxmlexport/data/tdf70234.docx new file mode 100644 index 0000000000000000000000000000000000000000..33ef99430bda40b4c379cada14792bc174717d8d GIT binary patch literal 12301 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 xTablesSupplier(mxComponent, uno::UNO_QUERY); diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index eb852bf943d4..f03ee6f8271b 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -5195,6 +5195,7 @@ void DomainMapper_Impl::PopFieldContext() aMap.InsertProps(m_pLastCharacterContext); aMap.InsertProps(m_aFieldStack.top()->getProperties()); appendTextContent(xToInsert, aMap.GetPropertyValues()); + CheckRedline( xToInsert->getAnchor( ) ); } else {