diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2012-09-14 17:06:47 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2012-09-28 15:34:07 +0200 |
| commit | 29982fd31b163730ad54c414bf772e021af31e9b (patch) | |
| tree | 6282ea7a1047e41457c77a982dd9b9072c3a8b93 | |
| parent | 47eadacc10999bc60c731dcf4b80a62c4354afcb (diff) | |
n#778140 fix import of w:fldSimple character properties
The character properties of the field are applied when the next run
begins, so insert an empty run right after the field to fix the issue.
Change-Id: I18d747d99d6604fa331a0e70e6989f9f4975eab2
| -rw-r--r-- | writerfilter/source/ooxml/factoryimpl_ns.xsl | 7 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/model.xml | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/writerfilter/source/ooxml/factoryimpl_ns.xsl b/writerfilter/source/ooxml/factoryimpl_ns.xsl index e33132cb6ddf..ef694c1f8880 100644 --- a/writerfilter/source/ooxml/factoryimpl_ns.xsl +++ b/writerfilter/source/ooxml/factoryimpl_ns.xsl @@ -505,6 +505,13 @@ CreateElementMapPointer </xsl:text> <xsl:text> pHandler->endField();</xsl:text> </xsl:when> + <xsl:when test="@action='simplefieldend'"> + <xsl:text> + pHandler->endField(); + pHandler->startCharacterGroup(); + pHandler->text(rtl::OUString::createFromAscii("")); + 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 4f33b2226b27..8911049d2d45 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="fieldend"/> + <action name="end" action="simplefieldend"/> </resource> <resource name="ST_FldCharType" resource="List"> <value name="begin" tokenid="ooxml:Value_ST_FldCharType_begin">begin</value> |