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 /dbaccess/source/core/recovery/settingsimport.hxx | |
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 'dbaccess/source/core/recovery/settingsimport.hxx')
-rw-r--r-- | dbaccess/source/core/recovery/settingsimport.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/dbaccess/source/core/recovery/settingsimport.hxx b/dbaccess/source/core/recovery/settingsimport.hxx index ccbca706fef1..c698263adc8a 100644 --- a/dbaccess/source/core/recovery/settingsimport.hxx +++ b/dbaccess/source/core/recovery/settingsimport.hxx @@ -52,7 +52,7 @@ namespace dbaccess void characters( const OUString& i_rCharacters ); protected: - virtual ~SettingsImport(); + virtual ~SettingsImport() override; protected: static void split( const OUString& i_rElementName, OUString& o_rNamespace, OUString& o_rLocalName ); @@ -85,7 +85,7 @@ namespace dbaccess ) override; private: - virtual ~IgnoringSettingsImport() + virtual ~IgnoringSettingsImport() override { } }; @@ -102,7 +102,7 @@ namespace dbaccess ) override; protected: - virtual ~OfficeSettingsImport(); + virtual ~OfficeSettingsImport() override; private: // the settings collection to which |this| will contribute a single setting @@ -116,7 +116,7 @@ namespace dbaccess explicit ConfigItemImport( ::comphelper::NamedValueCollection& o_rSettings ); protected: - virtual ~ConfigItemImport(); + virtual ~ConfigItemImport() override; public: // SettingsImport overridables @@ -142,7 +142,7 @@ namespace dbaccess explicit ConfigItemSetImport( ::comphelper::NamedValueCollection& o_rSettings ); protected: - virtual ~ConfigItemSetImport(); + virtual ~ConfigItemSetImport() override; public: // SettingsImport overridables |