summaryrefslogtreecommitdiff
path: root/cui/source/inc/cuigaldlg.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 /cui/source/inc/cuigaldlg.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 'cui/source/inc/cuigaldlg.hxx')
-rw-r--r--cui/source/inc/cuigaldlg.hxx18
1 files changed, 9 insertions, 9 deletions
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 5d81841f20be..64343fbfa1f9 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -68,7 +68,7 @@ private:
const ::std::vector< OUString >& rFormats,
bool bRecursive );
- virtual ~SearchThread();
+ virtual ~SearchThread() override;
virtual void execute() override;
public:
@@ -93,7 +93,7 @@ private:
public:
SearchProgress( vcl::Window* pParent, const INetURLObject& rStartURL );
- virtual ~SearchProgress();
+ virtual ~SearchProgress() override;
virtual void dispose() override;
DECL_LINK_TYPED( CleanUpHdl, void*, void );
@@ -112,7 +112,7 @@ private:
VclPtr<TPGalleryThemeProperties> mpBrowser;
TokenList_impl& mrTakenList;
- virtual ~TakeThread();
+ virtual ~TakeThread() override;
virtual void execute() override;
public:
@@ -139,7 +139,7 @@ private:
public:
TakeProgress( vcl::Window* pWindow );
- virtual ~TakeProgress();
+ virtual ~TakeProgress() override;
virtual void dispose() override;
DECL_LINK_TYPED( CleanUpHdl, void*, void );
@@ -164,7 +164,7 @@ private:
public:
ActualizeProgress( vcl::Window* pWindow, GalleryTheme* pThm );
- virtual ~ActualizeProgress();
+ virtual ~ActualizeProgress() override;
virtual void dispose() override;
virtual short Execute() override;
@@ -176,7 +176,7 @@ private:
VclPtr<Edit> m_pEdit;
public:
TitleDialog(vcl::Window* pParent, const OUString& rOldText);
- virtual ~TitleDialog();
+ virtual ~TitleDialog() override;
virtual void dispose() override;
OUString GetTitle() const { return m_pEdit->GetText(); }
};
@@ -191,7 +191,7 @@ private:
DECL_LINK_TYPED( ClickOkHdl, Button*, void );
public:
GalleryIdDialog( vcl::Window* pParent, GalleryTheme* pThm );
- virtual ~GalleryIdDialog();
+ virtual ~GalleryIdDialog() override;
virtual void dispose() override;
sal_uLong GetId() const { return m_pLbResName->GetSelectEntryPos(); }
};
@@ -228,7 +228,7 @@ private:
public:
TPGalleryThemeGeneral( vcl::Window* pParent, const SfxItemSet& rSet );
- virtual ~TPGalleryThemeGeneral();
+ virtual ~TPGalleryThemeGeneral() override;
virtual void dispose() override;
void SetXChgData( ExchangeData* pData );
@@ -291,7 +291,7 @@ class TPGalleryThemeProperties : public SfxTabPage
public:
TPGalleryThemeProperties( vcl::Window* pWindow, const SfxItemSet& rSet );
- virtual ~TPGalleryThemeProperties();
+ virtual ~TPGalleryThemeProperties() override;
virtual void dispose() override;
void SetXChgData( ExchangeData* pData );