diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2014-10-01 13:09:36 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2014-10-03 13:26:38 +0200 |
| commit | b6969634082730e25f99e1e0d7b900cf57a25a0a (patch) | |
| tree | f77a47673d3f69a4e8855ce86589980a1709b1bb /writerfilter | |
| parent | 5ed973e0fa38b2752850c04659452aa1cf2479e4 (diff) | |
proper scoping for docx redline import (bnc#821804)
propagateCharacterPropertiesAsSet sends the properties only when ending
a text run (or maybe starting another one, I'm not quite sure), so it breaks
ordering by sending them later then expected (although it worked in many cases).
It's a question if propagateCharacterPropertiesAsSet is to be used by anything
actually, since it seems rather broken to use it in the ooxml frontend.
Using sendPropertiesWithId sends the properties properly at the right time,
as one would expect. I don't know why dmapper can't simply handle this on its
own, as I think it does handle entering and leaving other elements, but
spending more time on it with this overdesigned abomination, oh well.
Change-Id: Ie36c5f933ea3e6d789ea8f9e4ee3b60a5d1c920c
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/ooxml/model.xml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index ab4156ecd524..e2cfab9ca80c 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -17339,7 +17339,7 @@ <resource name="CT_RPrChange" resource="Properties"> <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="sendPropertiesWithId" sendtokenid="ooxml:endtrackchange"/> <action name="end" action="clearProps"/> </resource> <resource name="CT_ParaRPrChange" resource="Properties"> @@ -17347,10 +17347,10 @@ </resource> <resource name="CT_RunTrackChange" resource="Stream"> <action name="start" action="tokenproperty"/> - <action name="start" action="propagateCharacterPropertiesAsSet" sendtokenid="ooxml:trackchange"/> + <action name="start" action="sendPropertiesWithId" sendtokenid="ooxml:trackchange"/> <action name="start" action="clearProps"/> <action name="end" action="tokenproperty"/> - <action name="end" action="propagateCharacterPropertiesAsSet" sendtokenid="ooxml:endtrackchange"/> + <action name="end" action="sendPropertiesWithId" sendtokenid="ooxml:endtrackchange"/> <action name="end" action="clearProps"/> </resource> <resource name="EG_RangeMarkupElements" resource="Properties"> @@ -17537,6 +17537,7 @@ <element name="checkBox" tokenid="ooxml:CT_FFData_checkBox"/> <element name="ddList" tokenid="ooxml:CT_FFData_ddList"/> <element name="textInput" tokenid="ooxml:CT_FFData_textInput"/> + <!-- TODO: This is possibly wrong and should be sendPropertiesWithId --> <action name="end" action="propagateCharacterPropertiesAsSet" sendtokenid="ooxml:ffdata"/> <action name="end" action="clearProps"/> </resource> @@ -17976,7 +17977,7 @@ </resource> <resource name="CT_ParaTrackChange" resource="Properties"> <action name="start" action="tokenproperty"/> - <action name="start" action="propagateCharacterPropertiesAsSet" sendtokenid="ooxml:paratrackchange"/> + <action name="start" action="sendPropertiesWithId" sendtokenid="ooxml:paratrackchange"/> <action name="start" action="clearProps"/> </resource> <resource name="CT_RubyAlign" resource="Value"> |