summaryrefslogtreecommitdiff
path: root/include/svx/ctredlin.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/ctredlin.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/ctredlin.hxx')
-rw-r--r--include/svx/ctredlin.hxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index 807c4f32de55..50aa6544fac3 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -57,7 +57,7 @@ class SAL_WARN_UNUSED SvxRedlinEntry : public SvTreeListEntry
{
public:
SvxRedlinEntry();
- virtual ~SvxRedlinEntry();
+ virtual ~SvxRedlinEntry() override;
};
/// Class for the representation of Strings depending on the font.
@@ -70,7 +70,7 @@ private:
public:
SvLBoxColorString( const OUString& rStr, const Color& rCol);
SvLBoxColorString();
- virtual ~SvLBoxColorString();
+ virtual ~SvLBoxColorString() override;
/** Paint function of the SvLBoxColorString class.
@@ -113,7 +113,7 @@ protected:
public:
SvxRedlinTable(SvSimpleTableContainer& rParent, WinBits nBits = WB_BORDER);
- virtual ~SvxRedlinTable();
+ virtual ~SvxRedlinTable() override;
virtual void dispose() override;
// For FilterPage only {
@@ -209,7 +209,7 @@ protected:
public:
SvxTPFilter( vcl::Window * pParent);
- virtual ~SvxTPFilter();
+ virtual ~SvxTPFilter() override;
virtual void dispose() override;
virtual void DeactivatePage() override;
@@ -298,7 +298,7 @@ private:
public:
SvxTPView(vcl::Window * pParent, VclBuilderContainer *pTopLevel);
- virtual ~SvxTPView();
+ virtual ~SvxTPView() override;
virtual void dispose() override;
void InsertWriterHeader();
@@ -344,7 +344,7 @@ private:
public:
SvxAcceptChgCtr(vcl::Window* pParent, VclBuilderContainer* pTopLevel);
- virtual ~SvxAcceptChgCtr();
+ virtual ~SvxAcceptChgCtr() override;
virtual void dispose() override;
void ShowFilterPage();