From 91dd2db17bd6cb9b357d1d69b187174e31eabef0 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 13 Sep 2016 13:09:01 +0200 Subject: 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 --- xmlsecurity/inc/certificatechooser.hxx | 2 +- xmlsecurity/inc/certificateviewer.hxx | 10 +++++----- xmlsecurity/inc/digitalsignaturesdialog.hxx | 2 +- xmlsecurity/inc/macrosecurity.hxx | 8 ++++---- xmlsecurity/source/component/certificatecontainer.hxx | 2 +- xmlsecurity/source/framework/decryptorimpl.hxx | 2 +- xmlsecurity/source/framework/elementcollector.hxx | 2 +- xmlsecurity/source/framework/encryptionengine.hxx | 2 +- xmlsecurity/source/framework/encryptorimpl.hxx | 2 +- xmlsecurity/source/framework/saxeventkeeperimpl.hxx | 2 +- xmlsecurity/source/framework/securityengine.hxx | 2 +- xmlsecurity/source/framework/signaturecreatorimpl.hxx | 2 +- xmlsecurity/source/framework/signatureengine.hxx | 2 +- xmlsecurity/source/framework/signatureverifierimpl.hxx | 2 +- xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx | 2 +- xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx | 2 +- xmlsecurity/source/helper/ooxmlsecparser.hxx | 2 +- xmlsecurity/source/helper/xmlsignaturehelper2.hxx | 2 +- xmlsecurity/source/helper/xsecctl.hxx | 2 +- xmlsecurity/source/helper/xsecparser.hxx | 2 +- xmlsecurity/source/xmlsec/nss/ciphercontext.hxx | 2 +- xmlsecurity/source/xmlsec/nss/digestcontext.hxx | 2 +- xmlsecurity/source/xmlsec/nss/nssinitializer.hxx | 2 +- xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx | 2 +- xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx | 2 +- xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx | 2 +- xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx | 2 +- xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx | 2 +- xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx | 2 +- xmlsecurity/source/xmlsec/serialnumberadapter.cxx | 2 +- xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx | 2 +- xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx | 2 +- 32 files changed, 39 insertions(+), 39 deletions(-) (limited to 'xmlsecurity') diff --git a/xmlsecurity/inc/certificatechooser.hxx b/xmlsecurity/inc/certificatechooser.hxx index ec555b6724ee..9f96e338cdf9 100644 --- a/xmlsecurity/inc/certificatechooser.hxx +++ b/xmlsecurity/inc/certificatechooser.hxx @@ -67,7 +67,7 @@ private: public: CertificateChooser(vcl::Window* pParent, css::uno::Reference< css::uno::XComponentContext>& rxCtx, css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment); - virtual ~CertificateChooser(); + virtual ~CertificateChooser() override; virtual void dispose() override; short Execute() override; diff --git a/xmlsecurity/inc/certificateviewer.hxx b/xmlsecurity/inc/certificateviewer.hxx index c0072c5077ac..bd5e19c87cd9 100644 --- a/xmlsecurity/inc/certificateviewer.hxx +++ b/xmlsecurity/inc/certificateviewer.hxx @@ -57,7 +57,7 @@ private: css::uno::Reference< css::security::XCertificate > mxCert; public: CertificateViewer( vcl::Window* pParent, const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment, const css::uno::Reference< css::security::XCertificate >& rXCert, bool bCheckForPrivateKey ); - virtual ~CertificateViewer(); + virtual ~CertificateViewer() override; virtual void dispose() override; }; @@ -69,7 +69,7 @@ protected: public: CertificateViewerTP( vcl::Window* _pParent, const OString& rID, const OUString& rUIXMLDescription, CertificateViewer* _pDlg ); - virtual ~CertificateViewerTP(); + virtual ~CertificateViewerTP() override; virtual void dispose() override; }; @@ -86,7 +86,7 @@ private: VclPtr m_pHintCorrespPrivKeyFI; public: CertificateViewerGeneralTP( vcl::Window* pParent, CertificateViewer* _pDlg ); - virtual ~CertificateViewerGeneralTP(); + virtual ~CertificateViewerGeneralTP() override; virtual void dispose() override; virtual void ActivatePage() override; @@ -108,7 +108,7 @@ private: const OUString& _rDetails, bool _bFixedWidthFont = false ); public: CertificateViewerDetailsTP( vcl::Window* pParent, CertificateViewer* _pDlg ); - virtual ~CertificateViewerDetailsTP(); + virtual ~CertificateViewerDetailsTP() override; virtual void dispose() override; virtual void ActivatePage() override; @@ -138,7 +138,7 @@ private: public: CertificateViewerCertPathTP( vcl::Window* pParent, CertificateViewer* _pDlg ); - virtual ~CertificateViewerCertPathTP(); + virtual ~CertificateViewerCertPathTP() override; virtual void dispose() override; virtual void ActivatePage() override; diff --git a/xmlsecurity/inc/digitalsignaturesdialog.hxx b/xmlsecurity/inc/digitalsignaturesdialog.hxx index 4c3a13fe722e..075f67fa4b9b 100644 --- a/xmlsecurity/inc/digitalsignaturesdialog.hxx +++ b/xmlsecurity/inc/digitalsignaturesdialog.hxx @@ -107,7 +107,7 @@ public: DigitalSignaturesDialog( vcl::Window* pParent, css::uno::Reference< css::uno::XComponentContext >& rxCtx, DocumentSignatureMode eMode, bool bReadOnly, const OUString& sODFVersion, bool bHasDocumentSignature); - virtual ~DigitalSignaturesDialog(); + virtual ~DigitalSignaturesDialog() override; virtual void dispose() override; // Initialize the dialog and the security environment, returns TRUE on success 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; diff --git a/xmlsecurity/source/component/certificatecontainer.hxx b/xmlsecurity/source/component/certificatecontainer.hxx index e71947a81401..34b0606ca61b 100644 --- a/xmlsecurity/source/component/certificatecontainer.hxx +++ b/xmlsecurity/source/component/certificatecontainer.hxx @@ -46,7 +46,7 @@ class CertificateContainer : public ::cppu::WeakImplHelper< css::lang::XServiceI public: explicit CertificateContainer(const css::uno::Reference< css::lang::XMultiServiceFactory >& ) {} - virtual ~CertificateContainer() {} + virtual ~CertificateContainer() override {} virtual sal_Bool SAL_CALL addCertificate( const OUString & url, const OUString & certificate_name, sal_Bool trust ) throw(css::uno::RuntimeException, std::exception) override; virtual css::security::CertificateContainerStatus SAL_CALL hasCertificate( const OUString & url, const OUString & certificate_name ) throw(css::uno::RuntimeException, std::exception) override; diff --git a/xmlsecurity/source/framework/decryptorimpl.hxx b/xmlsecurity/source/framework/decryptorimpl.hxx index 9b5cd239becd..1305226e8bb3 100644 --- a/xmlsecurity/source/framework/decryptorimpl.hxx +++ b/xmlsecurity/source/framework/decryptorimpl.hxx @@ -61,7 +61,7 @@ private: public: explicit DecryptorImpl(const css::uno::Reference< css::uno::XComponentContext > & xContext); - virtual ~DecryptorImpl(); + virtual ~DecryptorImpl() override; /* XDecryptionResultBroadcaster */ virtual void SAL_CALL addDecryptionResultListener( diff --git a/xmlsecurity/source/framework/elementcollector.hxx b/xmlsecurity/source/framework/elementcollector.hxx index e14430b65c3d..286d93aea15a 100644 --- a/xmlsecurity/source/framework/elementcollector.hxx +++ b/xmlsecurity/source/framework/elementcollector.hxx @@ -68,7 +68,7 @@ public: css::xml::crypto::sax::ElementMarkPriority nPriority, bool bToModify, const css::uno::Reference< css::xml::crypto::sax::XReferenceResolvedListener >& xReferenceResolvedListener); - virtual ~ElementCollector() {}; + virtual ~ElementCollector() override {}; css::xml::crypto::sax::ElementMarkPriority getPriority() const { return m_nPriority;} bool getModify() const { return m_bToModify;} diff --git a/xmlsecurity/source/framework/encryptionengine.hxx b/xmlsecurity/source/framework/encryptionengine.hxx index a535c30414d6..2fe4775c5449 100644 --- a/xmlsecurity/source/framework/encryptionengine.hxx +++ b/xmlsecurity/source/framework/encryptionengine.hxx @@ -67,7 +67,7 @@ protected: protected: explicit EncryptionEngine( const css::uno::Reference< css::uno::XComponentContext > & xContext ); - virtual ~EncryptionEngine(){}; + virtual ~EncryptionEngine() override {}; virtual void tryToPerform( ) throw (css::uno::Exception, css::uno::RuntimeException) override; diff --git a/xmlsecurity/source/framework/encryptorimpl.hxx b/xmlsecurity/source/framework/encryptorimpl.hxx index 368fe94a430e..a3c3f7c49735 100644 --- a/xmlsecurity/source/framework/encryptorimpl.hxx +++ b/xmlsecurity/source/framework/encryptorimpl.hxx @@ -70,7 +70,7 @@ private: public: explicit EncryptorImpl(const css::uno::Reference< css::uno::XComponentContext > & xContext); - virtual ~EncryptorImpl(); + virtual ~EncryptorImpl() override; /* XEncryptionResultBroadcaster */ virtual void SAL_CALL addEncryptionResultListener( diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.hxx b/xmlsecurity/source/framework/saxeventkeeperimpl.hxx index 8365c7c22077..f70e5ca7a3eb 100644 --- a/xmlsecurity/source/framework/saxeventkeeperimpl.hxx +++ b/xmlsecurity/source/framework/saxeventkeeperimpl.hxx @@ -211,7 +211,7 @@ private: public: SAXEventKeeperImpl(); - virtual ~SAXEventKeeperImpl(); + virtual ~SAXEventKeeperImpl() override; /* XSAXEventKeeper */ virtual sal_Int32 SAL_CALL addElementCollector( ) diff --git a/xmlsecurity/source/framework/securityengine.hxx b/xmlsecurity/source/framework/securityengine.hxx index 171e4297d65a..17fab0db39c2 100644 --- a/xmlsecurity/source/framework/securityengine.hxx +++ b/xmlsecurity/source/framework/securityengine.hxx @@ -98,7 +98,7 @@ protected: protected: explicit SecurityEngine(); - virtual ~SecurityEngine() {}; + virtual ~SecurityEngine() override {}; /* * perform the security operation. diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.hxx b/xmlsecurity/source/framework/signaturecreatorimpl.hxx index 2b14cad9cd20..2171738b5208 100644 --- a/xmlsecurity/source/framework/signaturecreatorimpl.hxx +++ b/xmlsecurity/source/framework/signaturecreatorimpl.hxx @@ -68,7 +68,7 @@ private: public: explicit SignatureCreatorImpl( const css::uno::Reference< css::uno::XComponentContext > & xContext ); - virtual ~SignatureCreatorImpl(); + virtual ~SignatureCreatorImpl() override; /* XBlockerMonitor */ virtual void SAL_CALL setBlockerId( sal_Int32 id ) diff --git a/xmlsecurity/source/framework/signatureengine.hxx b/xmlsecurity/source/framework/signatureengine.hxx index fac0b6840855..4ba5d8cb07d2 100644 --- a/xmlsecurity/source/framework/signatureengine.hxx +++ b/xmlsecurity/source/framework/signatureengine.hxx @@ -86,7 +86,7 @@ protected: protected: explicit SignatureEngine( const css::uno::Reference< css::uno::XComponentContext > & xContext); - virtual ~SignatureEngine() {}; + virtual ~SignatureEngine() override {}; virtual void tryToPerform( ) throw (css::uno::Exception, css::uno::RuntimeException) override; diff --git a/xmlsecurity/source/framework/signatureverifierimpl.hxx b/xmlsecurity/source/framework/signatureverifierimpl.hxx index 66dbe548b8d8..5159b86a837a 100644 --- a/xmlsecurity/source/framework/signatureverifierimpl.hxx +++ b/xmlsecurity/source/framework/signatureverifierimpl.hxx @@ -62,7 +62,7 @@ private: public: explicit SignatureVerifierImpl( const css::uno::Reference< css::uno::XComponentContext >& rxContext); - virtual ~SignatureVerifierImpl(); + virtual ~SignatureVerifierImpl() override; /* XSignatureVerifyResultBroadcaster */ virtual void SAL_CALL addSignatureVerifyResultListener( diff --git a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx index 4e42b23bd9bc..5179df1079e7 100644 --- a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx +++ b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx @@ -45,7 +45,7 @@ class XMLEncryptionTemplateImpl : public ::cppu::WeakImplHelper< public: explicit XMLEncryptionTemplateImpl(); - virtual ~XMLEncryptionTemplateImpl(); + virtual ~XMLEncryptionTemplateImpl() override; //Methods from XXMLEncryptionTemplate virtual void SAL_CALL setTemplate( diff --git a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx index 2f90cbf41584..853b68ab4eb1 100644 --- a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx +++ b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx @@ -47,7 +47,7 @@ class XMLSignatureTemplateImpl : public ::cppu::WeakImplHelper< public: explicit XMLSignatureTemplateImpl(); - virtual ~XMLSignatureTemplateImpl(); + virtual ~XMLSignatureTemplateImpl() override; //Methods from XXMLSignatureTemplate virtual void SAL_CALL setTemplate( diff --git a/xmlsecurity/source/helper/ooxmlsecparser.hxx b/xmlsecurity/source/helper/ooxmlsecparser.hxx index cd3eed01c2a6..a78c3e369c24 100644 --- a/xmlsecurity/source/helper/ooxmlsecparser.hxx +++ b/xmlsecurity/source/helper/ooxmlsecparser.hxx @@ -53,7 +53,7 @@ class OOXMLSecParser: public cppu::WeakImplHelper public: explicit OOXMLSecParser(XSecController* pXSecController); - virtual ~OOXMLSecParser(); + virtual ~OOXMLSecParser() override; // XDocumentHandler virtual void SAL_CALL startDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.hxx b/xmlsecurity/source/helper/xmlsignaturehelper2.hxx index 320723938ff9..e07af2e0f216 100644 --- a/xmlsecurity/source/helper/xmlsignaturehelper2.hxx +++ b/xmlsecurity/source/helper/xmlsignaturehelper2.hxx @@ -59,7 +59,7 @@ public: ImplXMLSignatureListener(const Link& rCreationResultListenerListener, const Link& rVerifyResultListenerListener, const Link& rStartVerifySignatureElement); - virtual ~ImplXMLSignatureListener(); + virtual ~ImplXMLSignatureListener() override; void setNextHandler(const css::uno::Reference< css::xml::sax::XDocumentHandler >& xNextHandler); diff --git a/xmlsecurity/source/helper/xsecctl.hxx b/xmlsecurity/source/helper/xsecctl.hxx index 1b8222acd420..359527851048 100644 --- a/xmlsecurity/source/helper/xsecctl.hxx +++ b/xmlsecurity/source/helper/xsecctl.hxx @@ -385,7 +385,7 @@ private: public: explicit XSecController(const css::uno::Reference& rxCtx); - virtual ~XSecController(); + virtual ~XSecController() override; sal_Int32 getNewSecurityId( ); diff --git a/xmlsecurity/source/helper/xsecparser.hxx b/xmlsecurity/source/helper/xsecparser.hxx index 1b0bf766b9ec..204ff67876dd 100644 --- a/xmlsecurity/source/helper/xsecparser.hxx +++ b/xmlsecurity/source/helper/xsecparser.hxx @@ -103,7 +103,7 @@ public: XSecParser( XSecController* pXSecController, const css::uno::Reference< css::xml::sax::XDocumentHandler >& xNextHandler ); - virtual ~XSecParser(){}; + virtual ~XSecParser() override {}; /* * XDocumentHandler 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 &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 &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 */ -- cgit