diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2013-12-24 08:05:58 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-12-28 10:37:48 +0100 |
| commit | efba557c24db07557a29b86ffb3188a20c0dc6f3 (patch) | |
| tree | 15fab859d95efdbd05d127c02589f1cd9e4daf05 /writerfilter/source | |
| parent | 709a197d930bf1f585834a8573f952e9030f3383 (diff) | |
DOCX import: close rPrChange properly.
Call endtrackchanges when rPrChange ends so the
corresponding redline will be removed.
(cherry picked from commit 75e7d6f12e914b63e66968890533b2a56d0b1a7e)
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Reviewed on:
https://gerrit.libreoffice.org/7195
Change-Id: I4091d7b54e0a74f3158cc979f210577a2dc29783
Diffstat (limited to 'writerfilter/source')
| -rw-r--r-- | writerfilter/source/ooxml/model.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index 2e0a300ec0e6..1cf434ccccd9 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -22126,6 +22126,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"/> |