summaryrefslogtreecommitdiff
path: root/embeddedobj
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-09-13 13:09:01 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-09-13 13:19:22 +0200
commit91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch)
treed634de3a1a6820904b5699c2136b79b1a5a807c7 /embeddedobj
parent6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (diff)
loplugin:override: No more need for the "MSVC dtor override" workaround
The issue of 362d4f0cd4e50111edfae9d30c90602c37ed65a2 "Explicitly mark overriding destructors as 'virtual'" appears to no longer be a problem with MSVC 2013. (The little change in the rewriting code of compilerplugins/clang/override.cxx was necessary to prevent an endless loop when adding "override" to OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager(); in chart2/source/inc/LifeTime.hxx, getting stuck in the leading OOO_DLLPUBLIC_CHARTTOOLS macro. Can't remember what that isAtEndOfImmediateMacroExpansion thing was originally necessary for, anyway.) Change-Id: I534c634504d7216b9bb632c2775c04eaf27e927e
Diffstat (limited to 'embeddedobj')
-rw-r--r--embeddedobj/source/inc/commonembobj.hxx2
-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/inc/oleembobj.hxx2
-rw-r--r--embeddedobj/source/msole/ownview.cxx2
-rw-r--r--embeddedobj/source/msole/ownview.hxx2
7 files changed, 7 insertions, 7 deletions
diff --git a/embeddedobj/source/inc/commonembobj.hxx b/embeddedobj/source/inc/commonembobj.hxx
index 72217defd907..174e110b3d10 100644
--- a/embeddedobj/source/inc/commonembobj.hxx
+++ b/embeddedobj/source/inc/commonembobj.hxx
@@ -238,7 +238,7 @@ public:
const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescr,
const css::uno::Sequence< css::beans::PropertyValue >& aObjectDescr );
- virtual ~OCommonEmbeddedObject();
+ virtual ~OCommonEmbeddedObject() override;
void SaveObject_Impl();
diff --git a/embeddedobj/source/inc/docholder.hxx b/embeddedobj/source/inc/docholder.hxx
index 3e627257e31e..2fac504a68ce 100644
--- a/embeddedobj/source/inc/docholder.hxx
+++ b/embeddedobj/source/inc/docholder.hxx
@@ -115,7 +115,7 @@ public:
DocumentHolder( const css::uno::Reference< css::uno::XComponentContext >& xContext,
OCommonEmbeddedObject* pEmbObj );
- virtual ~DocumentHolder();
+ virtual ~DocumentHolder() override;
OCommonEmbeddedObject* GetEmbedObject() { return m_pEmbedObj; }
diff --git a/embeddedobj/source/inc/dummyobject.hxx b/embeddedobj/source/inc/dummyobject.hxx
index 4e2d90f29a3b..afec254ff13f 100644
--- a/embeddedobj/source/inc/dummyobject.hxx
+++ b/embeddedobj/source/inc/dummyobject.hxx
@@ -87,7 +87,7 @@ public:
, m_bWaitSaveCompleted( false )
{}
- virtual ~ODummyEmbeddedObject();
+ virtual ~ODummyEmbeddedObject() override;
// XEmbeddedObject
diff --git a/embeddedobj/source/inc/intercept.hxx b/embeddedobj/source/inc/intercept.hxx
index 7df7f686d741..c71f441daeb6 100644
--- a/embeddedobj/source/inc/intercept.hxx
+++ b/embeddedobj/source/inc/intercept.hxx
@@ -38,7 +38,7 @@ class Interceptor : public ::cppu::WeakImplHelper< css::frame::XDispatchProvider
public:
Interceptor( DocumentHolder* pDocHolder );
- virtual ~Interceptor();
+ virtual ~Interceptor() override;
void DisconnectDocHolder();
diff --git a/embeddedobj/source/inc/oleembobj.hxx b/embeddedobj/source/inc/oleembobj.hxx
index 6b914f47172b..d30b17cea6bf 100644
--- a/embeddedobj/source/inc/oleembobj.hxx
+++ b/embeddedobj/source/inc/oleembobj.hxx
@@ -295,7 +295,7 @@ public:
OleEmbeddedObject( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory );
#endif
- virtual ~OleEmbeddedObject();
+ virtual ~OleEmbeddedObject() override;
#ifdef _WIN32
void OnIconChanged_Impl();
diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx
index 6d81bef30754..352279d01534 100644
--- a/embeddedobj/source/msole/ownview.cxx
+++ b/embeddedobj/source/msole/ownview.cxx
@@ -53,7 +53,7 @@ class DummyHandler_Impl : public ::cppu::WeakImplHelper< task::XInteractionHandl
{
public:
DummyHandler_Impl() {}
- virtual ~DummyHandler_Impl();
+ virtual ~DummyHandler_Impl() override;
virtual void SAL_CALL handle( const uno::Reference< task::XInteractionRequest >& xRequest )
throw( uno::RuntimeException, std::exception ) override;
diff --git a/embeddedobj/source/msole/ownview.hxx b/embeddedobj/source/msole/ownview.hxx
index 8c25b0982812..8878583bf5c7 100644
--- a/embeddedobj/source/msole/ownview.hxx
+++ b/embeddedobj/source/msole/ownview.hxx
@@ -64,7 +64,7 @@ public:
OwnView_Impl( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory,
const css::uno::Reference< css::io::XInputStream >& xStream );
- virtual ~OwnView_Impl();
+ virtual ~OwnView_Impl() override;
bool Open();