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/source/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/source/inc')
-rw-r--r-- | basic/source/inc/errobject.hxx | 2 | ||||
-rw-r--r-- | basic/source/inc/namecont.hxx | 2 | ||||
-rw-r--r-- | basic/source/inc/propacc.hxx | 2 | ||||
-rw-r--r-- | basic/source/inc/sbintern.hxx | 2 | ||||
-rw-r--r-- | basic/source/inc/sbjsmeth.hxx | 2 | ||||
-rw-r--r-- | basic/source/inc/sbunoobj.hxx | 12 | ||||
-rw-r--r-- | basic/source/inc/stdobj.hxx | 2 | ||||
-rw-r--r-- | basic/source/inc/symtbl.hxx | 4 |
8 files changed, 14 insertions, 14 deletions
diff --git a/basic/source/inc/errobject.hxx b/basic/source/inc/errobject.hxx index 796b83102269..427f2f1b8715 100644 --- a/basic/source/inc/errobject.hxx +++ b/basic/source/inc/errobject.hxx @@ -29,7 +29,7 @@ class SbxErrObject : public SbUnoObject css::uno::Reference< ooo::vba::XErrObject > m_xErr; SbxErrObject( const OUString& aName_, const css::uno::Any& aUnoObj_ ); - virtual ~SbxErrObject(); + virtual ~SbxErrObject() override; public: static SbxVariableRef const & getErrObject(); diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx index 0a342c33ab41..a09639f82179 100644 --- a/basic/source/inc/namecont.hxx +++ b/basic/source/inc/namecont.hxx @@ -371,7 +371,7 @@ private: public: SfxLibraryContainer(); - virtual ~SfxLibraryContainer(); + virtual ~SfxLibraryContainer() override; // Interface to set the BasicManager (Hack for password implementation) diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx index 10c0547f8e4b..1488625498bb 100644 --- a/basic/source/inc/propacc.hxx +++ b/basic/source/inc/propacc.hxx @@ -44,7 +44,7 @@ private: public: SbPropertyValues(); - virtual ~SbPropertyValues(); + virtual ~SbPropertyValues() override; // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL diff --git a/basic/source/inc/sbintern.hxx b/basic/source/inc/sbintern.hxx index a95a27fdbbab..55d6dd1af5ca 100644 --- a/basic/source/inc/sbintern.hxx +++ b/basic/source/inc/sbintern.hxx @@ -67,7 +67,7 @@ class BASIC_DLLPUBLIC SbClassFactory : public SbxFactory public: SbClassFactory(); - virtual ~SbClassFactory(); + virtual ~SbClassFactory() override; void AddClassModule( SbModule* pClassModule ); void RemoveClassModule( SbModule* pClassModule ); diff --git a/basic/source/inc/sbjsmeth.hxx b/basic/source/inc/sbjsmeth.hxx index c33f47dcd46b..0c7ce3432b51 100644 --- a/basic/source/inc/sbjsmeth.hxx +++ b/basic/source/inc/sbjsmeth.hxx @@ -31,7 +31,7 @@ class SbJScriptMethod : public SbMethod { public: SbJScriptMethod( const OUString&, SbxDataType, SbModule* ); - virtual ~SbJScriptMethod(); + virtual ~SbJScriptMethod() override; SBX_DECL_PERSIST_NODATA(SBXID_JSCRIPTMETH,2); }; diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx index 25775b4e48d4..e1d64f4b6739 100644 --- a/basic/source/inc/sbunoobj.hxx +++ b/basic/source/inc/sbunoobj.hxx @@ -84,7 +84,7 @@ public: StructRefInfo getStructMember( const OUString& rMember ); const StructRefInfo& getStructInfo() { return maMemberInfo; } SbUnoStructRefObject( const OUString& aName_, const StructRefInfo& rMemberInfo ); - virtual ~SbUnoStructRefObject(); + virtual ~SbUnoStructRefObject() override; // override Find to support e. g. NameAccess virtual SbxVariable* Find( const OUString&, SbxClassType ) override; @@ -119,7 +119,7 @@ class SbUnoObject: public SbxObject public: static bool getDefaultPropName( SbUnoObject* pUnoObj, OUString& sDfltProp ); SbUnoObject( const OUString& aName_, const css::uno::Any& aUnoObj_ ); - virtual ~SbUnoObject(); + virtual ~SbUnoObject() override; // #76470 do introspection on demand void doIntrospection(); @@ -166,7 +166,7 @@ public: SbUnoMethod( const OUString& aName_, SbxDataType eSbxType, css::uno::Reference< css::reflection::XIdlMethod > const & xUnoMethod_, bool bInvocation ); - virtual ~SbUnoMethod(); + virtual ~SbUnoMethod() override; virtual SbxInfo* GetInfo() override; const css::uno::Sequence< css::reflection::ParamInfo >& getParamInfos(); @@ -186,7 +186,7 @@ class SbUnoProperty : public SbxProperty bool mbInvocation; // Property is based on invocation SbxDataType mRealType; - virtual ~SbUnoProperty(); + virtual ~SbUnoProperty() override; bool mbUnoStruct; SbUnoProperty( const SbUnoProperty&) = delete; SbUnoProperty& operator = ( const SbUnoProperty&) = delete; @@ -273,7 +273,7 @@ class SbUnoServiceCtor : public SbxMethod public: SbUnoServiceCtor( const OUString& aName_, css::uno::Reference< css::reflection::XServiceConstructorDescription > const & xServiceCtorDesc ); - virtual ~SbUnoServiceCtor(); + virtual ~SbUnoServiceCtor() override; virtual SbxInfo* GetInfo() override; const css::uno::Reference< css::reflection::XServiceConstructorDescription >& getServiceCtorDesc() @@ -353,7 +353,7 @@ class BasicCollection : public SbxObject static SbxInfoRef xItemInfo; void Initialize(); - virtual ~BasicCollection(); + virtual ~BasicCollection() override; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; sal_Int32 implGetIndex( SbxVariable* pIndexVar ); sal_Int32 implGetIndexForName( const OUString& rName ); diff --git a/basic/source/inc/stdobj.hxx b/basic/source/inc/stdobj.hxx index 0d6293f84e4c..12eb8dc31234 100644 --- a/basic/source/inc/stdobj.hxx +++ b/basic/source/inc/stdobj.hxx @@ -29,7 +29,7 @@ class SbiStdObject : public SbxObject { SbStdFactory* pStdFactory; - virtual ~SbiStdObject(); + virtual ~SbiStdObject() override; using SbxVariable::GetInfo; static SbxInfo* GetInfo( short ); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; diff --git a/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx index 1fff808467cb..f1ba8d0028f3 100644 --- a/basic/source/inc/symtbl.hxx +++ b/basic/source/inc/symtbl.hxx @@ -173,7 +173,7 @@ class SbiProcDef : public SbiSymDef { // procedure definition (from basic): bool mbProcDecl : 1; // true: instantiated by SbiParser::ProcDecl public: SbiProcDef( SbiParser*, const OUString&, bool bProcDecl=false ); - virtual ~SbiProcDef(); + virtual ~SbiProcDef() override; virtual SbiProcDef* GetProcDef() override; virtual void SetType( SbxDataType ) override; SbiSymPool& GetParams() { return aParams; } @@ -209,7 +209,7 @@ class SbiConstDef : public SbiSymDef OUString aVal; public: SbiConstDef( const OUString& ); - virtual ~SbiConstDef(); + virtual ~SbiConstDef() override; virtual SbiConstDef* GetConstDef() override; void Set( double, SbxDataType ); void Set( const OUString& ); |