summaryrefslogtreecommitdiff
path: root/svx/source/inc/filtnav.hxx
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 /svx/source/inc/filtnav.hxx
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 'svx/source/inc/filtnav.hxx')
-rw-r--r--svx/source/inc/filtnav.hxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx
index e386c50aba87..35ebbe57595e 100644
--- a/svx/source/inc/filtnav.hxx
+++ b/svx/source/inc/filtnav.hxx
@@ -85,7 +85,7 @@ public:
FmParentData(FmParentData* pParent, const OUString& rText)
: FmFilterData(pParent, rText)
{}
- virtual ~FmParentData();
+ virtual ~FmParentData() override;
::std::vector< FmFilterData* >& GetChildren() { return m_aChildren; }
};
@@ -161,7 +161,7 @@ class FmFilterModel : public FmParentData
public:
FmFilterModel();
- virtual ~FmFilterModel();
+ virtual ~FmFilterModel() override;
void Update(const css::uno::Reference< css::container::XIndexAccess > & xControllers, const css::uno::Reference< css::form::runtime::XFormController > & xCurrent);
void Clear();
@@ -243,7 +243,7 @@ class FmFilterNavigator : public SvTreeListBox, public SfxListener
public:
FmFilterNavigator( vcl::Window* pParent );
- virtual ~FmFilterNavigator();
+ virtual ~FmFilterNavigator() override;
virtual void dispose() override;
void UpdateContent(
@@ -316,7 +316,7 @@ protected:
public:
FmFilterNavigatorWin( SfxBindings *pBindings, SfxChildWindow *pMgr,
vcl::Window* pParent );
- virtual ~FmFilterNavigatorWin();
+ virtual ~FmFilterNavigatorWin() override;
virtual void dispose() override;
void UpdateContent( FmFormShell* pFormShell );