From 2a8760dd30c41cebbfe991afe4815fd05619246b Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@suse.cz>
Date: Mon, 29 Oct 2012 16:08:57 +0100
Subject: 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.
---
 writerfilter/source/ooxml/factoryimpl_ns.xsl | 7 -------
 writerfilter/source/ooxml/model.xml          | 2 +-
 2 files changed, 1 insertion(+), 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
@@ -504,13 +504,6 @@ CreateElementMapPointer </xsl:text>
         <xsl:when test="@action='fieldend'">
             <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>
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>
-- 
cgit v1.2.3