summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@suse.cz>2012-10-29 16:08:57 +0100
committerMiklos Vajna <vmiklos@suse.cz>2012-10-29 16:08:57 +0100
commit2a8760dd30c41cebbfe991afe4815fd05619246b (patch)
treeee661606f2a2a0d6fc106301cc1d18422b471418
parent47d444083785df4e042cc6d2056285f1fbd51135 (diff)
Revert "n#778140 fix import of w:fldSimple character properties"
This reverts commit 29982fd31b163730ad54c414bf772e021af31e9b. It turns out that this hack is not really needed for n#778140, but it causes problems, for example in case of n#775899.
-rw-r--r--writerfilter/source/ooxml/factoryimpl_ns.xsl7
-rw-r--r--writerfilter/source/ooxml/model.xml2
2 files changed, 1 insertions, 8 deletions
diff --git a/writerfilter/source/ooxml/factoryimpl_ns.xsl b/writerfilter/source/ooxml/factoryimpl_ns.xsl
index ef694c1f8880..e33132cb6ddf 100644
--- a/writerfilter/source/ooxml/factoryimpl_ns.xsl
+++ b/writerfilter/source/ooxml/factoryimpl_ns.xsl
@@ -505,13 +505,6 @@ CreateElementMapPointer </xsl:text>
<xsl:text>
pHandler-&gt;endField();</xsl:text>
</xsl:when>
- <xsl:when test="@action='simplefieldend'">
- <xsl:text>
- pHandler-&gt;endField();
- pHandler-&gt;startCharacterGroup();
- pHandler-&gt;text(rtl::OUString::createFromAscii(""));
- pHandler-&gt;endCharacterGroup();</xsl:text>
- </xsl:when>
<xsl:when test="@action='printproperty'">
<xsl:text>
dynamic_cast&lt;OOXMLFastContextHandlerStream*&gt;(pHandler)-&gt;sendProperty(</xsl:text>
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index f8feb4a1a172..c5a7a9071198 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -22124,7 +22124,7 @@
<action name="start" action="printproperty" sendtokenid="ooxml:CT_SimpleField_instr"/>
<action name="start" action="endCharacterGroup"/>
<action name="start" action="fieldsep"/>
- <action name="end" action="simplefieldend"/>
+ <action name="end" action="fieldend"/>
</resource>
<resource name="ST_FldCharType" resource="List">
<value name="begin" tokenid="ooxml:Value_ST_FldCharType_begin">begin</value>