[Libreoffice-commits] .: writerfilter/source

[Libreoffice Gerrit user]

 writerfilter/source/ooxml/factoryimpl_ns.xsl |    7 +++++++
 writerfilter/source/ooxml/model.xml          |    2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 393262b325338b568c86b9183f37fc950cfbf127
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Fri Sep 14 17:06:47 2012 +0200

    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

diff --git a/writerfilter/source/ooxml/factoryimpl_ns.xsl b/writerfilter/source/ooxml/factoryimpl_ns.xsl
index bd913d6..407f405 100644
--- a/writerfilter/source/ooxml/factoryimpl_ns.xsl
+++ b/writerfilter/source/ooxml/factoryimpl_ns.xsl
@@ -494,6 +494,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("");
+    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 e683be1..54f4b20 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="fieldend"/>
+      <action name="end" action="simplefieldend"/>
     </resource>
     <resource name="ST_FldCharType" resource="List">
       <value name="begin" tokenid="ooxml:Value_ST_FldCharType_begin">begin</value>