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 | |
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')
-rw-r--r-- | basic/inc/sbobjmod.hxx | 4 | ||||
-rw-r--r-- | basic/inc/sbprop.hxx | 4 | ||||
-rw-r--r-- | basic/inc/sbstdobj.hxx | 6 |
3 files changed, 7 insertions, 7 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(); diff --git a/basic/inc/sbprop.hxx b/basic/inc/sbprop.hxx index 2d4418068fd5..236a34e671f9 100644 --- a/basic/inc/sbprop.hxx +++ b/basic/inc/sbprop.hxx @@ -33,7 +33,7 @@ class BASIC_DLLPUBLIC SbProperty : public SbxProperty friend class SbProcedureProperty; SbModule* pMod; BASIC_DLLPRIVATE SbProperty( const OUString&, SbxDataType, SbModule* ); - virtual ~SbProperty(); + virtual ~SbProperty() override; public: SBX_DECL_PERSIST_NODATA(SBXID_BASICPROP,1); SbModule* GetModule() { return pMod; } @@ -45,7 +45,7 @@ class BASIC_DLLPUBLIC SbProcedureProperty : public SbxProperty { bool mbSet; // Flag for set command - virtual ~SbProcedureProperty(); + virtual ~SbProcedureProperty() override; public: SbProcedureProperty( const OUString& r, SbxDataType t ) diff --git a/basic/inc/sbstdobj.hxx b/basic/inc/sbstdobj.hxx index cd420ac32e29..b0840a84a3a6 100644 --- a/basic/inc/sbstdobj.hxx +++ b/basic/inc/sbstdobj.hxx @@ -40,7 +40,7 @@ class BASIC_DLLPUBLIC SbStdPicture : public SbxObject protected: Graphic aGraphic; - virtual ~SbStdPicture(); + virtual ~SbStdPicture() override; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; void PropType( SbxVariable* pVar, SbxArray* pPar, bool bWrite ); @@ -66,7 +66,7 @@ protected: sal_uInt16 nSize; OUString aName; - virtual ~SbStdFont(); + virtual ~SbStdFont() override; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; void PropBold( SbxVariable* pVar, SbxArray* pPar, bool bWrite ); @@ -99,7 +99,7 @@ class BASIC_DLLPUBLIC SbStdClipboard : public SbxObject { protected: - virtual ~SbStdClipboard(); + virtual ~SbStdClipboard() override; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; static void MethClear( SbxVariable* pVar, SbxArray* pPar_, bool bWrite ); |