diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:09:01 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:19:22 +0200 |
commit | 91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch) | |
tree | d634de3a1a6820904b5699c2136b79b1a5a807c7 /connectivity/source/drivers/evoab2 | |
parent | 6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (diff) |
loplugin:override: No more need for the "MSVC dtor override" workaround
The issue of 362d4f0cd4e50111edfae9d30c90602c37ed65a2 "Explicitly mark
overriding destructors as 'virtual'" appears to no longer be a problem with
MSVC 2013.
(The little change in the rewriting code of compilerplugins/clang/override.cxx
was necessary to prevent an endless loop when adding "override" to
OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager();
in chart2/source/inc/LifeTime.hxx, getting stuck in the leading
OOO_DLLPUBLIC_CHARTTOOLS macro. Can't remember what that
isAtEndOfImmediateMacroExpansion thing was originally necessary for, anyway.)
Change-Id: I534c634504d7216b9bb632c2775c04eaf27e927e
Diffstat (limited to 'connectivity/source/drivers/evoab2')
8 files changed, 10 insertions, 10 deletions
diff --git a/connectivity/source/drivers/evoab2/NConnection.hxx b/connectivity/source/drivers/evoab2/NConnection.hxx index dd77b00bd6ff..ecc7b76c3229 100644 --- a/connectivity/source/drivers/evoab2/NConnection.hxx +++ b/connectivity/source/drivers/evoab2/NConnection.hxx @@ -61,7 +61,7 @@ namespace connectivity OString m_aPassword; ::dbtools::WarningsContainer m_aWarnings; - virtual ~OEvoabConnection(); + virtual ~OEvoabConnection() override; public: explicit OEvoabConnection( OEvoabDriver& _rDriver ); diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx index 610dda0eedd7..5d2d7645b3cb 100644 --- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx +++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx @@ -83,7 +83,7 @@ namespace connectivity virtual sal_Int32 impl_getMaxTablesInSelect_throw( ) override; virtual bool impl_storesMixedCaseQuotedIdentifiers_throw( ) override; - virtual ~OEvoabDatabaseMetaData(); + virtual ~OEvoabDatabaseMetaData() override; public: inline OEvoabConnection* getOwnConnection() const { return m_pConnection; } diff --git a/connectivity/source/drivers/evoab2/NDriver.hxx b/connectivity/source/drivers/evoab2/NDriver.hxx index 6372a80b4d02..e0dc13dd94a2 100644 --- a/connectivity/source/drivers/evoab2/NDriver.hxx +++ b/connectivity/source/drivers/evoab2/NDriver.hxx @@ -51,7 +51,7 @@ namespace connectivity public: explicit OEvoabDriver(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory); - virtual ~OEvoabDriver(); + virtual ~OEvoabDriver() override; // OComponentHelper virtual void SAL_CALL disposing() override; diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx index 73e62583d0a7..dc002b2c6d1e 100644 --- a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx +++ b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx @@ -70,7 +70,7 @@ namespace connectivity css::uno::Reference< css::sdbc::XResultSetMetaData > m_xMetaData; protected: - virtual ~OEvoabPreparedStatement(); + virtual ~OEvoabPreparedStatement() override; public: explicit OEvoabPreparedStatement( OEvoabConnection* _pConnection ); diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx index 0ccc1ec5123d..eaf526dee639 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.cxx +++ b/connectivity/source/drivers/evoab2/NResultSet.cxx @@ -389,7 +389,7 @@ public: { } - virtual ~OEvoabVersion36Helper() + virtual ~OEvoabVersion36Helper() override { freeContacts(); } @@ -535,7 +535,7 @@ public: { } - virtual ~OEvoabVersion35Helper() + virtual ~OEvoabVersion35Helper() override { freeContacts(); } diff --git a/connectivity/source/drivers/evoab2/NResultSet.hxx b/connectivity/source/drivers/evoab2/NResultSet.hxx index 6031b3e26797..20cee2374744 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.hxx +++ b/connectivity/source/drivers/evoab2/NResultSet.hxx @@ -112,7 +112,7 @@ namespace connectivity virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // you can't delete objects of this type - virtual ~OEvoabResultSet(); + virtual ~OEvoabResultSet() override; public: DECLARE_SERVICE_INFO(); diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx index 4fa89e261897..7cae14957bcd 100644 --- a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx +++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx @@ -40,7 +40,7 @@ namespace connectivity ::std::vector<sal_Int32> m_aEvoabFields; protected: - virtual ~OEvoabResultSetMetaData(); + virtual ~OEvoabResultSetMetaData() override; public: explicit OEvoabResultSetMetaData(const OUString& _aTableName); void setEvoabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(css::sdbc::SQLException); diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx b/connectivity/source/drivers/evoab2/NStatement.hxx index f54f37725d5d..54085d78b381 100644 --- a/connectivity/source/drivers/evoab2/NStatement.hxx +++ b/connectivity/source/drivers/evoab2/NStatement.hxx @@ -173,7 +173,7 @@ namespace connectivity // OPropertySetHelper virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; - virtual ~OCommonStatement(); + virtual ~OCommonStatement() override; protected: void parseSql( const OUString& sql, QueryData& _out_rQueryData ); @@ -239,7 +239,7 @@ namespace connectivity ,public OStatement_IBase { protected: - virtual ~OStatement(){} + virtual ~OStatement() override {} public: explicit OStatement( OEvoabConnection* _pConnection) |