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 /include/basic | |
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 'include/basic')
-rw-r--r-- | include/basic/basmgr.hxx | 2 | ||||
-rw-r--r-- | include/basic/sbmeth.hxx | 4 | ||||
-rw-r--r-- | include/basic/sbmod.hxx | 4 | ||||
-rw-r--r-- | include/basic/sbstar.hxx | 2 | ||||
-rw-r--r-- | include/basic/sbx.hxx | 12 | ||||
-rw-r--r-- | include/basic/sbxcore.hxx | 2 | ||||
-rw-r--r-- | include/basic/sbxmeth.hxx | 2 | ||||
-rw-r--r-- | include/basic/sbxobj.hxx | 2 | ||||
-rw-r--r-- | include/basic/sbxprop.hxx | 2 | ||||
-rw-r--r-- | include/basic/sbxvar.hxx | 4 |
10 files changed, 18 insertions, 18 deletions
diff --git a/include/basic/basmgr.hxx b/include/basic/basmgr.hxx index c6a54016d599..baf6d56715fd 100644 --- a/include/basic/basmgr.hxx +++ b/include/basic/basmgr.hxx @@ -129,7 +129,7 @@ protected: static bool ImplEncryptStream( SvStream& rStream ); BasicLibInfo* FindLibInfo( StarBASIC* pBasic ); static void CheckModules( StarBASIC* pBasic, bool bReference ); - virtual ~BasicManager(); + virtual ~BasicManager() override; public: BasicManager( SotStorage& rStorage, const OUString& rBaseURL, StarBASIC* pParentFromStdLib = nullptr, OUString* pLibPath = nullptr, bool bDocMgr = false ); diff --git a/include/basic/sbmeth.hxx b/include/basic/sbmeth.hxx index a49bcf245c26..49f22199b37e 100644 --- a/include/basic/sbmeth.hxx +++ b/include/basic/sbmeth.hxx @@ -48,7 +48,7 @@ class BASIC_DLLPUBLIC SbMethod : public SbxMethod BASIC_DLLPRIVATE SbMethod( const SbMethod& ); virtual bool LoadData( SvStream&, sal_uInt16 ) override; virtual bool StoreData( SvStream& ) const override; - virtual ~SbMethod(); + virtual ~SbMethod() override; public: SBX_DECL_PERSIST_NODATA(SBXID_BASICMETHOD,2); @@ -78,7 +78,7 @@ public: : SbMethod( rName, pImplMeth->GetType(), nullptr ) , mxImplMeth( pImplMeth ) {} - virtual ~SbIfaceMapperMethod(); + virtual ~SbIfaceMapperMethod() override; SbMethod* getImplMethod() { return mxImplMeth; } }; diff --git a/include/basic/sbmod.hxx b/include/basic/sbmod.hxx index ca6f57f1e701..3ac306a6d487 100644 --- a/include/basic/sbmod.hxx +++ b/include/basic/sbmod.hxx @@ -92,7 +92,7 @@ protected: virtual bool LoadCompleted() override; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; void handleProcedureProperties( SfxBroadcaster& rBC, const SfxHint& rHint ); - virtual ~SbModule(); + virtual ~SbModule() override; public: SBX_DECL_PERSIST_NODATA(SBXID_BASICMOD,2); SbModule( const OUString&, bool bCompat = false ); @@ -147,7 +147,7 @@ class BASIC_DLLPUBLIC SbClassModuleObject : public SbModule public: SbClassModuleObject( SbModule* pClassModule ); - virtual ~SbClassModuleObject(); + virtual ~SbClassModuleObject() override; // Overridden to support NameAccess etc. virtual SbxVariable* Find( const OUString&, SbxClassType ) override; diff --git a/include/basic/sbstar.hxx b/include/basic/sbstar.hxx index 3ec0693a6bd6..814e47812daa 100644 --- a/include/basic/sbstar.hxx +++ b/include/basic/sbstar.hxx @@ -81,7 +81,7 @@ private: protected: bool ErrorHdl(); sal_uInt16 BreakHdl(); - virtual ~StarBASIC(); + virtual ~StarBASIC() override; public: diff --git a/include/basic/sbx.hxx b/include/basic/sbx.hxx index ac0f80bce160..96fe6dbff9b1 100644 --- a/include/basic/sbx.hxx +++ b/include/basic/sbx.hxx @@ -76,7 +76,7 @@ class BASIC_DLLPUBLIC SbxInfo : public SvRefBase protected: void LoadData( SvStream&, sal_uInt16 ); void StoreData( SvStream& ) const; - virtual ~SbxInfo(); + virtual ~SbxInfo() override; public: SbxInfo(); SbxInfo( const OUString&, sal_uInt32 ); @@ -102,7 +102,7 @@ public: class BASIC_DLLPUBLIC SbxAlias : public SbxVariable, public SfxListener { SbxVariableRef xAlias; - virtual ~SbxAlias(); + virtual ~SbxAlias() override; virtual void Broadcast( sal_uInt32 ) override; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; public: @@ -128,7 +128,7 @@ class BASIC_DLLPUBLIC SbxArray : public SbxBase protected: SbxDataType eType; // Data type of the array - virtual ~SbxArray(); + virtual ~SbxArray() override; virtual bool LoadData( SvStream&, sal_uInt16 ) override; virtual bool StoreData( SvStream& ) const override; @@ -178,7 +178,7 @@ protected: sal_uInt32 Offset32( SbxArray* ); virtual bool LoadData( SvStream&, sal_uInt16 ) override; virtual bool StoreData( SvStream& ) const override; - virtual ~SbxDimArray(); + virtual ~SbxDimArray() override; public: SBX_DECL_PERSIST_NODATA(SBXID_DIMARRAY,1); SbxDimArray( SbxDataType=SbxVARIANT ); @@ -213,7 +213,7 @@ class BASIC_DLLPUBLIC SbxCollection : public SbxObject { BASIC_DLLPRIVATE void Initialize(); protected: - virtual ~SbxCollection(); + virtual ~SbxCollection() override; virtual bool LoadData( SvStream&, sal_uInt16 ) override; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // Overridable methods (why not pure virtual?): @@ -236,7 +236,7 @@ class BASIC_DLLPUBLIC SbxStdCollection : public SbxCollection protected: OUString aElemClass; bool bAddRemoveOk; - virtual ~SbxStdCollection(); + virtual ~SbxStdCollection() override; virtual bool LoadData( SvStream&, sal_uInt16 ) override; virtual bool StoreData( SvStream& ) const override; virtual void CollAdd( SbxArray* pPar ) override; diff --git a/include/basic/sbxcore.hxx b/include/basic/sbxcore.hxx index d6d6a9097ff5..afa7e393f56c 100644 --- a/include/basic/sbxcore.hxx +++ b/include/basic/sbxcore.hxx @@ -50,7 +50,7 @@ protected: SbxBase(); SbxBase( const SbxBase& ); SbxBase& operator=( const SbxBase& ); - virtual ~SbxBase(); + virtual ~SbxBase() override; virtual sal_uInt16 GetVersion() const = 0; virtual sal_uInt16 GetSbxId() const = 0; diff --git a/include/basic/sbxmeth.hxx b/include/basic/sbxmeth.hxx index 81de1fb78119..b32a40f1454f 100644 --- a/include/basic/sbxmeth.hxx +++ b/include/basic/sbxmeth.hxx @@ -31,7 +31,7 @@ public: SBX_DECL_PERSIST_NODATA(SBXID_METHOD,1); SbxMethod( const OUString& r, SbxDataType t, bool bIsRuntimeFunction=false ); SbxMethod( const SbxMethod& r ); - virtual ~SbxMethod(); + virtual ~SbxMethod() override; SbxMethod& operator=( const SbxMethod& r ) { SbxVariable::operator=( r ); return *this; } virtual SbxClassType GetClass() const override; bool IsRuntimeFunction() const { return mbIsRuntimeFunction; } diff --git a/include/basic/sbxobj.hxx b/include/basic/sbxobj.hxx index 5115b7107fa2..6a0cf20ca2c9 100644 --- a/include/basic/sbxobj.hxx +++ b/include/basic/sbxobj.hxx @@ -39,7 +39,7 @@ protected: OUString aDfltPropName; virtual bool LoadData( SvStream&, sal_uInt16 ) override; virtual bool StoreData( SvStream& ) const override; - virtual ~SbxObject(); + virtual ~SbxObject() override; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; public: SBX_DECL_PERSIST_NODATA(SBXID_OBJECT,1); diff --git a/include/basic/sbxprop.hxx b/include/basic/sbxprop.hxx index 9f72d9fdbe61..4f23088273b3 100644 --- a/include/basic/sbxprop.hxx +++ b/include/basic/sbxprop.hxx @@ -29,7 +29,7 @@ public: SBX_DECL_PERSIST_NODATA(SBXID_PROPERTY,1); SbxProperty( const OUString& r, SbxDataType t ); SbxProperty( const SbxProperty& r ) : SvRefBase( r ), SbxVariable( r ) {} - virtual ~SbxProperty(); + virtual ~SbxProperty() override; SbxProperty& operator=( const SbxProperty& r ) { SbxVariable::operator=( r ); return *this; } virtual SbxClassType GetClass() const override; diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx index 4f7765009ad7..4a625d1b8c8e 100644 --- a/include/basic/sbxvar.hxx +++ b/include/basic/sbxvar.hxx @@ -84,7 +84,7 @@ protected: OUString aToolString; // tool string copy virtual void Broadcast( sal_uInt32 ); // Broadcast-Call - virtual ~SbxValue(); + virtual ~SbxValue() override; virtual bool LoadData( SvStream&, sal_uInt16 ) override; virtual bool StoreData( SvStream& ) const override; public: @@ -236,7 +236,7 @@ protected: SbxInfoRef pInfo; // Probably called information sal_uInt32 nUserData; // User data for Call() SbxObject* pParent; // Currently attached object - virtual ~SbxVariable(); + virtual ~SbxVariable() override; virtual bool LoadData( SvStream&, sal_uInt16 ) override; virtual bool StoreData( SvStream& ) const override; public: |