summaryrefslogtreecommitdiff
path: root/connectivity
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-01-20 12:38:10 +0200
committerNoel Grandin <noel@peralex.com>2015-01-26 08:42:28 +0200
commitb44cbb26efe1d0b0950b1e1613e131b506dc3876 (patch)
tree9b4d5d99e5dad0971079b997a02a6d96536709ca /connectivity
parent26ad60aec69310fecd918f1c2e09056aa4782320 (diff)
new loplugin: change virtual methods to non-virtual
Where we can prove that the virtual method is never overriden. In the case of pure-virtual methods, we remove the method entirely. Sometimes this leads to entire methods and fields being eliminated. Change-Id: I138ef81c95f115dbd8c023a83cfc7e9d5d6d14ae
Diffstat (limited to 'connectivity')
-rw-r--r--connectivity/source/drivers/firebird/Connection.hxx4
-rw-r--r--connectivity/source/drivers/firebird/ResultSet.hxx4
-rw-r--r--connectivity/source/drivers/mork/MConnection.hxx2
-rw-r--r--connectivity/source/drivers/mork/MStatement.hxx2
-rw-r--r--connectivity/source/drivers/postgresql/pq_baseresultset.hxx4
-rw-r--r--connectivity/source/inc/dbase/DIndex.hxx10
-rw-r--r--connectivity/source/inc/dbase/DResultSet.hxx2
-rw-r--r--connectivity/source/inc/file/FResultSet.hxx4
-rw-r--r--connectivity/source/inc/file/FStatement.hxx2
-rw-r--r--connectivity/source/inc/file/fanalyzer.hxx4
-rw-r--r--connectivity/source/inc/file/fcode.hxx2
-rw-r--r--connectivity/source/inc/java/lang/Object.hxx2
-rw-r--r--connectivity/source/inc/odbc/OConnection.hxx4
-rw-r--r--connectivity/source/inc/odbc/OStatement.hxx6
14 files changed, 26 insertions, 26 deletions
diff --git a/connectivity/source/drivers/firebird/Connection.hxx b/connectivity/source/drivers/firebird/Connection.hxx
index e5467ebe3083..31f17e6e4a21 100644
--- a/connectivity/source/drivers/firebird/Connection.hxx
+++ b/connectivity/source/drivers/firebird/Connection.hxx
@@ -174,7 +174,7 @@ namespace connectivity
Connection(FirebirdDriver* _pDriver);
virtual ~Connection();
- virtual void construct( const ::rtl::OUString& url,
+ void construct( const ::rtl::OUString& url,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info)
throw(css::sdbc::SQLException,
css::uno::RuntimeException,
@@ -211,7 +211,7 @@ namespace connectivity
* Create and/or connect to the sdbcx Catalog. This is completely
* unrelated to the SQL "Catalog".
*/
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier >
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier >
createCatalog();
// OComponentHelper
diff --git a/connectivity/source/drivers/firebird/ResultSet.hxx b/connectivity/source/drivers/firebird/ResultSet.hxx
index dbb971afad39..e1f2c689452a 100644
--- a/connectivity/source/drivers/firebird/ResultSet.hxx
+++ b/connectivity/source/drivers/firebird/ResultSet.hxx
@@ -110,10 +110,10 @@ namespace connectivity
virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const SAL_OVERRIDE;
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE;
- virtual void SAL_CALL checkColumnIndex( sal_Int32 index )
+ void SAL_CALL checkColumnIndex( sal_Int32 index )
throw (::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL checkRowIndex()
+ void SAL_CALL checkRowIndex()
throw (::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
diff --git a/connectivity/source/drivers/mork/MConnection.hxx b/connectivity/source/drivers/mork/MConnection.hxx
index 1d7549815795..452b58b2d447 100644
--- a/connectivity/source/drivers/mork/MConnection.hxx
+++ b/connectivity/source/drivers/mork/MConnection.hxx
@@ -58,7 +58,7 @@ namespace connectivity
::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier> m_xCatalog;
public:
- virtual void construct( const OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException);
+ void construct( const OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException);
OConnection(MorkDriver* const driver);
virtual ~OConnection();
diff --git a/connectivity/source/drivers/mork/MStatement.hxx b/connectivity/source/drivers/mork/MStatement.hxx
index aa25fc49053d..08b4c561d612 100644
--- a/connectivity/source/drivers/mork/MStatement.hxx
+++ b/connectivity/source/drivers/mork/MStatement.hxx
@@ -144,7 +144,7 @@ namespace connectivity
void analyseSQL();
void setOrderbyColumn( connectivity::OSQLParseNode* pColumnRef,
connectivity::OSQLParseNode* pAscendingDescending);
- virtual void createTable( ) throw (
+ void createTable( ) throw (
::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
public:
diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.hxx b/connectivity/source/drivers/postgresql/pq_baseresultset.hxx
index 1adf0c95689c..5f3296aa6feb 100644
--- a/connectivity/source/drivers/postgresql/pq_baseresultset.hxx
+++ b/connectivity/source/drivers/postgresql/pq_baseresultset.hxx
@@ -85,9 +85,9 @@ protected:
*/
virtual void checkClosed()
throw ( com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException ) = 0;
- virtual void checkColumnIndex( sal_Int32 index )
+ void checkColumnIndex( sal_Int32 index )
throw ( com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException );
- virtual void checkRowIndex( bool mustBeOnValidRow );
+ void checkRowIndex( bool mustBeOnValidRow );
virtual ::com::sun::star::uno::Any getValue( sal_Int32 columnIndex ) = 0;
com::sun::star::uno::Any convertTo(
diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx
index b20d51afa7ec..ed424641373c 100644
--- a/connectivity/source/inc/dbase/DIndex.hxx
+++ b/connectivity/source/inc/dbase/DIndex.hxx
@@ -105,7 +105,7 @@ namespace connectivity
const ODbaseTable* getTable() const { return m_pTable; }
const NDXHeader& getHeader() const { return m_aHeader; }
- virtual OIndexIterator* createIterator(OBoolOperator_BASE* pOp,
+ OIndexIterator* createIterator(OBoolOperator_BASE* pOp,
const OOperand_BASE* pOperand = NULL);
void SetRootPos(sal_uInt32 nPos) {m_nRootPage = nPos;}
@@ -117,10 +117,10 @@ namespace connectivity
bool IsText() const {return m_aHeader.db_keytype == 0;}
sal_uInt16 GetMaxNodes() const {return m_aHeader.db_maxkeys;}
- virtual bool Insert(sal_uInt32 nRec, const ORowSetValue& rValue);
- virtual bool Update(sal_uInt32 nRec, const ORowSetValue&, const ORowSetValue&);
- virtual bool Delete(sal_uInt32 nRec, const ORowSetValue& rValue);
- virtual bool Find(sal_uInt32 nRec, const ORowSetValue& rValue);
+ bool Insert(sal_uInt32 nRec, const ORowSetValue& rValue);
+ bool Update(sal_uInt32 nRec, const ORowSetValue&, const ORowSetValue&);
+ bool Delete(sal_uInt32 nRec, const ORowSetValue& rValue);
+ bool Find(sal_uInt32 nRec, const ORowSetValue& rValue);
void createINFEntry();
bool CreateImpl();
diff --git a/connectivity/source/inc/dbase/DResultSet.hxx b/connectivity/source/inc/dbase/DResultSet.hxx
index bc2980088bd7..32c2379a60cc 100644
--- a/connectivity/source/inc/dbase/DResultSet.hxx
+++ b/connectivity/source/inc/dbase/DResultSet.hxx
@@ -47,7 +47,7 @@ namespace connectivity
// OPropertySetHelper
virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE;
virtual bool fillIndexValues(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier> &_xIndex) SAL_OVERRIDE;
- virtual file::OSQLAnalyzer* createAnalyzer();
+ file::OSQLAnalyzer* createAnalyzer();
public:
DECLARE_SERVICE_INFO();
diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx
index 36a671137050..cb7de4bda3e7 100644
--- a/connectivity/source/inc/file/FResultSet.hxx
+++ b/connectivity/source/inc/file/FResultSet.hxx
@@ -271,8 +271,8 @@ namespace connectivity
// special methods
inline sal_Int32 mapColumn(sal_Int32 column);
- virtual bool OpenImpl();
- virtual void doTableSpecials(const OSQLTable& _xTable);
+ bool OpenImpl();
+ void doTableSpecials(const OSQLTable& _xTable);
inline sal_Int32 getRowCountResult() const { return m_nRowCountResult; }
inline void setParameterRow(const OValueRefRow& _rParaRow) { m_aParameterRow = _rParaRow; }
diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx
index 976a409562a8..0706b83c682e 100644
--- a/connectivity/source/inc/file/FStatement.hxx
+++ b/connectivity/source/inc/file/FStatement.hxx
@@ -111,7 +111,7 @@ namespace connectivity
virtual void initializeResultSet(OResultSet* _pResult);
// create the analyzer
- virtual OSQLAnalyzer* createAnalyzer();
+ OSQLAnalyzer* createAnalyzer();
void closeResultSet() throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
sal_Int32 getPrecision ( sal_Int32 sqlType);
diff --git a/connectivity/source/inc/file/fanalyzer.hxx b/connectivity/source/inc/file/fanalyzer.hxx
index ea502f103711..dc6d0febf384 100644
--- a/connectivity/source/inc/file/fanalyzer.hxx
+++ b/connectivity/source/inc/file/fanalyzer.hxx
@@ -71,8 +71,8 @@ namespace connectivity
void dispose();
void start(OSQLParseNode* pSQLParseNode);
- virtual bool hasRestriction() const;
- virtual bool hasFunctions() const;
+ bool hasRestriction() const;
+ bool hasFunctions() const;
inline bool evaluateRestriction() { return m_aInterpreter->start(); }
void setSelectionEvaluationResult(OValueRefRow& _pRow,const ::std::vector<sal_Int32>& _rColumnMapping);
void setOrigColumns(const OFileColumns& rCols);
diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx
index f8cb32afcf6e..681a3e4310d7 100644
--- a/connectivity/source/inc/file/fcode.hxx
+++ b/connectivity/source/inc/file/fcode.hxx
@@ -75,7 +75,7 @@ namespace connectivity
virtual const ORowSetValue& getValue() const = 0;
virtual void setValue(const ORowSetValue& _rVal) = 0;
- virtual sal_Int32 getDBType() const {return m_eDBType;}
+ sal_Int32 getDBType() const {return m_eDBType;}
virtual OEvaluateSet* preProcess(OBoolOperator* pOp, OOperand* pRight = 0);
inline bool isValid() const;
diff --git a/connectivity/source/inc/java/lang/Object.hxx b/connectivity/source/inc/java/lang/Object.hxx
index a154d102f523..e1c136ae5348 100644
--- a/connectivity/source/inc/java/lang/Object.hxx
+++ b/connectivity/source/inc/java/lang/Object.hxx
@@ -97,7 +97,7 @@ namespace connectivity
void clearObject(JNIEnv& rEnv);
void clearObject();
- virtual OUString toString() const;
+ OUString toString() const;
static void ThrowSQLException(JNIEnv * pEnv,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> & _rContext);
static void ThrowLoggedSQLException(
diff --git a/connectivity/source/inc/odbc/OConnection.hxx b/connectivity/source/inc/odbc/OConnection.hxx
index 37f730bc1a4d..59e645ef903c 100644
--- a/connectivity/source/inc/odbc/OConnection.hxx
+++ b/connectivity/source/inc/odbc/OConnection.hxx
@@ -80,11 +80,11 @@ namespace connectivity
SQLRETURN OpenConnection(const OUString& aConnectStr,sal_Int32 nTimeOut, bool bSilent);
- virtual OConnection* cloneConnection(); // creates a new connection
+ OConnection* cloneConnection(); // creates a new connection
public:
oslGenericFunction getOdbcFunction(sal_Int32 _nIndex) const;
- virtual SQLRETURN Construct( const OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException);
+ SQLRETURN Construct( const OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException);
OConnection(const SQLHANDLE _pDriverHandle,ODBCDriver* _pDriver);
// OConnection(const SQLHANDLE _pConnectionHandle);
diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx
index 03a070c3c0b2..aa71fb544ac7 100644
--- a/connectivity/source/inc/odbc/OStatement.hxx
+++ b/connectivity/source/inc/odbc/OStatement.hxx
@@ -99,9 +99,9 @@ namespace connectivity
void setEscapeProcessing( const bool _bEscapeProc );
template < typename T, SQLINTEGER BufferLength > SQLRETURN setStmtOption (SQLINTEGER fOption, T value) const;
- virtual void setResultSetConcurrency(sal_Int32 _par0) ;
- virtual void setResultSetType(sal_Int32 _par0) ;
- virtual void setUsingBookmarks(bool _bUseBookmark) ;
+ void setResultSetConcurrency(sal_Int32 _par0) ;
+ void setResultSetType(sal_Int32 _par0) ;
+ void setUsingBookmarks(bool _bUseBookmark) ;
void reset() throw (css::sdbc::SQLException, css::uno::RuntimeException);
void clearMyResultSet() throw (css::sdbc::SQLException, css::uno::RuntimeException);