diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-04-01 19:18:35 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-04-01 19:22:54 +0200 |
commit | 362d4f0cd4e50111edfae9d30c90602c37ed65a2 (patch) | |
tree | 0b432c049d580dcac6130bca9fb028bab8af8fa8 /connectivity | |
parent | b66d87086804460c1986df1b832fd6b2ea075a90 (diff) |
Explicitly mark overriding destructors as "virtual"
It appears that the C++ standard allows overriding destructors to be marked
"override," but at least some MSVC versions complain about it, so at least make
sure such destructors are explicitly marked "virtual."
Change-Id: I0e1cafa7584fd16ebdce61f569eae2373a71b0a1
Diffstat (limited to 'connectivity')
10 files changed, 11 insertions, 11 deletions
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx index 73ec08fb0049..f0731e032ba6 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.cxx +++ b/connectivity/source/drivers/evoab2/NResultSet.cxx @@ -378,7 +378,7 @@ public: { } - ~OEvoabVersion36Helper() + virtual ~OEvoabVersion36Helper() { freeContacts(); } @@ -528,7 +528,7 @@ public: { } - ~OEvoabVersion35Helper() + virtual ~OEvoabVersion35Helper() { freeContacts(); } diff --git a/connectivity/source/drivers/mork/MStatement.hxx b/connectivity/source/drivers/mork/MStatement.hxx index 24b168fe7cc9..114d1d3a1899 100644 --- a/connectivity/source/drivers/mork/MStatement.hxx +++ b/connectivity/source/drivers/mork/MStatement.hxx @@ -185,7 +185,7 @@ namespace connectivity public ::com::sun::star::lang::XServiceInfo { protected: - ~OStatement(){} + virtual ~OStatement(){} public: // a constructor, for when the object needs to be returned: OStatement( OConnection* _pConnection); diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.hxx b/connectivity/source/drivers/postgresql/pq_baseresultset.hxx index 065132da6a75..2c60de222036 100644 --- a/connectivity/source/drivers/postgresql/pq_baseresultset.hxx +++ b/connectivity/source/drivers/postgresql/pq_baseresultset.hxx @@ -100,7 +100,7 @@ protected: sal_Int32 rowCount, sal_Int32 columnCount, const ::com::sun::star::uno::Reference< ::com::sun::star::script::XTypeConverter > &tc ); - ~BaseResultSet(); + virtual ~BaseResultSet(); public: // XInterface virtual void SAL_CALL acquire() throw() SAL_OVERRIDE { OComponentHelper::acquire(); } diff --git a/connectivity/source/drivers/postgresql/pq_connection.hxx b/connectivity/source/drivers/postgresql/pq_connection.hxx index 0c8fcaf134a4..c3736d516cea 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.hxx +++ b/connectivity/source/drivers/postgresql/pq_connection.hxx @@ -184,7 +184,7 @@ public: const rtl::Reference< RefCountedMutex > &refMutex, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & ctx ); - ~Connection( ); + virtual ~Connection( ); public: // XCloseable virtual void SAL_CALL close() diff --git a/connectivity/source/drivers/postgresql/pq_resultset.hxx b/connectivity/source/drivers/postgresql/pq_resultset.hxx index e887cf82549a..f7a3bee7413c 100644 --- a/connectivity/source/drivers/postgresql/pq_resultset.hxx +++ b/connectivity/source/drivers/postgresql/pq_resultset.hxx @@ -76,7 +76,7 @@ public: PGresult *result, const OUString &schema, const OUString &table ); - ~ResultSet(); + virtual ~ResultSet(); public: // XCloseable virtual void SAL_CALL close( ) diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx b/connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx index dbd86b2e9afa..69947e887a8e 100644 --- a/connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx +++ b/connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx @@ -77,7 +77,7 @@ public: const com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::uno::Any > > &data, const com::sun::star::uno::Reference< com::sun::star::script::XTypeConverter > &tc, const ColumnMetaDataVector *pVec = 0); - ~SequenceResultSet(); + virtual ~SequenceResultSet(); public: // XCloseable virtual void SAL_CALL close( ) diff --git a/connectivity/source/inc/dbase/dindexnode.hxx b/connectivity/source/inc/dbase/dindexnode.hxx index 92e94939fec7..42ada7cb61ac 100644 --- a/connectivity/source/inc/dbase/dindexnode.hxx +++ b/connectivity/source/inc/dbase/dindexnode.hxx @@ -173,7 +173,7 @@ namespace connectivity protected: ONDXPage(ODbaseIndex& rIndex, sal_uInt32 nPos, ONDXPage* = NULL); - ~ONDXPage(); + virtual ~ONDXPage(); virtual void QueryDelete() SAL_OVERRIDE; diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx index e8777c72b9c7..48b618c6ba8b 100644 --- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx @@ -111,7 +111,7 @@ namespace connectivity ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE; - ~ODatabaseMetaDataResultSet(); + virtual ~ODatabaseMetaDataResultSet(); template < typename T, SQLSMALLINT sqlTypeId > T getInteger ( sal_Int32 columnIndex ); public: diff --git a/connectivity/source/manager/mdrivermanager.hxx b/connectivity/source/manager/mdrivermanager.hxx index 2824006a538b..c8245803b782 100644 --- a/connectivity/source/manager/mdrivermanager.hxx +++ b/connectivity/source/manager/mdrivermanager.hxx @@ -83,7 +83,7 @@ namespace drivermanager private: OSDBCDriverManager( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); - ~OSDBCDriverManager(); + virtual ~OSDBCDriverManager(); public: diff --git a/connectivity/source/simpledbt/parsenode_s.hxx b/connectivity/source/simpledbt/parsenode_s.hxx index fed4ff349db9..202a1cef9277 100644 --- a/connectivity/source/simpledbt/parsenode_s.hxx +++ b/connectivity/source/simpledbt/parsenode_s.hxx @@ -42,7 +42,7 @@ namespace connectivity public: OSimpleParseNode(const OSQLParseNode* _pNode, sal_Bool _bTakeOwnership = sal_True); - ~OSimpleParseNode(); + virtual ~OSimpleParseNode(); // ISQLParseNode virtual void parseNodeToStr(OUString& _rString, |