summaryrefslogtreecommitdiff
path: root/xmlsecurity/source/xmlsec
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/source/xmlsec
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/source/xmlsec')
-rw-r--r--xmlsecurity/source/xmlsec/nss/ciphercontext.hxx2
-rw-r--r--xmlsecurity/source/xmlsec/nss/digestcontext.hxx2
-rw-r--r--xmlsecurity/source/xmlsec/nss/nssinitializer.hxx2
-rw-r--r--xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx2
-rw-r--r--xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx2
-rw-r--r--xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx2
-rw-r--r--xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx2
-rw-r--r--xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx2
-rw-r--r--xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx2
-rw-r--r--xmlsecurity/source/xmlsec/serialnumberadapter.cxx2
-rw-r--r--xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx2
-rw-r--r--xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx2
12 files changed, 12 insertions, 12 deletions
diff --git a/xmlsecurity/source/xmlsec/nss/ciphercontext.hxx b/xmlsecurity/source/xmlsec/nss/ciphercontext.hxx
index 8d474b819e1b..9d8d54535caf 100644
--- a/xmlsecurity/source/xmlsec/nss/ciphercontext.hxx
+++ b/xmlsecurity/source/xmlsec/nss/ciphercontext.hxx
@@ -65,7 +65,7 @@ private:
public:
- virtual ~OCipherContext()
+ virtual ~OCipherContext() override
{
Dispose();
}
diff --git a/xmlsecurity/source/xmlsec/nss/digestcontext.hxx b/xmlsecurity/source/xmlsec/nss/digestcontext.hxx
index 56882a57852e..59074b282d08 100644
--- a/xmlsecurity/source/xmlsec/nss/digestcontext.hxx
+++ b/xmlsecurity/source/xmlsec/nss/digestcontext.hxx
@@ -48,7 +48,7 @@ public:
, m_bBroken( false )
{}
- virtual ~ODigestContext();
+ virtual ~ODigestContext() override;
// XDigestContext
diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx
index 9dc198b1a51c..8640544aba5a 100644
--- a/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx
+++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx
@@ -42,7 +42,7 @@ protected:
public:
explicit ONSSInitializer(const css::uno::Reference<css::uno::XComponentContext> &rxContext);
- virtual ~ONSSInitializer();
+ virtual ~ONSSInitializer() override;
static bool initNSS( const css::uno::Reference< css::uno::XComponentContext > &rxContext );
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
index 38ebdf031e44..a6fa7a7b21a5 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
@@ -64,7 +64,7 @@ private:
public:
SecurityEnvironment_NssImpl();
- virtual ~SecurityEnvironment_NssImpl();
+ virtual ~SecurityEnvironment_NssImpl() override;
//Methods from XSecurityEnvironment
diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx
index ecfd4a1674a2..685473283195 100644
--- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx
@@ -37,7 +37,7 @@ class SEInitializer_NssImpl : public cppu::ImplInheritanceHelper
{
public:
explicit SEInitializer_NssImpl(const css::uno::Reference<css::uno::XComponentContext > &rxContext);
- virtual ~SEInitializer_NssImpl();
+ virtual ~SEInitializer_NssImpl() override;
/* XSEInitializer */
virtual css::uno::Reference< css::xml::crypto::XXMLSecurityContext >
diff --git a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx
index 038abe507182..12f23aafad5a 100644
--- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx
@@ -41,7 +41,7 @@ class X509Certificate_NssImpl : public ::cppu::WeakImplHelper<
public:
X509Certificate_NssImpl() ;
- virtual ~X509Certificate_NssImpl() ;
+ virtual ~X509Certificate_NssImpl() override ;
//Methods from XCertificate
virtual sal_Int16 SAL_CALL getVersion( ) throw ( css::uno::RuntimeException, std::exception) override ;
diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx
index 8670ba316fe2..e96b55310421 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx
@@ -40,7 +40,7 @@ class XMLEncryption_NssImpl : public ::cppu::WeakImplHelper<
{
public:
explicit XMLEncryption_NssImpl();
- virtual ~XMLEncryption_NssImpl() ;
+ virtual ~XMLEncryption_NssImpl() override ;
//Methods from XXMLEncryption
virtual css::uno::Reference< css::xml::crypto::XXMLEncryptionTemplate > SAL_CALL encrypt(
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx
index 1ca0e58b6cc9..d01d93580ceb 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx
@@ -47,7 +47,7 @@ class XMLSecurityContext_NssImpl : public ::cppu::WeakImplHelper<
public:
XMLSecurityContext_NssImpl() ;
- virtual ~XMLSecurityContext_NssImpl() ;
+ virtual ~XMLSecurityContext_NssImpl() override ;
//Methods from XXMLSecurityContext
virtual sal_Int32 SAL_CALL addSecurityEnvironment(
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx
index a8ffaf4836fd..2e44b2c5eafd 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx
@@ -40,7 +40,7 @@ class XMLSignature_NssImpl : public ::cppu::WeakImplHelper<
{
public:
explicit XMLSignature_NssImpl();
- virtual ~XMLSignature_NssImpl() ;
+ virtual ~XMLSignature_NssImpl() override ;
//Methods from XXMLSignature
virtual css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate > SAL_CALL generate(
diff --git a/xmlsecurity/source/xmlsec/serialnumberadapter.cxx b/xmlsecurity/source/xmlsec/serialnumberadapter.cxx
index 1772671c8ff2..0917f2717a4d 100644
--- a/xmlsecurity/source/xmlsec/serialnumberadapter.cxx
+++ b/xmlsecurity/source/xmlsec/serialnumberadapter.cxx
@@ -47,7 +47,7 @@ public:
Service& operator=(const Service&) = delete;
private:
- virtual ~Service() {}
+ virtual ~Service() override {}
virtual OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException, std::exception) override
diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
index 8be52ae51358..a48278b30703 100644
--- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
+++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx
@@ -123,7 +123,7 @@ private:
public:
XMLDocumentWrapper_XmlSecImpl();
- virtual ~XMLDocumentWrapper_XmlSecImpl();
+ virtual ~XMLDocumentWrapper_XmlSecImpl() override;
/* css::xml::wrapper::XXMLDocumentWrapper */
virtual css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > SAL_CALL getCurrentElement( )
diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx
index 1ed0d5ec5550..4883581397f7 100644
--- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx
+++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx
@@ -54,7 +54,7 @@ private:
public:
explicit XMLElementWrapper_XmlSecImpl(const xmlNodePtr pNode);
- virtual ~XMLElementWrapper_XmlSecImpl() {};
+ virtual ~XMLElementWrapper_XmlSecImpl() override {};
/* XXMLElementWrapper */