diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-04-01 19:18:35 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-04-01 19:22:54 +0200 |
commit | 362d4f0cd4e50111edfae9d30c90602c37ed65a2 (patch) | |
tree | 0b432c049d580dcac6130bca9fb028bab8af8fa8 /basic | |
parent | b66d87086804460c1986df1b832fd6b2ea075a90 (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')
-rw-r--r-- | basic/inc/sbstdobj.hxx | 6 | ||||
-rw-r--r-- | basic/qa/cppunit/basic_coverage.cxx | 2 | ||||
-rw-r--r-- | basic/qa/cppunit/test_vba.cxx | 2 | ||||
-rw-r--r-- | basic/source/classes/errobject.cxx | 2 | ||||
-rw-r--r-- | basic/source/classes/sbunoobj.cxx | 4 | ||||
-rw-r--r-- | basic/source/inc/errobject.hxx | 2 | ||||
-rw-r--r-- | basic/source/inc/namecont.hxx | 2 | ||||
-rw-r--r-- | basic/source/inc/sbunoobj.hxx | 4 | ||||
-rw-r--r-- | basic/source/inc/stdobj.hxx | 2 | ||||
-rw-r--r-- | basic/source/runtime/iosys.cxx | 4 |
10 files changed, 15 insertions, 15 deletions
diff --git a/basic/inc/sbstdobj.hxx b/basic/inc/sbstdobj.hxx index 9fdce98b96f8..c9a5169599a0 100644 --- a/basic/inc/sbstdobj.hxx +++ b/basic/inc/sbstdobj.hxx @@ -40,7 +40,7 @@ class BASIC_DLLPUBLIC SbStdPicture : public SbxObject protected: Graphic aGraphic; - ~SbStdPicture(); + virtual ~SbStdPicture(); virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType ) SAL_OVERRIDE; @@ -69,7 +69,7 @@ protected: sal_uInt16 nSize; OUString aName; - ~SbStdFont(); + virtual ~SbStdFont(); virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType ) SAL_OVERRIDE; @@ -105,7 +105,7 @@ class BASIC_DLLPUBLIC SbStdClipboard : public SbxObject { protected: - ~SbStdClipboard(); + virtual ~SbStdClipboard(); virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType ) SAL_OVERRIDE; diff --git a/basic/qa/cppunit/basic_coverage.cxx b/basic/qa/cppunit/basic_coverage.cxx index 8e145d0aea16..7e8fd225239d 100644 --- a/basic/qa/cppunit/basic_coverage.cxx +++ b/basic/qa/cppunit/basic_coverage.cxx @@ -32,7 +32,7 @@ private: public: Coverage(); - ~Coverage(); + virtual ~Coverage(); void Coverage_Iterator(); diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx index ca398561c4df..846cebbdaa77 100644 --- a/basic/qa/cppunit/test_vba.cxx +++ b/basic/qa/cppunit/test_vba.cxx @@ -20,7 +20,7 @@ namespace { public: VBATest() : BootstrapFixture(true, false) {} - ~VBATest(){} + virtual ~VBATest(){} void testMiscVBAFunctions(); void testMiscOLEStuff(); // Adds code needed to register the test suite 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 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, diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index be07963fd2a8..cde1af0884e3 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -312,7 +312,7 @@ class OslStream : public SvStream public: OslStream( const OUString& rName, short nStrmMode ); - ~OslStream(); + virtual ~OslStream(); virtual sal_Size GetData( void* pData, sal_Size nSize ) SAL_OVERRIDE; virtual sal_Size PutData( const void* pData, sal_Size nSize ) SAL_OVERRIDE; virtual sal_uInt64 SeekPos( sal_uInt64 nPos ) SAL_OVERRIDE; @@ -408,7 +408,7 @@ class UCBStream : public SvStream public: UCBStream( Reference< XInputStream > & xIS ); UCBStream( Reference< XStream > & xS ); - ~UCBStream(); + virtual ~UCBStream(); virtual sal_Size GetData( void* pData, sal_Size nSize ) SAL_OVERRIDE; virtual sal_Size PutData( const void* pData, sal_Size nSize ) SAL_OVERRIDE; virtual sal_uInt64 SeekPos( sal_uInt64 nPos ) SAL_OVERRIDE; |