writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 3 - writerfilter/source/dmapper/DomainMapperTableHandler.hxx | 3 - writerfilter/source/dmapper/TableManager.cxx | 2 writerfilter/source/ooxml/OOXMLFactory.cxx | 4 - writerfilter/source/ooxml/OOXMLFactory.hxx | 4 - writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 42 +++++++-------- writerfilter/source/ooxml/OOXMLFastContextHandler.hxx | 4 - 7 files changed, 30 insertions(+), 32 deletions(-)
New commits: commit 19710ef250a7da5f7fcc2d017bc60fdee91925ef Author: Noel Grandin <[email protected]> Date: Fri May 5 09:56:43 2017 +0200 loplugin:checkunusedparams in writerfilter Change-Id: I52860115a65a23651b6f96363c6f8e5baa78cfad Reviewed-on: https://gerrit.libreoffice.org/37278 Tested-by: Jenkins <[email protected]> Reviewed-by: Noel Grandin <[email protected]> diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx index b79a1d71214b..7ed678863e37 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx @@ -64,8 +64,7 @@ DomainMapperTableHandler::~DomainMapperTableHandler() { } -void DomainMapperTableHandler::startTable(unsigned int /*nDepth*/, - const TablePropertyMapPtr& pProps) +void DomainMapperTableHandler::startTable(const TablePropertyMapPtr& pProps) { m_aTableProperties = pProps; m_aTableRanges.clear(); diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx index 4881f37a8d9d..85f84c78ded9 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx @@ -87,10 +87,9 @@ public: /** Handle start of table. - @param nDepth depth of the table in surrounding table hierarchy @param pProps properties of the table */ - void startTable(unsigned int nDepth, const TablePropertyMapPtr& pProps); + void startTable(const TablePropertyMapPtr& pProps); /// Handle end of table. void endTable(unsigned int nestedTableLevel, bool bTableStartsAtCellStart); /** diff --git a/writerfilter/source/dmapper/TableManager.cxx b/writerfilter/source/dmapper/TableManager.cxx index 32b77410e332..381111f7d0fa 100644 --- a/writerfilter/source/dmapper/TableManager.cxx +++ b/writerfilter/source/dmapper/TableManager.cxx @@ -298,7 +298,7 @@ void TableManager::resolveCurrentTable() unsigned int nRows = pTableData->getRowCount(); - mpTableDataHandler->startTable(pTableData->getDepth(), getTableProps()); + mpTableDataHandler->startTable(getTableProps()); for (unsigned int nRow = 0; nRow < nRows; ++nRow) { diff --git a/writerfilter/source/ooxml/OOXMLFactory.cxx b/writerfilter/source/ooxml/OOXMLFactory.cxx index ff65144d3444..b951245ba376 100644 --- a/writerfilter/source/ooxml/OOXMLFactory.cxx +++ b/writerfilter/source/ooxml/OOXMLFactory.cxx @@ -153,7 +153,7 @@ void OOXMLFactory::characters(OOXMLFastContextHandler * pHandler, } } -void OOXMLFactory::startAction(OOXMLFastContextHandler * pHandler, Token_t /*nToken*/) +void OOXMLFactory::startAction(OOXMLFastContextHandler * pHandler) { Id nDefine = pHandler->getDefine(); OOXMLFactory_ns::Pointer_t pFactory = getFactoryForNamespace(nDefine); @@ -164,7 +164,7 @@ void OOXMLFactory::startAction(OOXMLFastContextHandler * pHandler, Token_t /*nTo } } -void OOXMLFactory::endAction(OOXMLFastContextHandler * pHandler, Token_t /*nToken*/) +void OOXMLFactory::endAction(OOXMLFastContextHandler * pHandler) { Id nDefine = pHandler->getDefine(); OOXMLFactory_ns::Pointer_t pFactory = getFactoryForNamespace(nDefine); diff --git a/writerfilter/source/ooxml/OOXMLFactory.hxx b/writerfilter/source/ooxml/OOXMLFactory.hxx index cbb9ca295217..9e4b495fd0fc 100644 --- a/writerfilter/source/ooxml/OOXMLFactory.hxx +++ b/writerfilter/source/ooxml/OOXMLFactory.hxx @@ -92,8 +92,8 @@ public: static void characters(OOXMLFastContextHandler * pHandler, const OUString & rString); - static void startAction(OOXMLFastContextHandler * pHandler, Token_t nToken); - static void endAction(OOXMLFastContextHandler * pHandler, Token_t nToken); + static void startAction(OOXMLFastContextHandler * pHandler); + static void endAction(OOXMLFastContextHandler * pHandler); private: OOXMLFactory() = delete; diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index 3310314d1436..48f51b4df512 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -194,7 +194,7 @@ void OOXMLFastContextHandler::lcl_startFastElement (Token_t Element, const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/) { - OOXMLFactory::startAction(this, Element); + OOXMLFactory::startAction(this); if( Element == (NMSP_dmlWordDr|XML_positionV) ) inPositionV = true; else if( Element == (NMSP_dmlWordDr|XML_positionH) ) @@ -203,9 +203,9 @@ void OOXMLFastContextHandler::lcl_startFastElement } void OOXMLFastContextHandler::lcl_endFastElement -(Token_t Element) +(Token_t /*Element*/) { - OOXMLFactory::endAction(this, Element); + OOXMLFactory::endAction(this); } void SAL_CALL OOXMLFastContextHandler::endUnknownElement @@ -274,14 +274,14 @@ void OOXMLFastContextHandler::attributes OOXMLFactory::attributes(this, Attribs); } -void OOXMLFastContextHandler::startAction(Token_t Element) +void OOXMLFastContextHandler::startAction() { - OOXMLFactory::startAction(this, Element); + OOXMLFactory::startAction(this); } -void OOXMLFastContextHandler::endAction(Token_t Element) +void OOXMLFastContextHandler::endAction() { - OOXMLFactory::endAction(this, Element); + OOXMLFactory::endAction(this); } void OOXMLFastContextHandler::setId(Id rId) @@ -936,11 +936,11 @@ OOXMLFastContextHandlerProperties::~OOXMLFastContextHandlerProperties() } void OOXMLFastContextHandlerProperties::lcl_endFastElement -(Token_t Element) +(Token_t /*Element*/) { try { - endAction(Element); + endAction(); if (mbResolve) { @@ -1104,7 +1104,7 @@ OOXMLFastContextHandlerPropertyTable::~OOXMLFastContextHandlerPropertyTable() } void OOXMLFastContextHandlerPropertyTable::lcl_endFastElement -(Token_t Element) +(Token_t /*Element*/) { OOXMLPropertySet::Pointer_t pPropSet(mpPropertySet->clone()); OOXMLTable::ValuePointer_t pTmpVal @@ -1116,7 +1116,7 @@ void OOXMLFastContextHandlerPropertyTable::lcl_endFastElement mpStream->table(mId, pTable); - endAction(Element); + endAction(); } /* @@ -1144,11 +1144,11 @@ OOXMLValue::Pointer_t OOXMLFastContextHandlerValue::getValue() const } void OOXMLFastContextHandlerValue::lcl_endFastElement -(Token_t Element) +(Token_t /*Element*/) { sendPropertyToParent(); - endAction(Element); + endAction(); } void OOXMLFastContextHandlerValue::setDefaultBooleanValue() @@ -1257,7 +1257,7 @@ OOXMLFastContextHandlerXNote::~OOXMLFastContextHandlerXNote() } void OOXMLFastContextHandlerXNote::lcl_startFastElement -(Token_t Element, +(Token_t /*Element*/, const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/) { mbForwardEventsSaved = isForwardEvents(); @@ -1268,13 +1268,13 @@ void OOXMLFastContextHandlerXNote::lcl_startFastElement else setForwardEvents(false); - startAction(Element); + startAction(); } void OOXMLFastContextHandlerXNote::lcl_endFastElement (Token_t Element) { - endAction(Element); + endAction(); OOXMLFastContextHandlerProperties::lcl_endFastElement(Element); @@ -1508,7 +1508,7 @@ OOXMLFastContextHandlerTextTable::~OOXMLFastContextHandlerTextTable() } void OOXMLFastContextHandlerTextTable::lcl_startFastElement -(Token_t Element, +(Token_t /*Element*/, const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/) { mpParserState->startTable(); @@ -1523,13 +1523,13 @@ void OOXMLFastContextHandlerTextTable::lcl_startFastElement } mpParserState->setCharacterProperties(pProps); - startAction(Element); + startAction(); } void OOXMLFastContextHandlerTextTable::lcl_endFastElement -(Token_t Element) +(Token_t /*Element*/) { - endAction(Element); + endAction(); std::shared_ptr<OOXMLPropertySet> pProps( new OOXMLPropertySet ); { @@ -1580,7 +1580,7 @@ void OOXMLFastContextHandlerShape::lcl_startFastElement (Token_t Element, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) { - startAction(Element); + startAction(); if (mrShapeContext.is()) { diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx index 40d44c158c95..ba0ee9a3d66b 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx @@ -220,8 +220,8 @@ protected: /// @throws css::xml::sax::SAXException virtual void lcl_characters(const OUString & aChars); - void startAction(Token_t Element); - void endAction(Token_t Element); + void startAction(); + void endAction(); const css::uno::Reference< css::uno::XComponentContext >& getComponentContext() { return m_xContext;} _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
