diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2012-10-29 15:39:03 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2012-10-29 15:44:59 +0100 |
| commit | f5d972265a4fec02639bbd68ecb0a6cd4f4253a7 (patch) | |
| tree | bd197ee6ee0a2253fe9b52d4c6d924518d292be1 /writerfilter | |
| parent | 573af9266c4d17445f0c75e1a71b629c845b83b8 (diff) | |
Revert "n#778140 fix import of w:fldSimple character properties"
This reverts commit 393262b325338b568c86b9183f37fc950cfbf127. It turns
out that this hack is not really needed for n#778140, but it causes
problems, for example in case of n#775899.
Change-Id: I00b9f7112f951935450c683c5942b0d6c2b7fee2
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/ooxml/factoryimpl_ns.xsl | 7 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/model.xml | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/writerfilter/source/ooxml/factoryimpl_ns.xsl b/writerfilter/source/ooxml/factoryimpl_ns.xsl index 407f40524628..bd913d630c52 100644 --- a/writerfilter/source/ooxml/factoryimpl_ns.xsl +++ b/writerfilter/source/ooxml/factoryimpl_ns.xsl @@ -494,13 +494,6 @@ CreateElementMapPointer </xsl:text> <xsl:text> pHandler->endField();</xsl:text> </xsl:when> - <xsl:when test="@action='simplefieldend'"> - <xsl:text> - pHandler->endField(); - pHandler->startCharacterGroup(); - pHandler->text(""); - pHandler->endCharacterGroup();</xsl:text> - </xsl:when> <xsl:when test="@action='printproperty'"> <xsl:text> dynamic_cast<OOXMLFastContextHandlerStream*>(pHandler)->sendProperty(</xsl:text> diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index bf25aa3c3b31..d961f874e024 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -22153,7 +22153,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> |