diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:09:01 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:19:22 +0200 |
commit | 91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch) | |
tree | d634de3a1a6820904b5699c2136b79b1a5a807c7 /cui/source/inc/srchxtra.hxx | |
parent | 6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (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 'cui/source/inc/srchxtra.hxx')
-rw-r--r-- | cui/source/inc/srchxtra.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cui/source/inc/srchxtra.hxx b/cui/source/inc/srchxtra.hxx index e2e0f36913cf..85f889920cc9 100644 --- a/cui/source/inc/srchxtra.hxx +++ b/cui/source/inc/srchxtra.hxx @@ -30,7 +30,7 @@ class SvxSearchFormatDialog : public SfxTabDialog { public: SvxSearchFormatDialog( vcl::Window* pParent, const SfxItemSet& rSet ); - virtual ~SvxSearchFormatDialog(); + virtual ~SvxSearchFormatDialog() override; virtual void dispose() override; protected: @@ -51,7 +51,7 @@ class SvxSearchAttributeDialog : public ModalDialog public: SvxSearchAttributeDialog( vcl::Window* pParent, SearchAttrItemList& rLst, const sal_uInt16* pWhRanges ); - virtual ~SvxSearchAttributeDialog(); + virtual ~SvxSearchAttributeDialog() override; virtual void dispose() override; private: @@ -79,7 +79,7 @@ public: sal_uInt16 nOther, sal_uInt16 nShorter, sal_uInt16 nLonger ); - virtual ~SvxSearchSimilarityDialog(); + virtual ~SvxSearchSimilarityDialog() override; virtual void dispose() override; sal_uInt16 GetOther() { return (sal_uInt16)m_pOtherFld->GetValue(); } |