From 362d4f0cd4e50111edfae9d30c90602c37ed65a2 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 1 Apr 2014 19:18:35 +0200 Subject: 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 --- basic/source/classes/errobject.cxx | 2 +- basic/source/classes/sbunoobj.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'basic/source/classes') diff --git a/basic/source/classes/errobject.cxx b/basic/source/classes/errobject.cxx index 91b0b0f4b5f1..e66560a6672a 100644 --- a/basic/source/classes/errobject.cxx +++ b/basic/source/classes/errobject.cxx @@ -39,7 +39,7 @@ class ErrObject : public ErrObjectImpl_BASE public: ErrObject(); - ~ErrObject(); + virtual ~ErrObject(); // Attributes virtual ::sal_Int32 SAL_CALL getNumber() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setNumber( ::sal_Int32 _number ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 4e32d311c34a..82d6081f39d7 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -3904,7 +3904,7 @@ public: OUString aPrefixName; BasicAllListener_Impl( const OUString& aPrefixName ); - ~BasicAllListener_Impl(); + virtual ~BasicAllListener_Impl(); // Methods of XAllListener virtual void SAL_CALL firing(const AllEventObject& Event) throw ( RuntimeException, std::exception ) SAL_OVERRIDE; @@ -4348,7 +4348,7 @@ class ModuleInvocationProxy : public OMutexBasis, public: ModuleInvocationProxy( const OUString& aPrefix, SbxObjectRef xScopeObj ); - ~ModuleInvocationProxy() + virtual ~ModuleInvocationProxy() {} // XInvocation -- cgit v1.2.3