diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-04-01 19:18:35 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-04-01 19:22:54 +0200 |
commit | 362d4f0cd4e50111edfae9d30c90602c37ed65a2 (patch) | |
tree | 0b432c049d580dcac6130bca9fb028bab8af8fa8 /xmlsecurity | |
parent | svx: fix SID_OFFER_IMPORT and SID_ATTR_CHAR_GRABBAG having the same SID (diff) | |
download | core-362d4f0cd4e50111edfae9d30c90602c37ed65a2.tar.gz core-362d4f0cd4e50111edfae9d30c90602c37ed65a2.zip |
Explicitly mark overriding destructors as "virtual"
It appears that the C++ standard allows overriding destructors to be marked
"override," but at least some MSVC versions complain about it, so at least make
sure such destructors are explicitly marked "virtual."
Change-Id: I0e1cafa7584fd16ebdce61f569eae2373a71b0a1
Diffstat (limited to 'xmlsecurity')
-rw-r--r-- | xmlsecurity/inc/xmlsecurity/certificatechooser.hxx | 2 | ||||
-rw-r--r-- | xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx | 2 | ||||
-rw-r--r-- | xmlsecurity/inc/xmlsecurity/macrosecurity.hxx | 2 | ||||
-rw-r--r-- | xmlsecurity/source/helper/xmlsignaturehelper2.hxx | 2 | ||||
-rw-r--r-- | xmlsecurity/source/helper/xsecctl.hxx | 2 | ||||
-rw-r--r-- | xmlsecurity/source/helper/xsecparser.hxx | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx index e14ded38dc55..f2c0678e8c0f 100644 --- a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx +++ b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx @@ -64,7 +64,7 @@ private: public: CertificateChooser( Window* pParent, css::uno::Reference< css::uno::XComponentContext>& rxCtx, css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment, const SignatureInformations& rCertsToIgnore ); - ~CertificateChooser(); + virtual ~CertificateChooser(); short Execute() SAL_OVERRIDE; diff --git a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx index 27efd8fee65b..3bb87b759ccb 100644 --- a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx +++ b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx @@ -117,7 +117,7 @@ public: DigitalSignaturesDialog( Window* pParent, cssu::Reference< cssu::XComponentContext >& rxCtx, DocumentSignatureMode eMode, sal_Bool bReadOnly, const OUString& sODFVersion, bool bHasDocumentSignature); - ~DigitalSignaturesDialog(); + virtual ~DigitalSignaturesDialog(); // Initialize the dialog and the security environment, returns TRUE on success sal_Bool Init(); diff --git a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx index da3b2fa5a058..490bd235ca88 100644 --- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx +++ b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx @@ -139,7 +139,7 @@ private: public: MacroSecurityTrustedSourcesTP(Window* pParent, MacroSecurity* _pDlg); - ~MacroSecurityTrustedSourcesTP(); + virtual ~MacroSecurityTrustedSourcesTP(); virtual void ActivatePage() SAL_OVERRIDE; virtual void ClosePage( void ) SAL_OVERRIDE; diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.hxx b/xmlsecurity/source/helper/xmlsignaturehelper2.hxx index 6371bb9a7aef..b02732a85092 100644 --- a/xmlsecurity/source/helper/xmlsignaturehelper2.hxx +++ b/xmlsecurity/source/helper/xmlsignaturehelper2.hxx @@ -55,7 +55,7 @@ private: public: ImplXMLSignatureListener( const Link& rCreationResultListenerListener, const Link rVerifyResultListenerListener, const Link rStartVerifySignatureElement ); - ~ImplXMLSignatureListener(); + virtual ~ImplXMLSignatureListener(); void setNextHandler(com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler > xNextHandler); diff --git a/xmlsecurity/source/helper/xsecctl.hxx b/xmlsecurity/source/helper/xsecctl.hxx index 39b8427a3a78..dc644160a877 100644 --- a/xmlsecurity/source/helper/xsecctl.hxx +++ b/xmlsecurity/source/helper/xsecctl.hxx @@ -390,7 +390,7 @@ private: public: XSecController(const com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext>& rxCtx); - ~XSecController(); + virtual ~XSecController(); sal_Int32 getNewSecurityId( ); diff --git a/xmlsecurity/source/helper/xsecparser.hxx b/xmlsecurity/source/helper/xsecparser.hxx index 48758cd6cfb2..03c75194233a 100644 --- a/xmlsecurity/source/helper/xsecparser.hxx +++ b/xmlsecurity/source/helper/xsecparser.hxx @@ -104,7 +104,7 @@ public: XSecParser( XSecController* pXSecController, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xNextHandler ); - ~XSecParser(){}; + virtual ~XSecParser(){}; /* * XDocumentHandler |