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 /framework/source/services/substitutepathvars.cxx | |
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 'framework/source/services/substitutepathvars.cxx')
-rw-r--r-- | framework/source/services/substitutepathvars.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index b46cb213821f..5130ae39a8e9 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -114,7 +114,7 @@ class SubstitutePathVariables_Impl : public utl::ConfigItem { public: SubstitutePathVariables_Impl(); - virtual ~SubstitutePathVariables_Impl(); + virtual ~SubstitutePathVariables_Impl() override; static OperatingSystem GetOperatingSystemFromString( const OUString& ); static EnvironmentType GetEnvTypeFromString( const OUString& ); @@ -229,7 +229,7 @@ friend class SubstitutePathVariables_Impl; public: explicit SubstitutePathVariables(const css::uno::Reference< css::uno::XComponentContext >& xContext); - virtual ~SubstitutePathVariables(); + virtual ~SubstitutePathVariables() override; virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override |