[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - writerfilter/source

[Libreoffice Gerrit user]

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

New commits:
commit 2a8760dd30c41cebbfe991afe4815fd05619246b
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Mon Oct 29 16:08:57 2012 +0100

    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.

diff --git a/writerfilter/source/ooxml/factoryimpl_ns.xsl b/writerfilter/source/ooxml/factoryimpl_ns.xsl
index ef694c1..e33132c 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->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 f8feb4a..c5a7a90 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>