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 /stoc/source/defaultregistry | |
| 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 'stoc/source/defaultregistry')
| -rw-r--r-- | stoc/source/defaultregistry/defaultregistry.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/stoc/source/defaultregistry/defaultregistry.cxx b/stoc/source/defaultregistry/defaultregistry.cxx index 45dc8482291a..2885ccaad430 100644 --- a/stoc/source/defaultregistry/defaultregistry.cxx +++ b/stoc/source/defaultregistry/defaultregistry.cxx @@ -52,7 +52,7 @@ class NestedRegistryImpl : public WeakAggImplHelper4 < XSimpleRegistry, XInit public: NestedRegistryImpl( ); - virtual ~NestedRegistryImpl(); + virtual ~NestedRegistryImpl() override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) throw(RuntimeException, std::exception) override; @@ -100,7 +100,7 @@ public: NestedKeyImpl( const OUString& aKeyName, NestedKeyImpl* pKey); - virtual ~NestedKeyImpl(); + virtual ~NestedKeyImpl() override; // XRegistryKey virtual OUString SAL_CALL getKeyName() throw(RuntimeException, std::exception) override; |