summaryrefslogtreecommitdiff
path: root/embeddedobj
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 /embeddedobj
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 'embeddedobj')
-rw-r--r--embeddedobj/source/inc/docholder.hxx2
-rw-r--r--embeddedobj/source/inc/dummyobject.hxx2
-rw-r--r--embeddedobj/source/inc/intercept.hxx2
-rw-r--r--embeddedobj/source/msole/ownview.cxx2
4 files changed, 4 insertions, 4 deletions
diff --git a/embeddedobj/source/inc/docholder.hxx b/embeddedobj/source/inc/docholder.hxx
index 31bd6d58c28b..38e6f09c0c32 100644
--- a/embeddedobj/source/inc/docholder.hxx
+++ b/embeddedobj/source/inc/docholder.hxx
@@ -117,7 +117,7 @@ public:
DocumentHolder( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext,
OCommonEmbeddedObject* pEmbObj );
- ~DocumentHolder();
+ virtual ~DocumentHolder();
OCommonEmbeddedObject* GetEmbedObject() { return m_pEmbedObj; }
diff --git a/embeddedobj/source/inc/dummyobject.hxx b/embeddedobj/source/inc/dummyobject.hxx
index d8eda574a7bf..9c6163a7ba47 100644
--- a/embeddedobj/source/inc/dummyobject.hxx
+++ b/embeddedobj/source/inc/dummyobject.hxx
@@ -82,7 +82,7 @@ public:
, m_bWaitSaveCompleted( sal_False )
{}
- ~ODummyEmbeddedObject();
+ virtual ~ODummyEmbeddedObject();
// XEmbeddedObject
diff --git a/embeddedobj/source/inc/intercept.hxx b/embeddedobj/source/inc/intercept.hxx
index a2291fb03703..5eafe0976ec5 100644
--- a/embeddedobj/source/inc/intercept.hxx
+++ b/embeddedobj/source/inc/intercept.hxx
@@ -38,7 +38,7 @@ class Interceptor : public ::cppu::WeakImplHelper3< ::com::sun::star::frame::XDi
public:
Interceptor( DocumentHolder* pDocHolder );
- ~Interceptor();
+ virtual ~Interceptor();
void DisconnectDocHolder();
// overwritten to release the statuslistner.
diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx
index 5e14b2f1dda2..8f2657a4930e 100644
--- a/embeddedobj/source/msole/ownview.cxx
+++ b/embeddedobj/source/msole/ownview.cxx
@@ -61,7 +61,7 @@ class DummyHandler_Impl : public ::cppu::WeakImplHelper1< task::XInteractionHand
{
public:
DummyHandler_Impl() {}
- ~DummyHandler_Impl();
+ virtual ~DummyHandler_Impl();
virtual void SAL_CALL handle( const uno::Reference< task::XInteractionRequest >& xRequest )
throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE;