summaryrefslogtreecommitdiff
path: root/framework/inc/classes
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 /framework/inc/classes
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 'framework/inc/classes')
-rw-r--r--framework/inc/classes/actiontriggercontainer.hxx2
-rw-r--r--framework/inc/classes/actiontriggerpropertyset.hxx2
-rw-r--r--framework/inc/classes/actiontriggerseparatorpropertyset.hxx2
-rw-r--r--framework/inc/classes/imagewrapper.hxx2
-rw-r--r--framework/inc/classes/rootactiontriggercontainer.hxx2
5 files changed, 5 insertions, 5 deletions
diff --git a/framework/inc/classes/actiontriggercontainer.hxx b/framework/inc/classes/actiontriggercontainer.hxx
index 778f6c35dac0..7408392e5a76 100644
--- a/framework/inc/classes/actiontriggercontainer.hxx
+++ b/framework/inc/classes/actiontriggercontainer.hxx
@@ -39,7 +39,7 @@ class FWE_DLLPUBLIC ActionTriggerContainer : public PropertySetContainer,
{
public:
ActionTriggerContainer();
- virtual ~ActionTriggerContainer();
+ virtual ~ActionTriggerContainer() override;
// XInterface
virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType )
diff --git a/framework/inc/classes/actiontriggerpropertyset.hxx b/framework/inc/classes/actiontriggerpropertyset.hxx
index a1cddc6eefd1..7b190399745d 100644
--- a/framework/inc/classes/actiontriggerpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerpropertyset.hxx
@@ -47,7 +47,7 @@ class ActionTriggerPropertySet : private cppu::BaseMutex,
{
public:
FWE_DLLPUBLIC ActionTriggerPropertySet();
- FWE_DLLPUBLIC virtual ~ActionTriggerPropertySet();
+ FWE_DLLPUBLIC virtual ~ActionTriggerPropertySet() override;
// XInterface
virtual FWE_DLLPUBLIC css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType )
diff --git a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
index c50555621571..6addfcd0dfd0 100644
--- a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
@@ -45,7 +45,7 @@ class ActionTriggerSeparatorPropertySet : private cppu::BaseMutex,
{
public:
ActionTriggerSeparatorPropertySet();
- virtual ~ActionTriggerSeparatorPropertySet();
+ virtual ~ActionTriggerSeparatorPropertySet() override;
// XInterface
virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType )
diff --git a/framework/inc/classes/imagewrapper.hxx b/framework/inc/classes/imagewrapper.hxx
index 964907c17d96..41b75fcd93ec 100644
--- a/framework/inc/classes/imagewrapper.hxx
+++ b/framework/inc/classes/imagewrapper.hxx
@@ -36,7 +36,7 @@ class FWE_DLLPUBLIC ImageWrapper :
{
public:
ImageWrapper( const Image& aImage );
- virtual ~ImageWrapper();
+ virtual ~ImageWrapper() override;
const Image& GetImage() const
{
diff --git a/framework/inc/classes/rootactiontriggercontainer.hxx b/framework/inc/classes/rootactiontriggercontainer.hxx
index 53d009cec6ab..131ead076040 100644
--- a/framework/inc/classes/rootactiontriggercontainer.hxx
+++ b/framework/inc/classes/rootactiontriggercontainer.hxx
@@ -43,7 +43,7 @@ class FWE_DLLPUBLIC RootActionTriggerContainer : public PropertySetContainer,
{
public:
RootActionTriggerContainer( const Menu* pMenu, const OUString* pMenuIdentifier);
- virtual ~RootActionTriggerContainer();
+ virtual ~RootActionTriggerContainer() override;
// XInterface
virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType )