summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/uno
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 /dbaccess/source/ui/uno
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 'dbaccess/source/ui/uno')
-rw-r--r--dbaccess/source/ui/uno/ColumnModel.hxx2
-rw-r--r--dbaccess/source/ui/uno/composerdialogs.hxx2
-rw-r--r--dbaccess/source/ui/uno/copytablewizard.cxx2
-rw-r--r--dbaccess/source/ui/uno/textconnectionsettings_uno.cxx2
-rw-r--r--dbaccess/source/ui/uno/unoDirectSql.hxx2
5 files changed, 5 insertions, 5 deletions
diff --git a/dbaccess/source/ui/uno/ColumnModel.hxx b/dbaccess/source/ui/uno/ColumnModel.hxx
index f4d2470f433f4..9a48fc7246d5d 100644
--- a/dbaccess/source/ui/uno/ColumnModel.hxx
+++ b/dbaccess/source/ui/uno/ColumnModel.hxx
@@ -64,7 +64,7 @@ class OColumnControlModel : public ::comphelper::OMutexAndBroadcastHelper
void registerProperties();
protected:
- virtual ~OColumnControlModel();
+ virtual ~OColumnControlModel() override;
OColumnControlModel(const OColumnControlModel* _pSource
,const css::uno::Reference< css::lang::XMultiServiceFactory>& _rxFactory);
public:
diff --git a/dbaccess/source/ui/uno/composerdialogs.hxx b/dbaccess/source/ui/uno/composerdialogs.hxx
index dafe18a81e968..f3bfc920ede2d 100644
--- a/dbaccess/source/ui/uno/composerdialogs.hxx
+++ b/dbaccess/source/ui/uno/composerdialogs.hxx
@@ -52,7 +52,7 @@ namespace dbaui
protected:
explicit ComposerDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxORB);
- virtual ~ComposerDialog();
+ virtual ~ComposerDialog() override;
public:
virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId()
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx
index 08f714a5b1a48..033e1f7f4f624 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -186,7 +186,7 @@ namespace dbaui
protected:
explicit CopyTableWizard( const Reference< XComponentContext >& _rxORB );
- virtual ~CopyTableWizard();
+ virtual ~CopyTableWizard() override;
// OGenericUnoDialog overridables
virtual VclPtr<Dialog> createDialog( vcl::Window* _pParent ) override;
diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
index 0632c0ca9daf0..746c16ad81764 100644
--- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
+++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
@@ -68,7 +68,7 @@ namespace dbaui
protected:
explicit OTextConnectionSettingsDialog( const Reference<XComponentContext>& _rContext );
- virtual ~OTextConnectionSettingsDialog();
+ virtual ~OTextConnectionSettingsDialog() override;
public:
virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId()
diff --git a/dbaccess/source/ui/uno/unoDirectSql.hxx b/dbaccess/source/ui/uno/unoDirectSql.hxx
index ae9c22ac227aa..89e29463824ce 100644
--- a/dbaccess/source/ui/uno/unoDirectSql.hxx
+++ b/dbaccess/source/ui/uno/unoDirectSql.hxx
@@ -45,7 +45,7 @@ namespace dbaui
css::uno::Reference< css::sdbc::XConnection > m_xActiveConnection;
protected:
explicit ODirectSQLDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxORB);
- virtual ~ODirectSQLDialog();
+ virtual ~ODirectSQLDialog() override;
public:
virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId()