summaryrefslogtreecommitdiff
path: root/basic/source/inc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-04-01 19:18:35 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-04-01 19:22:54 +0200
commit362d4f0cd4e50111edfae9d30c90602c37ed65a2 (patch)
tree0b432c049d580dcac6130bca9fb028bab8af8fa8 /basic/source/inc
parentb66d87086804460c1986df1b832fd6b2ea075a90 (diff)
Explicitly mark overriding destructors as "virtual"
It appears that the C++ standard allows overriding destructors to be marked "override," but at least some MSVC versions complain about it, so at least make sure such destructors are explicitly marked "virtual." Change-Id: I0e1cafa7584fd16ebdce61f569eae2373a71b0a1
Diffstat (limited to 'basic/source/inc')
-rw-r--r--basic/source/inc/errobject.hxx2
-rw-r--r--basic/source/inc/namecont.hxx2
-rw-r--r--basic/source/inc/sbunoobj.hxx4
-rw-r--r--basic/source/inc/stdobj.hxx2
4 files changed, 5 insertions, 5 deletions
diff --git a/basic/source/inc/errobject.hxx b/basic/source/inc/errobject.hxx
index 5e96e694b829..f76b8d2de421 100644
--- a/basic/source/inc/errobject.hxx
+++ b/basic/source/inc/errobject.hxx
@@ -29,7 +29,7 @@ class SbxErrObject : public SbUnoObject
com::sun::star::uno::Reference< ooo::vba::XErrObject > m_xErr;
SbxErrObject( const OUString& aName_, const com::sun::star::uno::Any& aUnoObj_ );
- ~SbxErrObject();
+ virtual ~SbxErrObject();
class ErrObject* getImplErrObject( void )
{ return m_pErrObject; }
diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index 6c0c435286ef..8ba6c7cb23c6 100644
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
@@ -370,7 +370,7 @@ private:
public:
SfxLibraryContainer( void );
- ~SfxLibraryContainer();
+ virtual ~SfxLibraryContainer();
// Interface to set the BasicManager (Hack for password implementation)
diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx
index 50032f84dcf6..ae9cb67ee3d3 100644
--- a/basic/source/inc/sbunoobj.hxx
+++ b/basic/source/inc/sbunoobj.hxx
@@ -84,7 +84,7 @@ public:
StructRefInfo getStructMember( const OUString& rMember );
StructRefInfo getStructInfo() { return maMemberInfo; }
SbUnoStructRefObject( const OUString& aName_, const StructRefInfo& rMemberInfo );
- ~SbUnoStructRefObject();
+ virtual ~SbUnoStructRefObject();
// Find overloaded to support e. g. NameAccess
virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE;
@@ -121,7 +121,7 @@ public:
static bool getDefaultPropName( SbUnoObject* pUnoObj, OUString& sDfltProp );
TYPEINFO_OVERRIDE();
SbUnoObject( const OUString& aName_, const ::com::sun::star::uno::Any& aUnoObj_ );
- ~SbUnoObject();
+ virtual ~SbUnoObject();
// #76470 do introspection on demand
void doIntrospection( void );
diff --git a/basic/source/inc/stdobj.hxx b/basic/source/inc/stdobj.hxx
index 3efdebcbf0a0..52b144196607 100644
--- a/basic/source/inc/stdobj.hxx
+++ b/basic/source/inc/stdobj.hxx
@@ -29,7 +29,7 @@ class SbiStdObject : public SbxObject
{
SbStdFactory* pStdFactory;
- ~SbiStdObject();
+ virtual ~SbiStdObject();
using SbxVariable::GetInfo;
SbxInfo* GetInfo( short );
virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,