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 /include/dbaccess | |
parent | avoid loading all calendars of a locale (diff) | |
download | core-91dd2db17bd6cb9b357d1d69b187174e31eabef0.tar.gz core-91dd2db17bd6cb9b357d1d69b187174e31eabef0.zip |
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 'include/dbaccess')
-rw-r--r-- | include/dbaccess/dataview.hxx | 2 | ||||
-rw-r--r-- | include/dbaccess/dbsubcomponentcontroller.hxx | 2 | ||||
-rw-r--r-- | include/dbaccess/genericcontroller.hxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/dbaccess/dataview.hxx b/include/dbaccess/dataview.hxx index 289697ef0637..6e56e67cee43 100644 --- a/include/dbaccess/dataview.hxx +++ b/include/dbaccess/dataview.hxx @@ -60,7 +60,7 @@ namespace dbaui IController& _rController, const css::uno::Reference< css::uno::XComponentContext >& , WinBits nStyle = 0 ); - virtual ~ODataView(); + virtual ~ODataView() override; virtual void dispose() override; /// late construction diff --git a/include/dbaccess/dbsubcomponentcontroller.hxx b/include/dbaccess/dbsubcomponentcontroller.hxx index a43b28d61580..4259fd5a193e 100644 --- a/include/dbaccess/dbsubcomponentcontroller.hxx +++ b/include/dbaccess/dbsubcomponentcontroller.hxx @@ -171,7 +171,7 @@ namespace dbaui protected: DBSubComponentController(const css::uno::Reference< css::uno::XComponentContext>& _rxORB); - virtual ~DBSubComponentController(); + virtual ~DBSubComponentController() override; void disconnect(); virtual void reconnect( bool _bUI ); diff --git a/include/dbaccess/genericcontroller.hxx b/include/dbaccess/genericcontroller.hxx index 7b7fed25b12f..40b9086a144d 100644 --- a/include/dbaccess/genericcontroller.hxx +++ b/include/dbaccess/genericcontroller.hxx @@ -409,7 +409,7 @@ namespace dbaui void releaseNumberForComponent(); - virtual ~OGenericUnoController(); + virtual ~OGenericUnoController() override; private: void fillSupportedFeatures(); |