diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-15 09:13:33 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-15 12:56:26 +0000 |
commit | 0d051730156f633150fa9e3107fe97cf7be6d8f9 (patch) | |
tree | 73a29cd8f7f6c3630088c74f52cb53c948eb4ba5 /connectivity | |
parent | d2e9d3d0ed42f0fc24255c64546d8d256ca33aae (diff) |
loplugin:constantparam
Change-Id: Iced8ff99d52d55e6b6c3126affafbea6786e94f0
Reviewed-on: https://gerrit.libreoffice.org/30858
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'connectivity')
-rw-r--r-- | connectivity/source/drivers/file/FStatement.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/drivers/macab/MacabStatement.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/drivers/mork/MStatement.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/parse/sqliterator.cxx | 5 | ||||
-rw-r--r-- | connectivity/source/parse/sqlnode.cxx | 11 |
5 files changed, 10 insertions, 12 deletions
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx index 36cf31411a0b..0bd256484117 100644 --- a/connectivity/source/drivers/file/FStatement.cxx +++ b/connectivity/source/drivers/file/FStatement.cxx @@ -56,7 +56,7 @@ OStatement_Base::OStatement_Base(OConnection* _pConnection ) ,::comphelper::OPropertyContainer(OStatement_BASE::rBHelper) ,m_xDBMetaData(_pConnection->getMetaData()) ,m_aParser( _pConnection->getDriver()->getComponentContext() ) - ,m_aSQLIterator( _pConnection, _pConnection->createCatalog()->getTables(), m_aParser, nullptr ) + ,m_aSQLIterator( _pConnection, _pConnection->createCatalog()->getTables(), m_aParser ) ,m_pConnection(_pConnection) ,m_pParseTree(nullptr) ,m_pSQLAnalyzer(nullptr) diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx b/connectivity/source/drivers/macab/MacabStatement.cxx index 8236c3b222df..2fa468e4c2b9 100644 --- a/connectivity/source/drivers/macab/MacabStatement.cxx +++ b/connectivity/source/drivers/macab/MacabStatement.cxx @@ -67,7 +67,7 @@ MacabCommonStatement::MacabCommonStatement(MacabConnection* _pConnection ) : MacabCommonStatement_BASE(m_aMutex), OPropertySetHelper(MacabCommonStatement_BASE::rBHelper), m_aParser(_pConnection->getDriver()->getComponentContext()), - m_aSQLIterator(_pConnection, _pConnection->createCatalog()->getTables(), m_aParser, nullptr ), + m_aSQLIterator(_pConnection, _pConnection->createCatalog()->getTables(), m_aParser ), m_pParseTree(nullptr), m_pConnection(_pConnection), rBHelper(MacabCommonStatement_BASE::rBHelper) diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx index 0096d36e094d..505afda939c2 100644 --- a/connectivity/source/drivers/mork/MStatement.cxx +++ b/connectivity/source/drivers/mork/MStatement.cxx @@ -65,7 +65,7 @@ OCommonStatement::OCommonStatement(OConnection* _pConnection ) ,m_pTable(nullptr) ,m_pConnection(_pConnection) ,m_aParser( comphelper::getComponentContext(_pConnection->getDriver()->getFactory()) ) - ,m_pSQLIterator( new OSQLParseTreeIterator( _pConnection, _pConnection->createCatalog()->getTables(), m_aParser, nullptr ) ) + ,m_pSQLIterator( new OSQLParseTreeIterator( _pConnection, _pConnection->createCatalog()->getTables(), m_aParser ) ) { m_xDBMetaData = _pConnection->getMetaData(); m_pParseTree = nullptr; diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx index 1534d793c362..8e880557793c 100644 --- a/connectivity/source/parse/sqliterator.cxx +++ b/connectivity/source/parse/sqliterator.cxx @@ -135,12 +135,11 @@ namespace connectivity OSQLParseTreeIterator::OSQLParseTreeIterator(const Reference< XConnection >& _rxConnection, const Reference< XNameAccess >& _rxTables, - const OSQLParser& _rParser, - const OSQLParseNode* pRoot ) + const OSQLParser& _rParser ) :m_rParser( _rParser ) ,m_pImpl( new OSQLParseTreeIteratorImpl( _rxConnection, _rxTables ) ) { - setParseTree(pRoot); + setParseTree(nullptr); } diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx index 07bfe1e37d43..52311a0ead09 100644 --- a/connectivity/source/parse/sqlnode.cxx +++ b/connectivity/source/parse/sqlnode.cxx @@ -262,7 +262,7 @@ void OSQLParseNode::parseNodeToStr(OUString& rString, parseNodeToStr( rString, _rxConnection, nullptr, nullptr, OUString(), pContext ? pContext->getPreferredLocale() : OParseContext::getDefaultLocale(), - pContext, _bIntl, _bQuote, '.', false, false ); + pContext, _bIntl, _bQuote, '.', false ); } @@ -276,7 +276,7 @@ void OSQLParseNode::parseNodeToPredicateStr(OUString& rString, OSL_ENSURE(xFormatter.is(), "OSQLParseNode::parseNodeToPredicateStr:: no formatter!"); if (xFormatter.is()) - parseNodeToStr(rString, _rxConnection, xFormatter, nullptr, OUString(), rIntl, pContext, true, true, _cDec, true, false); + parseNodeToStr(rString, _rxConnection, xFormatter, nullptr, OUString(), rIntl, pContext, true, true, _cDec, true); } @@ -292,7 +292,7 @@ void OSQLParseNode::parseNodeToPredicateStr(OUString& rString, OSL_ENSURE(xFormatter.is(), "OSQLParseNode::parseNodeToPredicateStr:: no formatter!"); if (xFormatter.is()) - parseNodeToStr( rString, _rxConnection, xFormatter, _xField, _sPredicateTableAlias, rIntl, pContext, true, true, _cDec, true, false ); + parseNodeToStr( rString, _rxConnection, xFormatter, _xField, _sPredicateTableAlias, rIntl, pContext, true, true, _cDec, true ); } @@ -306,8 +306,7 @@ void OSQLParseNode::parseNodeToStr(OUString& rString, bool _bIntl, bool _bQuote, sal_Char _cDecSep, - bool _bPredicate, - bool _bSubstitute) const + bool _bPredicate) const { OSL_ENSURE( _rxConnection.is(), "OSQLParseNode::parseNodeToStr: invalid connection!" ); @@ -319,7 +318,7 @@ void OSQLParseNode::parseNodeToStr(OUString& rString, OSQLParseNode::impl_parseNodeToString_throw( sBuffer, SQLParseNodeParameter( _rxConnection, xFormatter, _xField, _sPredicateTableAlias, rIntl, pContext, - _bIntl, _bQuote, _cDecSep, _bPredicate, _bSubstitute + _bIntl, _bQuote, _cDecSep, _bPredicate, false ) ); } catch( const SQLException& ) |