summaryrefslogtreecommitdiff
path: root/include/svx/srchdlg.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 /include/svx/srchdlg.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 'include/svx/srchdlg.hxx')
-rwxr-xr-xinclude/svx/srchdlg.hxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx
index f77f3f55fcab..89a5ee728017 100755
--- a/include/svx/srchdlg.hxx
+++ b/include/svx/srchdlg.hxx
@@ -95,7 +95,7 @@ public:
SvxSearchDialogWrapper( vcl::Window*pParent, sal_uInt16 nId,
SfxBindings* pBindings, SfxChildWinInfo* pInfo );
- virtual ~SvxSearchDialogWrapper ();
+ virtual ~SvxSearchDialogWrapper () override;
SvxSearchDialog *getDialog () { return dialog;}
static void SetSearchLabel(const SearchLabel& rSL);
static void SetSearchLabel(const OUString& sStr);
@@ -121,7 +121,7 @@ friend class SvxJSearchOptionsDialog;
public:
SvxSearchDialog( vcl::Window* pParent, SfxChildWindow* pChildWin, SfxBindings& rBind );
- virtual ~SvxSearchDialog();
+ virtual ~SvxSearchDialog() override;
virtual void dispose() override;
virtual bool Close() override;