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 /basic/inc/sbobjmod.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 'basic/inc/sbobjmod.hxx')
-rw-r--r-- | basic/inc/sbobjmod.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/basic/inc/sbobjmod.hxx b/basic/inc/sbobjmod.hxx index 8d79bddcd842..58504c621dd9 100644 --- a/basic/inc/sbobjmod.hxx +++ b/basic/inc/sbobjmod.hxx @@ -34,7 +34,7 @@ class BASIC_DLLPUBLIC SbObjModule : public SbModule { protected: - virtual ~SbObjModule(); + virtual ~SbObjModule() override; public: SbObjModule( const OUString& rName, const css::script::ModuleInfo& mInfo, bool bIsVbaCompatible ); @@ -61,7 +61,7 @@ class BASIC_DLLPUBLIC SbUserFormModule : public SbObjModule void InitObject(); public: SbUserFormModule( const OUString& rName, const css::script::ModuleInfo& mInfo, bool bIsVBACompat ); - virtual ~SbUserFormModule(); + virtual ~SbUserFormModule() override; virtual SbxVariable* Find( const OUString& rName, SbxClassType t ) override; void ResetApiObj( bool bTriggerTerminateEvent = true ); void Unload(); |