diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-08-01 10:57:07 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-08-01 10:57:20 +0200 |
| commit | b92e9f45442b109d743a620775e1691b45d1e831 (patch) | |
| tree | 1abf9061cccc6c7d7ae9e41671ad60593d1adcb7 | |
| parent | 194c17a7c7c00f966b0256a1e90d50d8dd49f2bc (diff) | |
clean up unused OOXMLFastContextHandler::fldData parameter
Change-Id: I6af797257c6e6e7bd95597ab786660fd9ade06a0
| -rw-r--r-- | writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 6 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/OOXMLFastContextHandler.hxx | 2 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/factoryimpl_ns.py | 2 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/model.xml | 2 |
4 files changed, 3 insertions, 9 deletions
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index 6b315990ec0c..09af9551b2d3 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 221c222ba12c..c186159e1476 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 bc59480dd590..687814d6ee29 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 ea9fc78baed6..3ff945064e3c 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"/> |