summaryrefslogtreecommitdiff
path: root/xmlsecurity/inc/macrosecurity.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 /xmlsecurity/inc/macrosecurity.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 'xmlsecurity/inc/macrosecurity.hxx')
-rw-r--r--xmlsecurity/inc/macrosecurity.hxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/xmlsecurity/inc/macrosecurity.hxx b/xmlsecurity/inc/macrosecurity.hxx
index fb308d5a6b97..7a2ac1d11bca 100644
--- a/xmlsecurity/inc/macrosecurity.hxx
+++ b/xmlsecurity/inc/macrosecurity.hxx
@@ -66,7 +66,7 @@ public:
MacroSecurity(vcl::Window* pParent,
const css::uno::Reference< css::uno::XComponentContext>& rxCtx,
const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment);
- virtual ~MacroSecurity();
+ virtual ~MacroSecurity() override;
virtual void dispose() override;
inline void EnableReset(bool _bEnable = true)
@@ -82,7 +82,7 @@ protected:
public:
MacroSecurityTP(vcl::Window* _pParent, const OString& rID,
const OUString& rUIXMLDescription, MacroSecurity* _pDlg);
- virtual ~MacroSecurityTP();
+ virtual ~MacroSecurityTP() override;
virtual void dispose() override;
virtual void ClosePage() = 0;
@@ -103,7 +103,7 @@ protected:
public:
MacroSecurityLevelTP( vcl::Window* pParent, MacroSecurity* _pDlg );
- virtual ~MacroSecurityLevelTP();
+ virtual ~MacroSecurityLevelTP() override;
virtual void dispose() override;
virtual void ClosePage() override;
@@ -139,7 +139,7 @@ private:
public:
MacroSecurityTrustedSourcesTP(vcl::Window* pParent, MacroSecurity* _pDlg);
- virtual ~MacroSecurityTrustedSourcesTP();
+ virtual ~MacroSecurityTrustedSourcesTP() override;
virtual void dispose() override;
virtual void ActivatePage() override;