summaryrefslogtreecommitdiff
path: root/connectivity/source/inc/flat
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-09-13 13:09:01 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-09-13 13:19:22 +0200
commit91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch)
treed634de3a1a6820904b5699c2136b79b1a5a807c7 /connectivity/source/inc/flat
parent6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (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/inc/flat')
-rw-r--r--connectivity/source/inc/flat/EConnection.hxx2
-rw-r--r--connectivity/source/inc/flat/EDatabaseMetaData.hxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/connectivity/source/inc/flat/EConnection.hxx b/connectivity/source/inc/flat/EConnection.hxx
index e3e8fe6e137d..69cd800481f4 100644
--- a/connectivity/source/inc/flat/EConnection.hxx
+++ b/connectivity/source/inc/flat/EConnection.hxx
@@ -38,7 +38,7 @@ namespace connectivity
sal_Unicode m_cThousandDelimiter;
public:
OFlatConnection(ODriver* _pDriver);
- virtual ~OFlatConnection();
+ virtual ~OFlatConnection() override;
virtual void construct(const OUString& _rUrl,const css::uno::Sequence< css::beans::PropertyValue >& _rInfo ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
diff --git a/connectivity/source/inc/flat/EDatabaseMetaData.hxx b/connectivity/source/inc/flat/EDatabaseMetaData.hxx
index 830fab24349b..bb43fe61c0a8 100644
--- a/connectivity/source/inc/flat/EDatabaseMetaData.hxx
+++ b/connectivity/source/inc/flat/EDatabaseMetaData.hxx
@@ -34,7 +34,7 @@ namespace connectivity
{
virtual css::uno::Reference< css::sdbc::XResultSet > impl_getTypeInfo_throw() override;
protected:
- virtual ~OFlatDatabaseMetaData();
+ virtual ~OFlatDatabaseMetaData() override;
public:
OFlatDatabaseMetaData(file::OConnection* _pCon);