summaryrefslogtreecommitdiff
path: root/include/basic/sbx.hxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-09-13 13:09:01 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-09-13 13:19:22 +0200
commit91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch)
treed634de3a1a6820904b5699c2136b79b1a5a807c7 /include/basic/sbx.hxx
parent6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (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/sbx.hxx')
-rw-r--r--include/basic/sbx.hxx12
1 files changed, 6 insertions, 6 deletions
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;