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 /comphelper | |
| 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 'comphelper')
| -rw-r--r-- | comphelper/source/eventattachermgr/eventattachermgr.cxx | 2 | ||||
| -rw-r--r-- | comphelper/source/misc/instancelocker.hxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx index 60a50c2c8555..e9492bfb0fac 100644 --- a/comphelper/source/eventattachermgr/eventattachermgr.cxx +++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx @@ -98,7 +98,7 @@ class ImplEventAttacherManager public: ImplEventAttacherManager( const Reference< XIntrospection > & rIntrospection, const Reference< XComponentContext > xContext ); - ~ImplEventAttacherManager(); + virtual ~ImplEventAttacherManager(); // Methods of XEventAttacherManager virtual void SAL_CALL registerScriptEvent(sal_Int32 Index, const ScriptEventDescriptor& ScriptEvent) diff --git a/comphelper/source/misc/instancelocker.hxx b/comphelper/source/misc/instancelocker.hxx index 1787b1c3fcec..56cd2232e18a 100644 --- a/comphelper/source/misc/instancelocker.hxx +++ b/comphelper/source/misc/instancelocker.hxx @@ -56,7 +56,7 @@ class OInstanceLocker : public ::cppu::WeakImplHelper3< ::com::sun::star::lang:: public: OInstanceLocker( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); - ~OInstanceLocker(); + virtual ~OInstanceLocker(); static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); @@ -103,7 +103,7 @@ public: sal_Int32 nMode, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XActionsApproval > xApproval ); - ~OLockListener(); + virtual ~OLockListener(); bool Init(); void Dispose(); |