summaryrefslogtreecommitdiff
path: root/include/framework
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 /include/framework
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 'include/framework')
-rw-r--r--include/framework/addonmenu.hxx4
-rw-r--r--include/framework/dispatchhelper.hxx2
-rw-r--r--include/framework/preventduplicateinteraction.hxx2
-rw-r--r--include/framework/titlehelper.hxx2
4 files changed, 5 insertions, 5 deletions
diff --git a/include/framework/addonmenu.hxx b/include/framework/addonmenu.hxx
index a8478ed9660a..136aa88cad9f 100644
--- a/include/framework/addonmenu.hxx
+++ b/include/framework/addonmenu.hxx
@@ -38,7 +38,7 @@ class FWE_DLLPUBLIC AddonMenu : public PopupMenu
{
public:
AddonMenu( const css::uno::Reference< css::frame::XFrame >& rFrame );
- virtual ~AddonMenu();
+ virtual ~AddonMenu() override;
protected:
css::uno::Reference< css::frame::XFrame > m_xFrame;
@@ -49,7 +49,7 @@ class AddonMenuManager;
class FWE_DLLPUBLIC AddonPopupMenu : public AddonMenu
{
public:
- virtual ~AddonPopupMenu();
+ virtual ~AddonPopupMenu() override;
// Check if command URL string has the unique prefix to identify addon popup menus
static bool IsCommandURLPrefix( const OUString& aCmdURL );
diff --git a/include/framework/dispatchhelper.hxx b/include/framework/dispatchhelper.hxx
index 2b4c79bf7c57..f1e28e803ea3 100644
--- a/include/framework/dispatchhelper.hxx
+++ b/include/framework/dispatchhelper.hxx
@@ -70,7 +70,7 @@ class FWE_DLLPUBLIC DispatchHelper : public ::cppu::WeakImplHelper< css::lang::X
// ctor/dtor
DispatchHelper( const css::uno::Reference< css::uno::XComponentContext >& xContext );
- virtual ~DispatchHelper( );
+ virtual ~DispatchHelper( ) override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName ( ) throw( css::uno::RuntimeException, std::exception ) override;
diff --git a/include/framework/preventduplicateinteraction.hxx b/include/framework/preventduplicateinteraction.hxx
index cf6ac0058eda..33ed071cdd3c 100644
--- a/include/framework/preventduplicateinteraction.hxx
+++ b/include/framework/preventduplicateinteraction.hxx
@@ -169,7 +169,7 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2
/**
@short dtor to free used memory.
*/
- virtual ~PreventDuplicateInteraction();
+ virtual ~PreventDuplicateInteraction() override;
/**
diff --git a/include/framework/titlehelper.hxx b/include/framework/titlehelper.hxx
index e5f351898322..48c05c92bf93 100644
--- a/include/framework/titlehelper.hxx
+++ b/include/framework/titlehelper.hxx
@@ -69,7 +69,7 @@ class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex
/** @short free all internally used resources.
*/
- virtual ~TitleHelper();
+ virtual ~TitleHelper() override;
/** set an outside component which uses this container and must be set