[Libreoffice-commits] core.git: writerfilter/source

[Miklos Vajna]

 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |    6 +-----
 writerfilter/source/ooxml/OOXMLFastContextHandler.hxx |    2 +-
 writerfilter/source/ooxml/factoryimpl_ns.py           |    2 --
 writerfilter/source/ooxml/model.xml                   |    2 +-
 4 files changed, 3 insertions(+), 9 deletions(-)

New commits:
commit b92e9f45442b109d743a620775e1691b45d1e831
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Aug 1 10:57:07 2014 +0200

    clean up unused OOXMLFastContextHandler::fldData parameter
    
    Change-Id: I6af797257c6e6e7bd95597ab786660fd9ade06a0

diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 6b31599..09af955 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -745,12 +745,8 @@ void OOXMLFastContextHandler::positionOffset(const OUString & sText)
         ::writerfilter::dmapper::PositionHandler::setPositionOffset( sText, inPositionV );
 }
 
-void OOXMLFastContextHandler::fldData(const OUString & /* sText */)
+void OOXMLFastContextHandler::ignore()
 {
-    // ignore --- As per ECMA fldData has been removed.
-    // WordprocessingML Page# 5011  [ ISO/IEC 29500-1:2012 ]
-    // WordprocessingML Page# 5552 [ ECMA-376 Part 1 ]
-    // Hack, so that fldData is not interpreted as field Command
 }
 
 void OOXMLFastContextHandler::alignH(const OUString & sText)
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
index 221c222b..c186159 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
@@ -195,7 +195,7 @@ public:
     void endOfParagraph();
     void text(const OUString & sText);
     void positionOffset(const OUString & sText);
-    void fldData(const OUString & sText);
+    void ignore();
     void alignH(const OUString & sText);
     void alignV(const OUString & sText);
     void positivePercentage(const OUString& rText);
diff --git a/writerfilter/source/ooxml/factoryimpl_ns.py b/writerfilter/source/ooxml/factoryimpl_ns.py
index bc59480..687814d 100644
--- a/writerfilter/source/ooxml/factoryimpl_ns.py
+++ b/writerfilter/source/ooxml/factoryimpl_ns.py
@@ -400,8 +400,6 @@ def factoryChooseAction(actionNode):
         ret.append("    pHandler->alignH(sText);")
     elif actionNode.getAttribute("action") == "alignV":
         ret.append("    pHandler->alignV(sText);")
-    elif actionNode.getAttribute("action") == "fldData":
-        ret.append("    pHandler->fldData(sText);")
     elif actionNode.getAttribute("action") == "tokenproperty":
         ret.append("    OOXMLFastHelper<OOXMLIntegerValue>::newProperty(pHandler, %s, pHandler->getToken());" % idToLabel("ooxml:token"))
     else:
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index ea9fc78..3ff9450 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -24448,7 +24448,7 @@
       <action name="end" action="fieldend"/>
     </resource>
     <resource name="CT_FLDData" resource="Stream">
-      <action name="characters" action="fldData"/>
+      <action name="characters" action="ignore"/>
     </resource>
     <resource name="CT_FFData" resource="Properties">
       <element name="name" tokenid="ooxml:CT_FFData_name"/>