diff options
Diffstat (limited to 'xmlsecurity')
35 files changed, 289 insertions, 289 deletions
diff --git a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx index 9e97a51c590e..25f0c60032d8 100644 --- a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx +++ b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx @@ -66,9 +66,9 @@ private: public: CertificateChooser( vcl::Window* pParent, css::uno::Reference< css::uno::XComponentContext>& rxCtx, css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment, const SignatureInformations& rCertsToIgnore ); virtual ~CertificateChooser(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - short Execute() SAL_OVERRIDE; + short Execute() override; css::uno::Reference< css::security::XCertificate > GetSelectedCertificate(); diff --git a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx index 53499cd875b7..c0fbe5a1a3bd 100644 --- a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx +++ b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx @@ -58,7 +58,7 @@ private: 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 void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; @@ -70,7 +70,7 @@ public: CertificateViewerTP( vcl::Window* _pParent, const OString& rID, const OUString& rUIXMLDescription, CertificateViewer* _pDlg ); virtual ~CertificateViewerTP(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; class CertificateViewerGeneralTP : public CertificateViewerTP @@ -87,9 +87,9 @@ private: public: CertificateViewerGeneralTP( vcl::Window* pParent, CertificateViewer* _pDlg ); virtual ~CertificateViewerGeneralTP(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void ActivatePage() SAL_OVERRIDE; + virtual void ActivatePage() override; }; @@ -109,9 +109,9 @@ private: public: CertificateViewerDetailsTP( vcl::Window* pParent, CertificateViewer* _pDlg ); virtual ~CertificateViewerDetailsTP(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void ActivatePage() SAL_OVERRIDE; + virtual void ActivatePage() override; }; @@ -139,9 +139,9 @@ private: public: CertificateViewerCertPathTP( vcl::Window* pParent, CertificateViewer* _pDlg ); virtual ~CertificateViewerCertPathTP(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void ActivatePage() SAL_OVERRIDE; + virtual void ActivatePage() override; }; diff --git a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx index aeb6fdb628f6..ff8b66e3ebe1 100644 --- a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx +++ b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx @@ -117,7 +117,7 @@ public: css::uno::XComponentContext >& rxCtx, DocumentSignatureMode eMode, bool bReadOnly, const OUString& sODFVersion, bool bHasDocumentSignature); virtual ~DigitalSignaturesDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; // Initialize the dialog and the security environment, returns TRUE on success bool Init(); @@ -127,7 +127,7 @@ public: void SetSignatureStream( const css::uno::Reference < css::io::XStream >& rxStream ); // Execute the dialog... - short Execute() SAL_OVERRIDE; + short Execute() override; // Did signatures change? bool SignaturesChanged() const { return mbSignaturesChanged; } diff --git a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx index ca2571869d00..4c6d5f37c4a5 100644 --- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx +++ b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx @@ -67,7 +67,7 @@ public: const css::uno::Reference< css::uno::XComponentContext>& rxCtx, const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment); virtual ~MacroSecurity(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; inline void EnableReset(bool _bEnable = true) { @@ -83,7 +83,7 @@ public: MacroSecurityTP(vcl::Window* _pParent, const OString& rID, const OUString& rUIXMLDescription, MacroSecurity* _pDlg); virtual ~MacroSecurityTP(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; virtual void ClosePage() = 0; }; @@ -104,9 +104,9 @@ protected: public: MacroSecurityLevelTP( vcl::Window* pParent, MacroSecurity* _pDlg ); virtual ~MacroSecurityLevelTP(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void ClosePage() SAL_OVERRIDE; + virtual void ClosePage() override; }; @@ -140,10 +140,10 @@ private: public: MacroSecurityTrustedSourcesTP(vcl::Window* pParent, MacroSecurity* _pDlg); virtual ~MacroSecurityTrustedSourcesTP(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void ActivatePage() SAL_OVERRIDE; - virtual void ClosePage() SAL_OVERRIDE; + virtual void ActivatePage() override; + virtual void ClosePage() override; }; diff --git a/xmlsecurity/source/component/certificatecontainer.hxx b/xmlsecurity/source/component/certificatecontainer.hxx index d0907d7c8318..e71947a81401 100644 --- a/xmlsecurity/source/component/certificatecontainer.hxx +++ b/xmlsecurity/source/component/certificatecontainer.hxx @@ -48,8 +48,8 @@ class CertificateContainer : public ::cppu::WeakImplHelper< css::lang::XServiceI explicit CertificateContainer(const css::uno::Reference< css::lang::XMultiServiceFactory >& ) {} virtual ~CertificateContainer() {} - virtual sal_Bool SAL_CALL addCertificate( const OUString & url, const OUString & certificate_name, sal_Bool trust ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::security::CertificateContainerStatus SAL_CALL hasCertificate( const OUString & url, const OUString & certificate_name ) throw(css::uno::RuntimeException, std::exception) SAL_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; // provide factory static OUString SAL_CALL impl_getStaticImplementationName( ) throw(css::uno::RuntimeException); @@ -61,11 +61,11 @@ class CertificateContainer : public ::cppu::WeakImplHelper< css::lang::XServiceI impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::RuntimeException ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; }; diff --git a/xmlsecurity/source/component/documentdigitalsignatures.hxx b/xmlsecurity/source/component/documentdigitalsignatures.hxx index 2c72474444a9..1030b6e5e633 100644 --- a/xmlsecurity/source/component/documentdigitalsignatures.hxx +++ b/xmlsecurity/source/component/documentdigitalsignatures.hxx @@ -65,38 +65,38 @@ public: //XInitialization void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) - throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XDocumentDigitalSignatures - sal_Bool SAL_CALL signDocumentContent( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xSignStream ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation > SAL_CALL verifyDocumentContentSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignInStream ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL showDocumentContentSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignInStream ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - OUString SAL_CALL getDocumentContentSignatureDefaultStreamName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - sal_Bool SAL_CALL signScriptingContent( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xSignStream ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation > SAL_CALL verifyScriptingContentSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignInStream ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL showScriptingContentSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignInStream ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - OUString SAL_CALL getScriptingContentSignatureDefaultStreamName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - sal_Bool SAL_CALL signPackage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xSignStream ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - ::com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation > SAL_CALL verifyPackageSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignInStream ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL showPackageSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignInStream ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - OUString SAL_CALL getPackageSignatureDefaultStreamName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL showCertificate( const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& Certificate ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL manageTrustedSources( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - sal_Bool SAL_CALL isAuthorTrusted( const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& Author ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - sal_Bool SAL_CALL isLocationTrusted( const OUString& Location ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL addAuthorToTrustedSources( const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& Author ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - void SAL_CALL addLocationToTrustedSources( const OUString& Location ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - - ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL chooseCertificate( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + sal_Bool SAL_CALL signDocumentContent( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xSignStream ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + ::com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation > SAL_CALL verifyDocumentContentSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignInStream ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL showDocumentContentSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignInStream ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getDocumentContentSignatureDefaultStreamName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL signScriptingContent( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xSignStream ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + ::com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation > SAL_CALL verifyScriptingContentSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignInStream ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL showScriptingContentSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignInStream ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getScriptingContentSignatureDefaultStreamName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL signPackage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xSignStream ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + ::com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation > SAL_CALL verifyPackageSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignInStream ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL showPackageSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignInStream ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getPackageSignatureDefaultStreamName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL showCertificate( const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& Certificate ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL manageTrustedSources( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL isAuthorTrusted( const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& Author ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL isLocationTrusted( const OUString& Location ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL addAuthorToTrustedSources( const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& Author ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL addLocationToTrustedSources( const OUString& Location ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + + ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL chooseCertificate( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; }; com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL DocumentDigitalSignatures_CreateInstance( diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index 31d8cb501886..ba2c30c622cf 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -68,10 +68,10 @@ namespace private: sal_Int16 m_nODF; - virtual void ImplCommit() SAL_OVERRIDE; + virtual void ImplCommit() override; public: - virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; + virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override; SaveODFItem(); //See group ODF in Common.xcs bool isLessODF1_2() diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index ff927178c2db..6c568da26147 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -350,7 +350,7 @@ public: : SvSimpleTable(rContainer, 0) { } - virtual void Resize() SAL_OVERRIDE + virtual void Resize() override { SvSimpleTable::Resize(); if (isInitialLayout(this)) diff --git a/xmlsecurity/source/framework/decryptorimpl.hxx b/xmlsecurity/source/framework/decryptorimpl.hxx index 8fc66b4d5086..4328256f0e26 100644 --- a/xmlsecurity/source/framework/decryptorimpl.hxx +++ b/xmlsecurity/source/framework/decryptorimpl.hxx @@ -57,12 +57,12 @@ private: com::sun::star::xml::crypto::XXMLSecurityContext > m_xXMLSecurityContext; virtual void notifyResultListener() const - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException) SAL_OVERRIDE; - virtual bool checkReady() const SAL_OVERRIDE; + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException) override; + virtual bool checkReady() const override; virtual void startEngine( const com::sun::star::uno::Reference< com::sun::star::xml::crypto::XXMLEncryptionTemplate >& xEncryptionTemplate) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException) override; public: explicit DecryptorImpl(const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & xContext); @@ -73,25 +73,25 @@ public: const com::sun::star::uno::Reference< com::sun::star::xml::crypto::sax::XDecryptionResultListener >& listener ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeDecryptionResultListener( const com::sun::star::uno::Reference< com::sun::star::xml::crypto::sax::XDecryptionResultListener >& listener ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; /* XInitialization */ virtual void SAL_CALL initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override; /* XServiceInfo */ virtual OUString SAL_CALL getImplementationName( ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; }; OUString DecryptorImpl_getImplementationName() diff --git a/xmlsecurity/source/framework/encryptionengine.hxx b/xmlsecurity/source/framework/encryptionengine.hxx index dc8e0b6a381a..01ea419aa83d 100644 --- a/xmlsecurity/source/framework/encryptionengine.hxx +++ b/xmlsecurity/source/framework/encryptionengine.hxx @@ -76,9 +76,9 @@ protected: virtual ~EncryptionEngine(){}; virtual void tryToPerform( ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException) SAL_OVERRIDE; - virtual void clearUp( ) const SAL_OVERRIDE; - virtual bool checkReady() const SAL_OVERRIDE; + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException) override; + virtual void clearUp( ) const override; + virtual bool checkReady() const override; /* * starts the main function. This method will be implemented by any sub-class. @@ -93,7 +93,7 @@ protected: public: /* XBlockerMonitor */ virtual void SAL_CALL setBlockerId( sal_Int32 id ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override; }; #endif diff --git a/xmlsecurity/source/framework/encryptorimpl.hxx b/xmlsecurity/source/framework/encryptorimpl.hxx index 5c28b20efefc..486a59cc3382 100644 --- a/xmlsecurity/source/framework/encryptorimpl.hxx +++ b/xmlsecurity/source/framework/encryptorimpl.hxx @@ -65,12 +65,12 @@ private: com::sun::star::xml::crypto::XSecurityEnvironment > m_xSecurityEnvironment; virtual void notifyResultListener() const - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException) SAL_OVERRIDE; - virtual bool checkReady() const SAL_OVERRIDE; + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException) override; + virtual bool checkReady() const override; virtual void startEngine( const com::sun::star::uno::Reference< com::sun::star::xml::crypto::XXMLEncryptionTemplate >& xEncryptionTemplate) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException) override; public: explicit EncryptorImpl(const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & xContext); @@ -81,32 +81,32 @@ public: const com::sun::star::uno::Reference< com::sun::star::xml::crypto::sax::XEncryptionResultListener >& listener ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeEncryptionResultListener( const com::sun::star::uno::Reference< com::sun::star::xml::crypto::sax::XEncryptionResultListener >& listener ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; /* XReferenceCollector */ virtual void SAL_CALL setReferenceCount( sal_Int32 count ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setReferenceId( sal_Int32 id ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override; /* XInitialization */ virtual void SAL_CALL initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override; /* XServiceInfo */ virtual OUString SAL_CALL getImplementationName( ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; }; OUString EncryptorImpl_getImplementationName() diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.hxx b/xmlsecurity/source/framework/saxeventkeeperimpl.hxx index 31c2f11bf15a..3250abbf6ac9 100644 --- a/xmlsecurity/source/framework/saxeventkeeperimpl.hxx +++ b/xmlsecurity/source/framework/saxeventkeeperimpl.hxx @@ -228,48 +228,48 @@ public: /* XSAXEventKeeper */ virtual sal_Int32 SAL_CALL addElementCollector( ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeElementCollector( sal_Int32 id ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL addBlocker( ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeBlocker( sal_Int32 id ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isBlocking( ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual com::sun::star::uno::Reference< com::sun::star::xml::wrapper::XXMLElementWrapper > SAL_CALL getElement( sal_Int32 id ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setElement( sal_Int32 id, const com::sun::star::uno::Reference< com::sun::star::xml::wrapper::XXMLElementWrapper >& aElement ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler > SAL_CALL setNextHandler( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xNewHandler ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL printBufferNodeTree() - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual com::sun::star::uno::Reference< com::sun::star::xml::wrapper::XXMLElementWrapper > SAL_CALL getCurrentBlockingNode() - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; /* XSecuritySAXEventKeeper */ virtual sal_Int32 SAL_CALL addSecurityElementCollector( com::sun::star::xml::crypto::sax::ElementMarkPriority priority, sal_Bool modifyElement ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL cloneElementCollector( sal_Int32 referenceId, com::sun::star::xml::crypto::sax::ElementMarkPriority priority ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setSecurityId( sal_Int32 id, sal_Int32 securityId ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; /* XReferenceResolvedBroadcaster */ virtual void SAL_CALL addReferenceResolvedListener( @@ -277,61 +277,61 @@ public: const com::sun::star::uno::Reference< com::sun::star::xml::crypto::sax::XReferenceResolvedListener >& listener ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeReferenceResolvedListener( sal_Int32 referenceId, const com::sun::star::uno::Reference< com::sun::star::xml::crypto::sax::XReferenceResolvedListener >& listener ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; /* XSAXEventKeeperStatusChangeBroadcaster */ virtual void SAL_CALL addSAXEventKeeperStatusChangeListener( const com::sun::star::uno::Reference< com::sun::star::xml::crypto::sax::XSAXEventKeeperStatusChangeListener >& listener ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeSAXEventKeeperStatusChangeListener( const com::sun::star::uno::Reference< com::sun::star::xml::crypto::sax::XSAXEventKeeperStatusChangeListener >& listener ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; /* XDocumentHandler */ virtual void SAL_CALL startDocument( ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL endDocument( ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL startElement( const OUString& aName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL endElement( const OUString& aName ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL characters( const OUString& aChars ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setDocumentLocator( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XLocator >& xLocator ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; /* XInitialization */ virtual void SAL_CALL initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override; /* XServiceInfo */ virtual OUString SAL_CALL getImplementationName( ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; }; OUString SAXEventKeeperImpl_getImplementationName() diff --git a/xmlsecurity/source/framework/securityengine.hxx b/xmlsecurity/source/framework/securityengine.hxx index 2279b72e8bff..e677c4964598 100644 --- a/xmlsecurity/source/framework/securityengine.hxx +++ b/xmlsecurity/source/framework/securityengine.hxx @@ -141,15 +141,15 @@ protected: public: /* XReferenceResolvedListener */ virtual void SAL_CALL referenceResolved( sal_Int32 referenceId ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override; /* XKeyCollector */ virtual void SAL_CALL setKeyId( sal_Int32 id ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override; /* XMissionTaker */ virtual sal_Bool SAL_CALL endMission( ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; }; #endif diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.hxx b/xmlsecurity/source/framework/signaturecreatorimpl.hxx index f14f330bdc45..4fd01d82a27c 100644 --- a/xmlsecurity/source/framework/signaturecreatorimpl.hxx +++ b/xmlsecurity/source/framework/signaturecreatorimpl.hxx @@ -65,13 +65,13 @@ private: com::sun::star::xml::crypto::XSecurityEnvironment > m_xSecurityEnvironment; virtual void notifyResultListener() const - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException) SAL_OVERRIDE; - virtual void clearUp( ) const SAL_OVERRIDE; - virtual bool checkReady() const SAL_OVERRIDE; + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException) override; + virtual void clearUp( ) const override; + virtual bool checkReady() const override; virtual void startEngine( const com::sun::star::uno::Reference< com::sun::star::xml::crypto::XXMLSignatureTemplate >& xSignatureTemplate) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException) override; public: explicit SignatureCreatorImpl( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & xContext ); @@ -79,31 +79,31 @@ public: /* XBlockerMonitor */ virtual void SAL_CALL setBlockerId( sal_Int32 id ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override; /* XSignatureCreationResultBroadcaster */ void SAL_CALL addSignatureCreationResultListener( const com::sun::star::uno::Reference< com::sun::star::xml::crypto::sax::XSignatureCreationResultListener >& listener ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override; void SAL_CALL removeSignatureCreationResultListener( const com::sun::star::uno::Reference< com::sun::star::xml::crypto::sax::XSignatureCreationResultListener >& listener ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; /* XInitialization */ virtual void SAL_CALL initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override; /* XServiceInfo */ virtual OUString SAL_CALL getImplementationName( ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; }; OUString SignatureCreatorImpl_getImplementationName() diff --git a/xmlsecurity/source/framework/signatureengine.hxx b/xmlsecurity/source/framework/signatureengine.hxx index d9625e73e014..1c9fd41d93e0 100644 --- a/xmlsecurity/source/framework/signatureengine.hxx +++ b/xmlsecurity/source/framework/signatureengine.hxx @@ -95,9 +95,9 @@ protected: virtual ~SignatureEngine() {}; virtual void tryToPerform( ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException) SAL_OVERRIDE; - virtual void clearUp( ) const SAL_OVERRIDE; - virtual bool checkReady() const SAL_OVERRIDE; + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException) override; + virtual void clearUp( ) const override; + virtual bool checkReady() const override; /* * starts the main function. This method will be implemented by any sub-class. @@ -112,20 +112,20 @@ protected: public: /* XReferenceCollector */ virtual void SAL_CALL setReferenceCount( sal_Int32 count ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setReferenceId( sal_Int32 id ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override; /* XUriBinding */ virtual void SAL_CALL setUriBinding( const OUString& uri, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& aInputStream ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override; virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL getUriBinding( const OUString& uri ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override; }; #endif diff --git a/xmlsecurity/source/framework/signatureverifierimpl.hxx b/xmlsecurity/source/framework/signatureverifierimpl.hxx index 89e36a308c7e..2130e7c9c567 100644 --- a/xmlsecurity/source/framework/signatureverifierimpl.hxx +++ b/xmlsecurity/source/framework/signatureverifierimpl.hxx @@ -59,12 +59,12 @@ private: com::sun::star::xml::crypto::XXMLSecurityContext > m_xXMLSecurityContext; virtual void notifyResultListener() const - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException) SAL_OVERRIDE; - virtual bool checkReady() const SAL_OVERRIDE; + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException) override; + virtual bool checkReady() const override; virtual void startEngine( const com::sun::star::uno::Reference< com::sun::star::xml::crypto::XXMLSignatureTemplate >& xSignatureTemplate) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException) override; public: explicit SignatureVerifierImpl( const com::sun::star::uno::Reference< @@ -76,25 +76,25 @@ public: const com::sun::star::uno::Reference< com::sun::star::xml::crypto::sax::XSignatureVerifyResultListener >& listener ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeSignatureVerifyResultListener( const com::sun::star::uno::Reference< com::sun::star::xml::crypto::sax::XSignatureVerifyResultListener >& listener ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; /* XInitialization */ virtual void SAL_CALL initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override; /* XServiceInfo */ virtual OUString SAL_CALL getImplementationName( ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; }; OUString SignatureVerifierImpl_getImplementationName() diff --git a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx index 1103fbb2259e..c143506c88e4 100644 --- a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx +++ b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx @@ -52,33 +52,33 @@ class XMLEncryptionTemplateImpl : public ::cppu::WeakImplHelper< virtual void SAL_CALL setTemplate( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper >& aXmlElement ) - throw (com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper > SAL_CALL getTemplate( - ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ) throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setTarget( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper >& aXmlElement - ) throw( com::sun::star::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE; + ) throw( com::sun::star::lang::IllegalArgumentException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper > SAL_CALL getTarget( - ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + ) throw (com::sun::star::uno::RuntimeException, std::exception) override ; virtual void SAL_CALL setStatus( ::com::sun::star::xml::crypto::SecurityOperationStatus status ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::xml::crypto::SecurityOperationStatus SAL_CALL getStatus( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; //Methods from XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName - ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ; //Helper for XServiceInfo static ::com::sun::star::uno::Sequence< OUString > impl_getSupportedServiceNames() ; diff --git a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx index f34f3e657178..b8153dfe5366 100644 --- a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx +++ b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx @@ -53,42 +53,42 @@ class XMLSignatureTemplateImpl : public ::cppu::WeakImplHelper< //Methods from XXMLSignatureTemplate virtual void SAL_CALL setTemplate( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper >& aXmlElement - ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE; + ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper > SAL_CALL getTemplate( - ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ) throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setTarget( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper >& aXmlElement - ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE; + ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, std::exception) override; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper > > SAL_CALL getTargets( - ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ) throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setBinding( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XUriBinding >& aUriBinding ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XUriBinding > SAL_CALL getBinding( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setStatus( ::com::sun::star::xml::crypto::SecurityOperationStatus status ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::xml::crypto::SecurityOperationStatus SAL_CALL getStatus( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; //Methods from XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName - ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ; //Helper for XServiceInfo static ::com::sun::star::uno::Sequence< OUString > impl_getSupportedServiceNames() ; diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.hxx b/xmlsecurity/source/helper/xmlsignaturehelper2.hxx index 2c9887765138..cf5de060d7d8 100644 --- a/xmlsecurity/source/helper/xmlsignaturehelper2.hxx +++ b/xmlsecurity/source/helper/xmlsignaturehelper2.hxx @@ -66,36 +66,36 @@ public: // com::sun::star::xml::crypto::sax::XSignatureCreationResultListener virtual void SAL_CALL signatureCreated( sal_Int32 securityId, com::sun::star::xml::crypto::SecurityOperationStatus creationResult ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; // com::sun::star::xml::crypto::sax::XSignatureVerifyResultListener virtual void SAL_CALL signatureVerified( sal_Int32 securityId, com::sun::star::xml::crypto::SecurityOperationStatus verifyResult ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; // com::sun::star::xml::sax::XDocumentHandler virtual void SAL_CALL startElement( const OUString& aName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL startDocument( ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL endDocument( ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL endElement( const OUString& aName ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL characters( const OUString& aChars ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setDocumentLocator( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XLocator >& xLocator ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; }; // XUriBinding @@ -113,10 +113,10 @@ public: explicit UriBindingHelper( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rxStorage ); void SAL_CALL setUriBinding( const OUString& uri, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& aInputStream ) - throw (com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL getUriBinding( const OUString& uri ) - throw (com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; static com::sun::star::uno::Reference < com::sun::star::io::XInputStream > OpenInputStream( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rxStore, const OUString& rURI ); }; diff --git a/xmlsecurity/source/helper/xsecctl.hxx b/xmlsecurity/source/helper/xsecctl.hxx index f7b933a4e519..1eb0033da503 100644 --- a/xmlsecurity/source/helper/xsecctl.hxx +++ b/xmlsecurity/source/helper/xsecctl.hxx @@ -487,24 +487,24 @@ public: * XSAXEventKeeperStatusChangeListener */ virtual void SAL_CALL blockingStatusChanged( sal_Bool isBlocking ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL collectionStatusChanged( sal_Bool isInsideCollectedElement ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL bufferStatusChanged( sal_Bool isBufferEmpty ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; /* * XSignatureCreationResultListener */ virtual void SAL_CALL signatureCreated( sal_Int32 securityId, com::sun::star::xml::crypto::SecurityOperationStatus nResult ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; /* * XSignatureVerifyResultListener */ virtual void SAL_CALL signatureVerified( sal_Int32 securityId, com::sun::star::xml::crypto::SecurityOperationStatus nResult ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; }; #endif diff --git a/xmlsecurity/source/helper/xsecparser.hxx b/xmlsecurity/source/helper/xsecparser.hxx index 0e22221aee6c..0cf47b18424b 100644 --- a/xmlsecurity/source/helper/xsecparser.hxx +++ b/xmlsecurity/source/helper/xsecparser.hxx @@ -110,42 +110,42 @@ public: * XDocumentHandler */ virtual void SAL_CALL startDocument( ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL endDocument( ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL startElement( const OUString& aName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL endElement( const OUString& aName ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL characters( const OUString& aChars ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setDocumentLocator( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XLocator >& xLocator ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; /* * XInitialization */ virtual void SAL_CALL initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments ) - throw(com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) override; }; #endif diff --git a/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx index 17d3fa34994a..0b2318d7317d 100644 --- a/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx +++ b/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx @@ -41,11 +41,11 @@ class CertificateExtension_XmlSecImpl : public ::cppu::WeakImplHelper< virtual ~CertificateExtension_XmlSecImpl() ; //Methods from XCertificateExtension - virtual sal_Bool SAL_CALL isCritical() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; + virtual sal_Bool SAL_CALL isCritical() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getExtensionId() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getExtensionId() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getExtensionValue() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getExtensionValue() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ; void setCertExtn( unsigned char* value, unsigned int vlen, unsigned char* id, unsigned int idlen, bool critical ) ; } ; diff --git a/xmlsecurity/source/xmlsec/nss/ciphercontext.hxx b/xmlsecurity/source/xmlsec/nss/ciphercontext.hxx index 82572e78ecb1..7d9c613ae056 100644 --- a/xmlsecurity/source/xmlsec/nss/ciphercontext.hxx +++ b/xmlsecurity/source/xmlsec/nss/ciphercontext.hxx @@ -73,8 +73,8 @@ public: static ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XCipherContext > Create( CK_MECHANISM_TYPE nNSSCipherID, const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aKey, const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aInitializationVector, bool bEncryption, bool bW3CPadding ); // XCipherContext - virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL convertWithCipherContext( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aData ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::DisposedException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL finalizeCipherContextAndDispose( ) throw (::com::sun::star::lang::DisposedException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL convertWithCipherContext( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aData ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::DisposedException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL finalizeCipherContextAndDispose( ) throw (::com::sun::star::lang::DisposedException, ::com::sun::star::uno::RuntimeException, std::exception) override; }; #endif diff --git a/xmlsecurity/source/xmlsec/nss/digestcontext.hxx b/xmlsecurity/source/xmlsec/nss/digestcontext.hxx index 8f8454cc215c..5f6783bb4f41 100644 --- a/xmlsecurity/source/xmlsec/nss/digestcontext.hxx +++ b/xmlsecurity/source/xmlsec/nss/digestcontext.hxx @@ -52,8 +52,8 @@ public: // XDigestContext - virtual void SAL_CALL updateDigest( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aData ) throw (::com::sun::star::lang::DisposedException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL finalizeDigestAndDispose() throw (::com::sun::star::lang::DisposedException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL updateDigest( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aData ) throw (::com::sun::star::lang::DisposedException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL finalizeDigestAndDispose() throw (::com::sun::star::lang::DisposedException, ::com::sun::star::uno::RuntimeException, std::exception) override; }; #endif diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx index 099d4307a879..270184f8296b 100644 --- a/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx +++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx @@ -47,20 +47,20 @@ public: static bool initNSS( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext ); /* XDigestContextSupplier */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XDigestContext > SAL_CALL getDigestContext( ::sal_Int32 nDigestID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aParams ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XDigestContext > SAL_CALL getDigestContext( ::sal_Int32 nDigestID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aParams ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; /* XCipherContextSupplier */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XCipherContext > SAL_CALL getCipherContext( ::sal_Int32 nCipherID, const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aKey, const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aInitializationVector, sal_Bool bEncryption, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aParams ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XCipherContext > SAL_CALL getCipherContext( ::sal_Int32 nCipherID, const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aKey, const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aInitializationVector, sal_Bool bEncryption, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aParams ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; /* XServiceInfo */ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; }; OUString ONSSInitializer_getImplementationName() diff --git a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx index 0097fcb6ab68..b7f138435ca1 100644 --- a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx @@ -46,15 +46,15 @@ class SanExtensionImpl : public ::cppu::WeakImplHelper< virtual ~SanExtensionImpl() ; //Methods from XCertificateExtension - virtual sal_Bool SAL_CALL isCritical() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; + virtual sal_Bool SAL_CALL isCritical() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getExtensionId() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getExtensionId() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getExtensionValue() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getExtensionValue() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ; //Methods from XSanExtension - virtual ::com::sun::star::uno::Sequence< com::sun::star::security::CertAltNameEntry > SAL_CALL getAlternativeNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; + virtual ::com::sun::star::uno::Sequence< com::sun::star::security::CertAltNameEntry > SAL_CALL getAlternativeNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ; } ; #endif // INCLUDED_XMLSECURITY_SOURCE_XMLSEC_NSS_SANEXTENSION_NSSIMPL_HXX diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx index 29bee418f1d8..bc51812d7385 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx @@ -70,13 +70,13 @@ private: //Methods from XSecurityEnvironment //Methods from XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName - ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ; //Helper for XServiceInfo static ::com::sun::star::uno::Sequence< OUString > impl_getSupportedServiceNames() ; @@ -94,15 +94,15 @@ private: const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > > & intermediateCerts) - throw (::com::sun::star::uno::SecurityException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + throw (::com::sun::star::uno::SecurityException, ::com::sun::star::uno::RuntimeException, std::exception) override ; - virtual ::sal_Int32 SAL_CALL getCertificateCharacters( const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& xCert ) throw (::com::sun::star::uno::SecurityException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual ::sal_Int32 SAL_CALL getCertificateCharacters( const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& xCert ) throw (::com::sun::star::uno::SecurityException, ::com::sun::star::uno::RuntimeException, std::exception) override ; - virtual OUString SAL_CALL getSecurityEnvironmentInformation( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getSecurityEnvironmentInformation( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; //Methods from XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId() ; @@ -118,14 +118,14 @@ private: SECKEYPrivateKey* getPriKey( unsigned int position ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > > SAL_CALL getPersonalCertificates() throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > > SAL_CALL getPersonalCertificates() throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException, std::exception ) override ; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL getCertificate( const OUString& issuerName, const ::com::sun::star::uno::Sequence< sal_Int8 >& serialNumber ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL getCertificate( const OUString& issuerName, const ::com::sun::star::uno::Sequence< sal_Int8 >& serialNumber ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException, std::exception ) override ; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > > SAL_CALL buildCertificatePath( const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& beginCert ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > > SAL_CALL buildCertificatePath( const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& beginCert ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException, std::exception ) override ; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL createCertificateFromRaw( const ::com::sun::star::uno::Sequence< sal_Int8 >& rawCertificate ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL createCertificateFromAscii( const OUString& asciiCertificate ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL createCertificateFromRaw( const ::com::sun::star::uno::Sequence< sal_Int8 >& rawCertificate ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException, std::exception ) override ; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL createCertificateFromAscii( const OUString& asciiCertificate ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException, std::exception ) override ; //Native methods diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx index 8041c73e0d9f..563a574e4ca3 100644 --- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx @@ -43,21 +43,21 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSecurityContext > SAL_CALL createSecurityContext( const OUString& ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL freeSecurityContext( const com::sun::star::uno::Reference< com::sun::star::xml::crypto::XXMLSecurityContext >& securityContext ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; /* XServiceInfo */ virtual OUString SAL_CALL getImplementationName( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; }; OUString SEInitializer_NssImpl_getImplementationName() diff --git a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx index 1782de34684a..70714a4a8bc3 100644 --- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx @@ -43,44 +43,44 @@ class X509Certificate_NssImpl : public ::cppu::WeakImplHelper< virtual ~X509Certificate_NssImpl() ; //Methods from XCertificate - virtual sal_Int16 SAL_CALL getVersion( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual sal_Int16 SAL_CALL getVersion( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) override ; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getSerialNumber( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getSerialNumber( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) override ; - virtual OUString SAL_CALL getIssuerName( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; - virtual OUString SAL_CALL getSubjectName( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual OUString SAL_CALL getIssuerName( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) override ; + virtual OUString SAL_CALL getSubjectName( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) override ; - virtual ::com::sun::star::util::DateTime SAL_CALL getNotValidBefore( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; - virtual ::com::sun::star::util::DateTime SAL_CALL getNotValidAfter( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual ::com::sun::star::util::DateTime SAL_CALL getNotValidBefore( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) override ; + virtual ::com::sun::star::util::DateTime SAL_CALL getNotValidAfter( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) override ; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getIssuerUniqueID( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getSubjectUniqueID( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getIssuerUniqueID( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) override ; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getSubjectUniqueID( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) override ; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificateExtension > > SAL_CALL getExtensions( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificateExtension > > SAL_CALL getExtensions( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) override ; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificateExtension > SAL_CALL findCertificateExtension( const ::com::sun::star::uno::Sequence< sal_Int8 >& oid ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificateExtension > SAL_CALL findCertificateExtension( const ::com::sun::star::uno::Sequence< sal_Int8 >& oid ) throw (::com::sun::star::uno::RuntimeException, std::exception) override ; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getEncoded( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getEncoded( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) override ; virtual OUString SAL_CALL getSubjectPublicKeyAlgorithm() - throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + throw ( ::com::sun::star::uno::RuntimeException, std::exception) override ; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getSubjectPublicKeyValue() - throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + throw ( ::com::sun::star::uno::RuntimeException, std::exception) override ; virtual OUString SAL_CALL getSignatureAlgorithm() - throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + throw ( ::com::sun::star::uno::RuntimeException, std::exception) override ; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getSHA1Thumbprint() - throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + throw ( ::com::sun::star::uno::RuntimeException, std::exception) override ; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getMD5Thumbprint() - throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + throw ( ::com::sun::star::uno::RuntimeException, std::exception) override ; - virtual sal_Int32 SAL_CALL getCertificateUsage( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual sal_Int32 SAL_CALL getCertificateUsage( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) override ; //Methods from XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw (com::sun::star::uno::RuntimeException, std::exception) override; static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId() ; diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx index 3ad29ce884a6..d0b2128e99a2 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx @@ -52,23 +52,23 @@ class XMLEncryption_NssImpl : public ::cppu::WeakImplHelper< // ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; throw (com::sun::star::xml::crypto::XMLEncryptionException , com::sun::star::uno::SecurityException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLEncryptionTemplate > SAL_CALL decrypt( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLEncryptionTemplate >& aTemplate , const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSecurityContext >& aContext ) throw (com::sun::star::xml::crypto::XMLEncryptionException , com::sun::star::uno::SecurityException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; //Methods from XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName - ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ; //Helper for XServiceInfo static ::com::sun::star::uno::Sequence< OUString > impl_getSupportedServiceNames() ; diff --git a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx index 2b4537670809..25229b83d68e 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx @@ -54,35 +54,35 @@ class XMLSecurityContext_NssImpl : public ::cppu::WeakImplHelper< //Methods from XXMLSecurityContext virtual sal_Int32 SAL_CALL addSecurityEnvironment( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment >& aSecurityEnvironment - ) throw (::com::sun::star::security::SecurityInfrastructureException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ) throw (::com::sun::star::security::SecurityInfrastructureException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::sal_Int32 SAL_CALL getSecurityEnvironmentNumber( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > SAL_CALL getSecurityEnvironmentByIndex( ::sal_Int32 index ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > SAL_CALL getSecurityEnvironment( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::sal_Int32 SAL_CALL getDefaultSecurityEnvironmentIndex( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setDefaultSecurityEnvironmentIndex( sal_Int32 nDefaultEnvIndex ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; //Methods from XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName - ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ; //Helper for XServiceInfo static ::com::sun::star::uno::Sequence< OUString > impl_getSupportedServiceNames() ; diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx index 4e2ac2a6a766..f753b300ee33 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx @@ -51,23 +51,23 @@ class XMLSignature_NssImpl : public ::cppu::WeakImplHelper< const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment >& aEnvironment ) throw (com::sun::star::xml::crypto::XMLSignatureException, com::sun::star::uno::SecurityException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + com::sun::star::uno::RuntimeException, std::exception) override ; virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSignatureTemplate > SAL_CALL validate( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSignatureTemplate >& aTemplate , const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSecurityContext >& aContext ) throw( com::sun::star::uno::RuntimeException, com::sun::star::uno::SecurityException, - com::sun::star::xml::crypto::XMLSignatureException, std::exception) SAL_OVERRIDE; + com::sun::star::xml::crypto::XMLSignatureException, std::exception) override; //Methods from XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName - ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override ; //Helper for XServiceInfo static ::com::sun::star::uno::Sequence< OUString > impl_getSupportedServiceNames() ; diff --git a/xmlsecurity/source/xmlsec/serialnumberadapter.cxx b/xmlsecurity/source/xmlsec/serialnumberadapter.cxx index 92ba0227f351..1abe1325a516 100644 --- a/xmlsecurity/source/xmlsec/serialnumberadapter.cxx +++ b/xmlsecurity/source/xmlsec/serialnumberadapter.cxx @@ -50,25 +50,25 @@ private: virtual ~Service() {} virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return xml_security::serial_number_adapter::implementationName(); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return xml_security::serial_number_adapter::serviceNames(); } virtual OUString SAL_CALL toString( css::uno::Sequence< sal_Int8 > const & SerialNumber) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return bigIntegerToNumericString(SerialNumber); } virtual css::uno::Sequence< sal_Int8 > SAL_CALL toSequence( OUString const & SerialNumber) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return numericStringToBigInteger(SerialNumber); } }; diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx index 5208487a22c0..c6820876be9b 100644 --- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx +++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx @@ -134,25 +134,25 @@ public: /* com::sun::star::xml::wrapper::XXMLDocumentWrapper */ virtual com::sun::star::uno::Reference< com::sun::star::xml::wrapper::XXMLElementWrapper > SAL_CALL getCurrentElement( ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setCurrentElement( const com::sun::star::uno::Reference< com::sun::star::xml::wrapper::XXMLElementWrapper >& element ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeCurrentElement( ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isCurrent( const com::sun::star::uno::Reference< com::sun::star::xml::wrapper::XXMLElementWrapper >& node ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isCurrentElementEmpty( ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getNodeName( const com::sun::star::uno::Reference< com::sun::star::xml::wrapper::XXMLElementWrapper >& node ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL clearUselessData( const com::sun::star::uno::Reference< @@ -161,11 +161,11 @@ public: com::sun::star::xml::wrapper::XXMLElementWrapper > >& reservedDescendants, const com::sun::star::uno::Reference< com::sun::star::xml::wrapper::XXMLElementWrapper >& stopAtNode ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL collapse( const com::sun::star::uno::Reference< com::sun::star::xml::wrapper::XXMLElementWrapper >& node ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL generateSAXEvents( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& handler, @@ -174,84 +174,84 @@ public: com::sun::star::xml::wrapper::XXMLElementWrapper >& startNode, const com::sun::star::uno::Reference< com::sun::star::xml::wrapper::XXMLElementWrapper >& endNode ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL getTree( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& handler ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL rebuildIDLink( const com::sun::star::uno::Reference< com::sun::star::xml::wrapper::XXMLElementWrapper >& node ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; /* com::sun::star::xml::sax::XDocumentHandler */ virtual void SAL_CALL startDocument( ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL endDocument( ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL startElement( const OUString& aName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL endElement( const OUString& aName ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL characters( const OUString& aChars ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setDocumentLocator( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XLocator >& xLocator ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; /* com::sun::star::xml::csax::XCompressedDocumentHandler */ virtual void SAL_CALL compressedStartDocument( ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL compressedEndDocument( ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL compressedStartElement( const OUString& aName, const com::sun::star::uno::Sequence< com::sun::star::xml::csax::XMLAttribute >& aAttributes ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL compressedEndElement( const OUString& aName ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL compressedCharacters( const OUString& aChars ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL compressedIgnorableWhitespace( const OUString& aWhitespaces ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL compressedProcessingInstruction( const OUString& aTarget, const OUString& aData ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL compressedSetDocumentLocator( sal_Int32 columnNumber, sal_Int32 lineNumber, const OUString& publicId, const OUString& systemId ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; /* com::sun::star::lang::XServiceInfo */ virtual OUString SAL_CALL getImplementationName( ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; }; OUString XMLDocumentWrapper_XmlSecImpl_getImplementationName() diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx index e406f007e96a..5082bb00869a 100644 --- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx +++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx @@ -64,17 +64,17 @@ public: /* com::sun::star::lang::XUnoTunnel */ virtual sal_Int64 SAL_CALL getSomething( const com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; static com::sun::star::uno::Sequence < sal_Int8 > getUnoTunnelImplementationId() throw(com::sun::star::uno::RuntimeException); /* com::sun::star::lang::XServiceInfo */ virtual OUString SAL_CALL getImplementationName( ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; public: /* |