From 82da70787ac12ec9d5791eeac6b48535737ad5b3 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 14 Jul 2015 14:04:41 +0200 Subject: loplugin:unusedmethods connectivity Change-Id: Ie9f3daa49b02dddc7b56d1f5fb58a229f53d4513 Reviewed-on: https://gerrit.libreoffice.org/17043 Tested-by: Jenkins Reviewed-by: Noel Grandin --- .../source/commontools/RowFunctionParser.cxx | 33 ++-------------------- connectivity/source/drivers/file/FResultSet.cxx | 5 ---- connectivity/source/drivers/odbc/OResultSet.cxx | 5 ---- connectivity/source/inc/AutoRetrievingBase.hxx | 1 - connectivity/source/inc/RowFunctionParser.hxx | 9 ------ connectivity/source/inc/TKeyValue.hxx | 1 - connectivity/source/inc/TResultSetHelper.hxx | 1 - connectivity/source/inc/TSkipDeletedSet.hxx | 5 ---- connectivity/source/inc/TSortIndex.hxx | 7 ----- connectivity/source/inc/file/FResultSet.hxx | 1 - connectivity/source/inc/odbc/OResultSet.hxx | 1 - connectivity/source/sdbcx/VCollection.cxx | 5 ---- 12 files changed, 2 insertions(+), 72 deletions(-) (limited to 'connectivity') diff --git a/connectivity/source/commontools/RowFunctionParser.cxx b/connectivity/source/commontools/RowFunctionParser.cxx index b6045c479bba..4435efb7f795 100644 --- a/connectivity/source/commontools/RowFunctionParser.cxx +++ b/connectivity/source/commontools/RowFunctionParser.cxx @@ -69,15 +69,6 @@ public: virtual void fill(const ODatabaseMetaDataResultSet::ORow& /*_aRow*/ ) const SAL_OVERRIDE { } - virtual ExpressionFunct getType() const SAL_OVERRIDE - { - return FUNC_CONST; - } - virtual ODatabaseMetaDataResultSet::ORow fillNode( std::vector< RowEquation >& /*rEquations*/, ExpressionNode* /* pOptionalArg */, sal_uInt32 /* nFlags */ ) SAL_OVERRIDE - { - ODatabaseMetaDataResultSet::ORow aRet; - return aRet; - } }; @@ -128,15 +119,6 @@ public: break; } } - virtual ExpressionFunct getType() const SAL_OVERRIDE - { - return meFunct; - } - virtual ODatabaseMetaDataResultSet::ORow fillNode( std::vector< RowEquation >& /*rEquations*/, ExpressionNode* /*pOptionalArg*/, sal_uInt32 /*nFlags*/ ) SAL_OVERRIDE - { - ODatabaseMetaDataResultSet::ORow aRet; - return aRet; - } }; @@ -243,12 +225,10 @@ public: */ class UnaryFunctionExpression : public ExpressionNode { - const ExpressionFunct meFunct; ExpressionNodeSharedPtr mpArg; public: - UnaryFunctionExpression( const ExpressionFunct eFunct, const ExpressionNodeSharedPtr& rArg ) : - meFunct( eFunct ), + UnaryFunctionExpression( const ExpressionNodeSharedPtr& rArg ) : mpArg( rArg ) { } @@ -259,15 +239,6 @@ public: virtual void fill(const ODatabaseMetaDataResultSet::ORow& /*_aRow*/ ) const SAL_OVERRIDE { } - virtual ExpressionFunct getType() const SAL_OVERRIDE - { - return meFunct; - } - virtual ODatabaseMetaDataResultSet::ORow fillNode( std::vector< RowEquation >& /*rEquations*/, ExpressionNode* /* pOptionalArg */, sal_uInt32 /* nFlags */ ) SAL_OVERRIDE - { - ODatabaseMetaDataResultSet::ORow aRet; - return aRet; - } }; class UnaryFunctionFunctor @@ -294,7 +265,7 @@ public : ExpressionNodeSharedPtr pArg( rNodeStack.top() ); rNodeStack.pop(); - rNodeStack.push( ExpressionNodeSharedPtr( new UnaryFunctionExpression( meFunct, pArg ) ) ); + rNodeStack.push( ExpressionNodeSharedPtr( new UnaryFunctionExpression( pArg ) ) ); } }; diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx index 53ee36263381..12023b985d22 100644 --- a/connectivity/source/drivers/file/FResultSet.cxx +++ b/connectivity/source/drivers/file/FResultSet.cxx @@ -1622,11 +1622,6 @@ sal_Int32 OResultSet::getDriverPos() const return (m_aRow->get())[0]->getValue(); } -bool OResultSet::deletedVisible() const -{ - return m_bShowDeleted; -} - bool OResultSet::isRowDeleted() const { return m_aRow->isDeleted(); diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx index 260f0a6f02c2..bd78ac57cdea 100644 --- a/connectivity/source/drivers/odbc/OResultSet.cxx +++ b/connectivity/source/drivers/odbc/OResultSet.cxx @@ -1765,11 +1765,6 @@ sal_Int32 OResultSet::getDriverPos() const return nValue ? nValue : m_nRowPos; } -bool OResultSet::deletedVisible() const -{ - return false; -} - bool OResultSet::isRowDeleted() const { return m_pRowStatusArray[0] == SQL_ROW_DELETED; diff --git a/connectivity/source/inc/AutoRetrievingBase.hxx b/connectivity/source/inc/AutoRetrievingBase.hxx index c1e243135e95..74be60cb88a2 100644 --- a/connectivity/source/inc/AutoRetrievingBase.hxx +++ b/connectivity/source/inc/AutoRetrievingBase.hxx @@ -36,7 +36,6 @@ namespace connectivity inline void setAutoRetrievingStatement(const OUString& _sStmt) { m_sGeneratedValueStatement = _sStmt; } public: inline bool isAutoRetrievingEnabled() const { return m_bAutoRetrievingEnabled; } - inline const OUString& getAutoRetrievingStatement() const { return m_sGeneratedValueStatement; } /** transform the statement to query for auto generated values @param _sInsertStatement diff --git a/connectivity/source/inc/RowFunctionParser.hxx b/connectivity/source/inc/RowFunctionParser.hxx index 64d07e516c89..86c769125bbf 100644 --- a/connectivity/source/inc/RowFunctionParser.hxx +++ b/connectivity/source/inc/RowFunctionParser.hxx @@ -66,15 +66,6 @@ public: virtual ORowSetValueDecoratorRef evaluate(const ODatabaseMetaDataResultSet::ORow& _aRow ) const = 0; virtual void fill(const ODatabaseMetaDataResultSet::ORow& _aRow ) const = 0; - - /** Operator to retrieve the type of expression node - */ - virtual ExpressionFunct getType() const = 0; - - /** Operator to retrieve the ms version of expression - */ - virtual ODatabaseMetaDataResultSet::ORow fillNode( - std::vector< RowEquation >& rEquations, ExpressionNode* pOptionalArg, sal_uInt32 nFlags ) = 0; }; typedef ::boost::shared_ptr< ExpressionNode > ExpressionNodeSharedPtr; diff --git a/connectivity/source/inc/TKeyValue.hxx b/connectivity/source/inc/TKeyValue.hxx index 161d475fd731..e308b91a278d 100644 --- a/connectivity/source/inc/TKeyValue.hxx +++ b/connectivity/source/inc/TKeyValue.hxx @@ -52,7 +52,6 @@ namespace connectivity { m_aKeys.push_back(_aValueRef); } - inline void setValue(sal_Int32 nVal) { m_nValue = nVal; } OUString getKeyString(::std::vector::size_type i) const { diff --git a/connectivity/source/inc/TResultSetHelper.hxx b/connectivity/source/inc/TResultSetHelper.hxx index 0bc4f914983b..e6c0efd9c97f 100644 --- a/connectivity/source/inc/TResultSetHelper.hxx +++ b/connectivity/source/inc/TResultSetHelper.hxx @@ -42,7 +42,6 @@ namespace connectivity public: virtual bool move(Movement _eCursorPosition, sal_Int32 _nOffset, bool _bRetrieveData) = 0; virtual sal_Int32 getDriverPos() const = 0; - virtual bool deletedVisible() const = 0; virtual bool isRowDeleted() const = 0; protected: diff --git a/connectivity/source/inc/TSkipDeletedSet.hxx b/connectivity/source/inc/TSkipDeletedSet.hxx index 98ba098efb51..09f86528d598 100644 --- a/connectivity/source/inc/TSkipDeletedSet.hxx +++ b/connectivity/source/inc/TSkipDeletedSet.hxx @@ -85,11 +85,6 @@ namespace connectivity sal_Int32 _nPos the logical position */ void deletePosition(sal_Int32 _nPos); - /** - getLastPosition returns the last position - @return the last position - */ - inline sal_Int32 getLastPosition() const { return m_aBookmarksPositions.size(); } inline void SetDeletedVisible(bool _bDeletedVisible) { m_bDeletedVisible = _bDeletedVisible; } }; } diff --git a/connectivity/source/inc/TSortIndex.hxx b/connectivity/source/inc/TSortIndex.hxx index 6f2acdc01f90..84fe2746f496 100644 --- a/connectivity/source/inc/TSortIndex.hxx +++ b/connectivity/source/inc/TSortIndex.hxx @@ -92,13 +92,6 @@ namespace connectivity */ ::rtl::Reference CreateKeySet(); - - - // look at the name - bool IsFrozen() const { return m_bFrozen; } - // returns the current size of the keyvalues - size_t Count() const { return m_aKeyValues.size(); } - inline const ::std::vector& getKeyType() const { return m_aKeyType; } inline TAscendingOrder getAscending(::std::vector::size_type _nPos) const { return m_aAscending[_nPos]; } diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx index 0eec7e303c1b..74d1d195f757 100644 --- a/connectivity/source/inc/file/FResultSet.hxx +++ b/connectivity/source/inc/file/FResultSet.hxx @@ -299,7 +299,6 @@ namespace connectivity // IResultSetHelper virtual bool move(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nOffset, bool _bRetrieveData) SAL_OVERRIDE; virtual sal_Int32 getDriverPos() const SAL_OVERRIDE; - virtual bool deletedVisible() const SAL_OVERRIDE; virtual bool isRowDeleted() const SAL_OVERRIDE; }; diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx index a501a70f936f..dabc759923bc 100644 --- a/connectivity/source/inc/odbc/OResultSet.hxx +++ b/connectivity/source/inc/odbc/OResultSet.hxx @@ -332,7 +332,6 @@ namespace connectivity // IResultSetHelper virtual bool move(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nOffset, bool _bRetrieveData) SAL_OVERRIDE; virtual sal_Int32 getDriverPos() const SAL_OVERRIDE; - virtual bool deletedVisible() const SAL_OVERRIDE; virtual bool isRowDeleted() const SAL_OVERRIDE; protected: diff --git a/connectivity/source/sdbcx/VCollection.cxx b/connectivity/source/sdbcx/VCollection.cxx index 8f430d86e111..b92b17131986 100644 --- a/connectivity/source/sdbcx/VCollection.cxx +++ b/connectivity/source/sdbcx/VCollection.cxx @@ -63,11 +63,6 @@ namespace { } - virtual void reserve(size_t nLength) SAL_OVERRIDE - { - m_aElements.reserve(nLength); - } - virtual bool exists(const OUString& _sName ) SAL_OVERRIDE { return m_aNameMap.find(_sName) != m_aNameMap.end(); -- cgit