From a5d5aa022c2ae04e1d230050a773b3983a410cde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolnai=20Tam=C3=A1s?= <tamas.zolnai@collabora.com>
Date: Tue, 24 Dec 2013 08:05:58 +0100
Subject: [PATCH 086/109] DOCX import: close rPrChange properly.

Call endtrackchanges when rPrChange ends so the
corresponding redline will be removed.

Conflicts:
	sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Reviewed on:
	https://gerrit.libreoffice.org/7194

Change-Id: I4091d7b54e0a74f3158cc979f210577a2dc29783
---
 sw/qa/extras/inc/swmodeltestbase.hxx                |   6 ++++++
 sw/qa/extras/ooxmlimport/data/rprchange_closed.docx | Bin 0 -> 24695 bytes
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx            |   9 +++++++++
 writerfilter/source/ooxml/model.xml                 |   3 +++
 4 files changed, 18 insertions(+)
 create mode 100644 sw/qa/extras/ooxmlimport/data/rprchange_closed.docx

diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx
index a9b2368..727580d 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -166,6 +166,12 @@ protected:
         return data;
     }
 
+    bool hasProperty(const uno::Reference<uno::XInterface>& obj, const OUString& name) const
+    {
+        uno::Reference<beans::XPropertySet> properties(obj, uno::UNO_QUERY_THROW);
+        return properties->getPropertySetInfo()->hasPropertyByName(name);
+    }
+
     /// Get number of paragraphs of the document.
     int getParagraphs()
     {
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 4fad4ba..d368dab 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -22077,6 +22077,9 @@
     </resource>
     <resource name="CT_RPrChange" resource="Properties" tag="character">
       <element name="rPr" tokenid="ooxml:CT_RPrChange_rPr"/>
+      <action name="end" action="tokenproperty"/>
+      <action name="end" action="propagateCharacterPropertiesAsSet" sendtokenid="ooxml:endtrackchange"/>
+      <action name="end" action="clearProps"/>
     </resource>
     <resource name="CT_ParaRPrChange" resource="Properties" tag="character">
       <element name="rPr" tokenid="ooxml:CT_ParaRPrChange_rPr"/>
-- 
1.8.4.2