summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/app
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/app
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/app')
-rw-r--r--dbaccess/source/ui/app/AppController.hxx2
-rw-r--r--dbaccess/source/ui/app/AppDetailPageHelper.hxx2
-rw-r--r--dbaccess/source/ui/app/AppDetailView.hxx4
-rw-r--r--dbaccess/source/ui/app/AppIconControl.hxx2
-rw-r--r--dbaccess/source/ui/app/AppSwapWindow.hxx2
-rw-r--r--dbaccess/source/ui/app/AppTitleWindow.hxx2
-rw-r--r--dbaccess/source/ui/app/AppView.hxx4
-rw-r--r--dbaccess/source/ui/app/subcomponentmanager.hxx2
8 files changed, 10 insertions, 10 deletions
diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx
index f882e3ca89ae..f6f1201c323e 100644
--- a/dbaccess/source/ui/app/AppController.hxx
+++ b/dbaccess/source/ui/app/AppController.hxx
@@ -401,7 +401,7 @@ namespace dbaui
return m_xModel;
}
- virtual ~OApplicationController();
+ virtual ~OApplicationController() override;
public:
explicit OApplicationController(const css::uno::Reference< css::uno::XComponentContext >& _rxORB);
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
index 8f0d7996653d..65426cc027b2 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
@@ -165,7 +165,7 @@ namespace dbaui
public:
OAppDetailPageHelper(vcl::Window* _pParent,OAppBorderWindow& _rBorderWin,PreviewMode _ePreviewMode);
- virtual ~OAppDetailPageHelper();
+ virtual ~OAppDetailPageHelper() override;
virtual void dispose() override;
// Window overrides
diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx
index 1a2f430eeb93..2471e05d11d0 100644
--- a/dbaccess/source/ui/app/AppDetailView.hxx
+++ b/dbaccess/source/ui/app/AppDetailView.hxx
@@ -123,7 +123,7 @@ namespace dbaui
virtual void DataChanged(const DataChangedEvent& rDCEvt) override;
public:
OTasksWindow(vcl::Window* _pParent,OApplicationDetailView* _pDetailView);
- virtual ~OTasksWindow();
+ virtual ~OTasksWindow() override;
virtual void dispose() override;
// Window overrides
@@ -160,7 +160,7 @@ namespace dbaui
public:
OApplicationDetailView(OAppBorderWindow& _rParent,PreviewMode _ePreviewMode);
- virtual ~OApplicationDetailView();
+ virtual ~OApplicationDetailView() override;
// Window overrides
virtual void dispose() override;
diff --git a/dbaccess/source/ui/app/AppIconControl.hxx b/dbaccess/source/ui/app/AppIconControl.hxx
index a998345ed301..4cc1105c7a3c 100644
--- a/dbaccess/source/ui/app/AppIconControl.hxx
+++ b/dbaccess/source/ui/app/AppIconControl.hxx
@@ -33,7 +33,7 @@ namespace dbaui
public:
explicit OApplicationIconControl(vcl::Window* _pParent);
- virtual ~OApplicationIconControl();
+ virtual ~OApplicationIconControl() override;
virtual void dispose() override;
void setControlActionListener( IControlActionListener* _pListener ) { m_pActionListener = _pListener; }
diff --git a/dbaccess/source/ui/app/AppSwapWindow.hxx b/dbaccess/source/ui/app/AppSwapWindow.hxx
index fc7fadf49e60..0fabc5329020 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.hxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.hxx
@@ -43,7 +43,7 @@ namespace dbaui
virtual void DataChanged(const DataChangedEvent& rDCEvt) override;
public:
OApplicationSwapWindow( vcl::Window* _pParent, OAppBorderWindow& _rBorderWindow );
- virtual ~OApplicationSwapWindow();
+ virtual ~OApplicationSwapWindow() override;
// Window overrides
virtual void dispose() override;
virtual void Resize() override;
diff --git a/dbaccess/source/ui/app/AppTitleWindow.hxx b/dbaccess/source/ui/app/AppTitleWindow.hxx
index 6df02ac04ed5..305b56fdab25 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.hxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.hxx
@@ -35,7 +35,7 @@ namespace dbaui
virtual void DataChanged(const DataChangedEvent& rDCEvt) override;
public:
OTitleWindow(vcl::Window* _pParent,sal_uInt16 _nTitleId,WinBits _nBits,bool _bShift = true);
- virtual ~OTitleWindow();
+ virtual ~OTitleWindow() override;
virtual void dispose() override;
// Window overrides
diff --git a/dbaccess/source/ui/app/AppView.hxx b/dbaccess/source/ui/app/AppView.hxx
index 66ff3b86a0cc..d057ea3eb6ff 100644
--- a/dbaccess/source/ui/app/AppView.hxx
+++ b/dbaccess/source/ui/app/AppView.hxx
@@ -55,7 +55,7 @@ namespace dbaui
virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
public:
OAppBorderWindow(OApplicationView* _pParent,PreviewMode _ePreviewMode);
- virtual ~OAppBorderWindow();
+ virtual ~OAppBorderWindow() override;
virtual void dispose() override;
// Window overrides
@@ -104,7 +104,7 @@ namespace dbaui
,OApplicationController& _rAppController
,PreviewMode _ePreviewMode
);
- virtual ~OApplicationView();
+ virtual ~OApplicationView() override;
virtual void dispose() override;
/// automatically creates mnemonics for the icon/texts in our left hand side panel
diff --git a/dbaccess/source/ui/app/subcomponentmanager.hxx b/dbaccess/source/ui/app/subcomponentmanager.hxx
index 3500205f7cb4..788ec907b3ef 100644
--- a/dbaccess/source/ui/app/subcomponentmanager.hxx
+++ b/dbaccess/source/ui/app/subcomponentmanager.hxx
@@ -43,7 +43,7 @@ namespace dbaui
{
public:
SubComponentManager( OApplicationController& _rController, const ::comphelper::SharedMutex& _rMutex );
- virtual ~SubComponentManager();
+ virtual ~SubComponentManager() override;
void disposing();