diff options
Diffstat (limited to 'xmlsecurity/source')
67 files changed, 478 insertions, 884 deletions
diff --git a/xmlsecurity/source/component/certificatecontainer.cxx b/xmlsecurity/source/component/certificatecontainer.cxx index a972dc33dc09..0635fd702849 100644 --- a/xmlsecurity/source/component/certificatecontainer.cxx +++ b/xmlsecurity/source/component/certificatecontainer.cxx @@ -46,21 +46,18 @@ CertificateContainer::searchMap( const OUString & url, const OUString & certific bool CertificateContainer::isTemporaryCertificate ( const OUString & url, const OUString & certificate_name ) - throw(css::uno::RuntimeException) { return searchMap( url, certificate_name, certMap); } bool CertificateContainer::isCertificateTrust ( const OUString & url, const OUString & certificate_name ) - throw(css::uno::RuntimeException) { return searchMap( url, certificate_name, certTrustMap); } sal_Bool CertificateContainer::addCertificate( const OUString & url, const OUString & certificate_name, sal_Bool trust ) - throw(css::uno::RuntimeException, std::exception) { certMap.insert( Map::value_type( url, certificate_name ) ); @@ -72,7 +69,7 @@ CertificateContainer::addCertificate( const OUString & url, const OUString & cer } ::security::CertificateContainerStatus -CertificateContainer::hasCertificate( const OUString & url, const OUString & certificate_name ) throw(css::uno::RuntimeException, std::exception) +CertificateContainer::hasCertificate( const OUString & url, const OUString & certificate_name ) { if ( isTemporaryCertificate( url, certificate_name ) ) { @@ -88,28 +85,24 @@ CertificateContainer::hasCertificate( const OUString & url, const OUString & cer OUString SAL_CALL CertificateContainer::getImplementationName( ) - throw(css::uno::RuntimeException, std::exception) { return impl_getStaticImplementationName(); } sal_Bool SAL_CALL CertificateContainer::supportsService( const OUString& ServiceName ) - throw(css::uno::RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } Sequence< OUString > SAL_CALL CertificateContainer::getSupportedServiceNames( ) - throw(css::uno::RuntimeException, std::exception) { return impl_getStaticSupportedServiceNames(); } Sequence< OUString > SAL_CALL CertificateContainer::impl_getStaticSupportedServiceNames( ) - throw(css::uno::RuntimeException) { Sequence< OUString > aRet { "com.sun.star.security.CertificateContainer" }; return aRet; @@ -117,13 +110,11 @@ CertificateContainer::impl_getStaticSupportedServiceNames( ) OUString SAL_CALL CertificateContainer::impl_getStaticImplementationName() - throw(css::uno::RuntimeException) { return OUString("com.sun.star.security.CertificateContainer"); } Reference< XInterface > SAL_CALL CertificateContainer::impl_createInstance( const Reference< XMultiServiceFactory >& xServiceManager ) - throw( RuntimeException ) { return Reference< XInterface >( *new CertificateContainer( xServiceManager ) ); } diff --git a/xmlsecurity/source/component/certificatecontainer.hxx b/xmlsecurity/source/component/certificatecontainer.hxx index acb8c3e3eee2..c1fe605fc183 100644 --- a/xmlsecurity/source/component/certificatecontainer.hxx +++ b/xmlsecurity/source/component/certificatecontainer.hxx @@ -41,36 +41,36 @@ class CertificateContainer : public ::cppu::WeakImplHelper< css::lang::XServiceI static bool SAL_CALL searchMap( const OUString & url, const OUString & certificate_name, Map &_certMap ); /// @throws css::uno::RuntimeException - bool SAL_CALL isTemporaryCertificate( const OUString & url, const OUString & certificate_name ) throw(css::uno::RuntimeException); + bool SAL_CALL isTemporaryCertificate( const OUString & url, const OUString & certificate_name ); /// @throws css::uno::RuntimeException - bool SAL_CALL isCertificateTrust( const OUString & url, const OUString & certificate_name ) throw(css::uno::RuntimeException); + bool SAL_CALL isCertificateTrust( const OUString & url, const OUString & certificate_name ); public: explicit CertificateContainer(const css::uno::Reference< css::lang::XMultiServiceFactory >& ) {} virtual ~CertificateContainer() override {} - virtual sal_Bool SAL_CALL addCertificate( const OUString & url, const OUString & certificate_name, sal_Bool trust ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::security::CertificateContainerStatus SAL_CALL hasCertificate( const OUString & url, const OUString & certificate_name ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL addCertificate( const OUString & url, const OUString & certificate_name, sal_Bool trust ) override; + virtual css::security::CertificateContainerStatus SAL_CALL hasCertificate( const OUString & url, const OUString & certificate_name ) override; // provide factory /// @throws css::uno::RuntimeException - static OUString SAL_CALL impl_getStaticImplementationName( ) throw(css::uno::RuntimeException); + static OUString SAL_CALL impl_getStaticImplementationName( ); /// @throws css::uno::RuntimeException static css::uno::Sequence< OUString > SAL_CALL - impl_getStaticSupportedServiceNames( ) throw(css::uno::RuntimeException); + impl_getStaticSupportedServiceNames( ); /// @throws css::uno::RuntimeException static css::uno::Reference< css::uno::XInterface > SAL_CALL - impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::RuntimeException ); + impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ); // XServiceInfo - 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 OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames( ) override; }; diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx index 56bfb5558f70..353e115befaf 100644 --- a/xmlsecurity/source/component/documentdigitalsignatures.cxx +++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx @@ -62,7 +62,6 @@ DocumentDigitalSignatures::~DocumentDigitalSignatures() } void DocumentDigitalSignatures::initialize( const Sequence< Any >& aArguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { if (aArguments.getLength() > 2) throw css::lang::IllegalArgumentException( @@ -93,21 +92,18 @@ void DocumentDigitalSignatures::initialize( const Sequence< Any >& aArguments) } OUString DocumentDigitalSignatures::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return GetImplementationName(); } sal_Bool DocumentDigitalSignatures::supportsService( OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } css::uno::Sequence<OUString> DocumentDigitalSignatures::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { return GetSupportedServiceNames(); } @@ -115,7 +111,6 @@ DocumentDigitalSignatures::getSupportedServiceNames() sal_Bool DocumentDigitalSignatures::signDocumentContent( const Reference< css::embed::XStorage >& rxStorage, const Reference< css::io::XStream >& xSignStream) - throw (RuntimeException, std::exception) { OSL_ENSURE(!m_sODFVersion.isEmpty(), "DocumentDigitalSignatures: ODF Version not set, assuming minimum 1.2"); return ImplViewSignatures( rxStorage, xSignStream, DocumentSignatureMode::Content, false ); @@ -124,7 +119,7 @@ sal_Bool DocumentDigitalSignatures::signDocumentContent( Sequence< css::security::DocumentSignatureInformation > DocumentDigitalSignatures::verifyDocumentContentSignatures( const Reference< css::embed::XStorage >& rxStorage, - const Reference< css::io::XInputStream >& xSignInStream ) throw (RuntimeException, std::exception) + const Reference< css::io::XInputStream >& xSignInStream ) { OSL_ENSURE(!m_sODFVersion.isEmpty(),"DocumentDigitalSignatures: ODF Version not set, assuming minimum 1.2"); return ImplVerifySignatures( rxStorage, xSignInStream, DocumentSignatureMode::Content ); @@ -132,21 +127,20 @@ DocumentDigitalSignatures::verifyDocumentContentSignatures( void DocumentDigitalSignatures::showDocumentContentSignatures( const Reference< css::embed::XStorage >& rxStorage, - const Reference< css::io::XInputStream >& xSignInStream ) throw (RuntimeException, std::exception) + const Reference< css::io::XInputStream >& xSignInStream ) { OSL_ENSURE(!m_sODFVersion.isEmpty(),"DocumentDigitalSignatures: ODF Version not set, assuming minimum 1.2"); ImplViewSignatures( rxStorage, xSignInStream, DocumentSignatureMode::Content, true ); } OUString DocumentDigitalSignatures::getDocumentContentSignatureDefaultStreamName() - throw (css::uno::RuntimeException, std::exception) { return DocumentSignatureHelper::GetDocumentContentSignatureDefaultStreamName(); } sal_Bool DocumentDigitalSignatures::signScriptingContent( const Reference< css::embed::XStorage >& rxStorage, - const Reference< css::io::XStream >& xSignStream ) throw (RuntimeException, std::exception) + const Reference< css::io::XStream >& xSignStream ) { OSL_ENSURE(!m_sODFVersion.isEmpty(),"DocumentDigitalSignatures: ODF Version not set, assuming minimum 1.2"); OSL_ENSURE(m_nArgumentsCount == 2, "DocumentDigitalSignatures: Service was not initialized properly"); @@ -156,7 +150,7 @@ sal_Bool DocumentDigitalSignatures::signScriptingContent( Sequence< css::security::DocumentSignatureInformation > DocumentDigitalSignatures::verifyScriptingContentSignatures( const Reference< css::embed::XStorage >& rxStorage, - const Reference< css::io::XInputStream >& xSignInStream ) throw (RuntimeException, std::exception) + const Reference< css::io::XInputStream >& xSignInStream ) { OSL_ENSURE(!m_sODFVersion.isEmpty(),"DocumentDigitalSignatures: ODF Version not set, assuming minimum 1.2"); return ImplVerifySignatures( rxStorage, xSignInStream, DocumentSignatureMode::Macros ); @@ -164,14 +158,13 @@ DocumentDigitalSignatures::verifyScriptingContentSignatures( void DocumentDigitalSignatures::showScriptingContentSignatures( const Reference< css::embed::XStorage >& rxStorage, - const Reference< css::io::XInputStream >& xSignInStream ) throw (RuntimeException, std::exception) + const Reference< css::io::XInputStream >& xSignInStream ) { OSL_ENSURE(!m_sODFVersion.isEmpty(),"DocumentDigitalSignatures: ODF Version not set, assuming minimum 1.2"); ImplViewSignatures( rxStorage, xSignInStream, DocumentSignatureMode::Macros, true ); } OUString DocumentDigitalSignatures::getScriptingContentSignatureDefaultStreamName() - throw (css::uno::RuntimeException, std::exception) { return DocumentSignatureHelper::GetScriptingContentSignatureDefaultStreamName(); } @@ -179,7 +172,7 @@ OUString DocumentDigitalSignatures::getScriptingContentSignatureDefaultStreamNam sal_Bool DocumentDigitalSignatures::signPackage( const Reference< css::embed::XStorage >& rxStorage, - const Reference< css::io::XStream >& xSignStream ) throw (RuntimeException, std::exception) + const Reference< css::io::XStream >& xSignStream ) { OSL_ENSURE(!m_sODFVersion.isEmpty(),"DocumentDigitalSignatures: ODF Version not set, assuming minimum 1.2"); return ImplViewSignatures( rxStorage, xSignStream, DocumentSignatureMode::Package, false ); @@ -188,7 +181,7 @@ sal_Bool DocumentDigitalSignatures::signPackage( Sequence< css::security::DocumentSignatureInformation > DocumentDigitalSignatures::verifyPackageSignatures( const Reference< css::embed::XStorage >& rxStorage, - const Reference< css::io::XInputStream >& xSignInStream ) throw (RuntimeException, std::exception) + const Reference< css::io::XInputStream >& xSignInStream ) { OSL_ENSURE(!m_sODFVersion.isEmpty(),"DocumentDigitalSignatures: ODF Version not set, assuming minimum 1.2"); return ImplVerifySignatures( rxStorage, xSignInStream, DocumentSignatureMode::Package ); @@ -196,14 +189,13 @@ DocumentDigitalSignatures::verifyPackageSignatures( void DocumentDigitalSignatures::showPackageSignatures( const Reference< css::embed::XStorage >& rxStorage, - const Reference< css::io::XInputStream >& xSignInStream ) throw (RuntimeException, std::exception) + const Reference< css::io::XInputStream >& xSignInStream ) { OSL_ENSURE(!m_sODFVersion.isEmpty(),"DocumentDigitalSignatures: ODF Version not set, assuming minimum 1.2"); ImplViewSignatures( rxStorage, xSignInStream, DocumentSignatureMode::Package, true ); } OUString DocumentDigitalSignatures::getPackageSignatureDefaultStreamName( ) - throw (css::uno::RuntimeException, std::exception) { return DocumentSignatureHelper::GetPackageSignatureDefaultStreamName(); } @@ -212,7 +204,7 @@ OUString DocumentDigitalSignatures::getPackageSignatureDefaultStreamName( ) void DocumentDigitalSignatures::ImplViewSignatures( const Reference< css::embed::XStorage >& rxStorage, const Reference< css::io::XInputStream >& xSignStream, - DocumentSignatureMode eMode, bool bReadOnly ) throw (RuntimeException, std::exception) + DocumentSignatureMode eMode, bool bReadOnly ) { Reference< io::XStream > xStream; if ( xSignStream.is() ) @@ -222,7 +214,7 @@ void DocumentDigitalSignatures::ImplViewSignatures( bool DocumentDigitalSignatures::ImplViewSignatures( const Reference< css::embed::XStorage >& rxStorage, const Reference< css::io::XStream >& xSignStream, - DocumentSignatureMode eMode, bool bReadOnly ) throw (RuntimeException, std::exception) + DocumentSignatureMode eMode, bool bReadOnly ) { bool bChanges = false; ScopedVclPtrInstance<DigitalSignaturesDialog> aSignaturesDialog( @@ -263,7 +255,7 @@ bool DocumentDigitalSignatures::ImplViewSignatures( Sequence< css::security::DocumentSignatureInformation > DocumentDigitalSignatures::ImplVerifySignatures( const Reference< css::embed::XStorage >& rxStorage, - const Reference< css::io::XInputStream >& xSignStream, DocumentSignatureMode eMode ) throw (RuntimeException) + const Reference< css::io::XInputStream >& xSignStream, DocumentSignatureMode eMode ) { DocumentSignatureManager aSignatureManager(mxCtx, eMode); @@ -397,7 +389,7 @@ DocumentDigitalSignatures::ImplVerifySignatures( } -void DocumentDigitalSignatures::manageTrustedSources( ) throw (RuntimeException, std::exception) +void DocumentDigitalSignatures::manageTrustedSources( ) { // MT: i45295 // SecEnv is only needed to display certificate information from trusted sources. @@ -416,7 +408,7 @@ void DocumentDigitalSignatures::manageTrustedSources( ) throw (RuntimeException } void DocumentDigitalSignatures::showCertificate( - const Reference< css::security::XCertificate >& Certificate ) throw (RuntimeException, std::exception) + const Reference< css::security::XCertificate >& Certificate ) { DocumentSignatureMode eMode{}; DocumentSignatureManager aSignatureManager(mxCtx, eMode); @@ -434,7 +426,7 @@ void DocumentDigitalSignatures::showCertificate( } sal_Bool DocumentDigitalSignatures::isAuthorTrusted( - const Reference< css::security::XCertificate >& Author ) throw (RuntimeException, std::exception) + const Reference< css::security::XCertificate >& Author ) { bool bFound = false; @@ -459,7 +451,7 @@ sal_Bool DocumentDigitalSignatures::isAuthorTrusted( return bFound; } -Reference< css::security::XCertificate > DocumentDigitalSignatures::chooseCertificate(OUString& rDescription) throw (RuntimeException, std::exception) +Reference< css::security::XCertificate > DocumentDigitalSignatures::chooseCertificate(OUString& rDescription) { Reference< css::xml::crypto::XSecurityEnvironment > xSecEnv; @@ -483,13 +475,13 @@ Reference< css::security::XCertificate > DocumentDigitalSignatures::chooseCertif } -sal_Bool DocumentDigitalSignatures::isLocationTrusted( const OUString& Location ) throw (RuntimeException, std::exception) +sal_Bool DocumentDigitalSignatures::isLocationTrusted( const OUString& Location ) { return SvtSecurityOptions().isTrustedLocationUri(Location); } void DocumentDigitalSignatures::addAuthorToTrustedSources( - const Reference< css::security::XCertificate >& Author ) throw (RuntimeException, std::exception) + const Reference< css::security::XCertificate >& Author ) { SvtSecurityOptions aSecOpts; @@ -513,7 +505,7 @@ void DocumentDigitalSignatures::addAuthorToTrustedSources( aSecOpts.SetTrustedAuthors( aTrustedAuthors ); } -void DocumentDigitalSignatures::addLocationToTrustedSources( const OUString& Location ) throw (RuntimeException, std::exception) +void DocumentDigitalSignatures::addLocationToTrustedSources( const OUString& Location ) { SvtSecurityOptions aSecOpt; @@ -525,12 +517,12 @@ void DocumentDigitalSignatures::addLocationToTrustedSources( const OUString& Loc aSecOpt.SetSecureURLs( aSecURLs ); } -OUString DocumentDigitalSignatures::GetImplementationName() throw (RuntimeException) +OUString DocumentDigitalSignatures::GetImplementationName() { return OUString( "com.sun.star.security.DocumentDigitalSignatures" ); } -Sequence< OUString > DocumentDigitalSignatures::GetSupportedServiceNames() throw (css::uno::RuntimeException) +Sequence< OUString > DocumentDigitalSignatures::GetSupportedServiceNames() { Sequence<OUString> aRet { "com.sun.star.security.DocumentDigitalSignatures" }; return aRet; @@ -538,7 +530,7 @@ Sequence< OUString > DocumentDigitalSignatures::GetSupportedServiceNames() throw Reference< XInterface > DocumentDigitalSignatures_CreateInstance( - const Reference< XComponentContext >& rCtx) throw ( Exception ) + const Reference< XComponentContext >& rCtx) { return static_cast<cppu::OWeakObject*>(new DocumentDigitalSignatures( rCtx )); } diff --git a/xmlsecurity/source/component/documentdigitalsignatures.hxx b/xmlsecurity/source/component/documentdigitalsignatures.hxx index f95ca192f8c8..6e23e2d7487d 100644 --- a/xmlsecurity/source/component/documentdigitalsignatures.hxx +++ b/xmlsecurity/source/component/documentdigitalsignatures.hxx @@ -55,11 +55,11 @@ private: bool m_bHasDocumentSignature; /// @throws css::uno::RuntimeException - bool ImplViewSignatures( const css::uno::Reference< css::embed::XStorage >& rxStorage, const css::uno::Reference< css::io::XStream >& xSignStream, DocumentSignatureMode eMode, bool bReadOnly ) throw (css::uno::RuntimeException, std::exception); + bool ImplViewSignatures( const css::uno::Reference< css::embed::XStorage >& rxStorage, const css::uno::Reference< css::io::XStream >& xSignStream, DocumentSignatureMode eMode, bool bReadOnly ); /// @throws css::uno::RuntimeException - void ImplViewSignatures( const css::uno::Reference< css::embed::XStorage >& rxStorage, const css::uno::Reference< css::io::XInputStream >& xSignStream, DocumentSignatureMode eMode, bool bReadOnly ) throw (css::uno::RuntimeException, std::exception); + void ImplViewSignatures( const css::uno::Reference< css::embed::XStorage >& rxStorage, const css::uno::Reference< css::io::XInputStream >& xSignStream, DocumentSignatureMode eMode, bool bReadOnly ); /// @throws css::uno::RuntimeException - css::uno::Sequence< css::security::DocumentSignatureInformation > ImplVerifySignatures( const css::uno::Reference< css::embed::XStorage >& rxStorage, const ::com::sun::star::uno::Reference< css::io::XInputStream >& xSignStream, DocumentSignatureMode eMode ) throw (css::uno::RuntimeException); + css::uno::Sequence< css::security::DocumentSignatureInformation > ImplVerifySignatures( const css::uno::Reference< css::embed::XStorage >& rxStorage, const ::com::sun::star::uno::Reference< css::io::XInputStream >& xSignStream, DocumentSignatureMode eMode ); public: explicit DocumentDigitalSignatures( const css::uno::Reference< css::uno::XComponentContext>& rxCtx ); @@ -67,49 +67,45 @@ public: // for service registration... /// @throws css::uno::RuntimeException - static OUString GetImplementationName() throw (css::uno::RuntimeException); + static OUString GetImplementationName(); /// @throws css::uno::RuntimeException - static css::uno::Sequence < OUString > GetSupportedServiceNames() throw (css::uno::RuntimeException); + static css::uno::Sequence < OUString > GetSupportedServiceNames(); //XInitialization - void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getImplementationName() override; - sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override; - css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XDocumentDigitalSignatures - sal_Bool SAL_CALL signDocumentContent( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Reference< css::io::XStream >& xSignStream ) throw (css::uno::RuntimeException, std::exception) override; - css::uno::Sequence< css::security::DocumentSignatureInformation > SAL_CALL verifyDocumentContentSignatures( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Reference< css::io::XInputStream >& xSignInStream ) throw (css::uno::RuntimeException, std::exception) override; - void SAL_CALL showDocumentContentSignatures( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Reference< css::io::XInputStream >& xSignInStream ) throw (css::uno::RuntimeException, std::exception) override; - OUString SAL_CALL getDocumentContentSignatureDefaultStreamName( ) throw (css::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL signScriptingContent( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Reference< css::io::XStream >& xSignStream ) throw (css::uno::RuntimeException, std::exception) override; - css::uno::Sequence< css::security::DocumentSignatureInformation > SAL_CALL verifyScriptingContentSignatures( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Reference< css::io::XInputStream >& xSignInStream ) throw (css::uno::RuntimeException, std::exception) override; - void SAL_CALL showScriptingContentSignatures( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Reference< css::io::XInputStream >& xSignInStream ) throw (css::uno::RuntimeException, std::exception) override; - OUString SAL_CALL getScriptingContentSignatureDefaultStreamName( ) throw (css::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL signPackage( const css::uno::Reference< css::embed::XStorage >& Storage, const css::uno::Reference< css::io::XStream >& xSignStream ) throw (css::uno::RuntimeException, std::exception) override; - css::uno::Sequence< css::security::DocumentSignatureInformation > SAL_CALL verifyPackageSignatures( const css::uno::Reference< css::embed::XStorage >& Storage, const css::uno::Reference< css::io::XInputStream >& xSignInStream ) throw (css::uno::RuntimeException, std::exception) override; - void SAL_CALL showPackageSignatures( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Reference< css::io::XInputStream >& xSignInStream ) throw (css::uno::RuntimeException, std::exception) override; - OUString SAL_CALL getPackageSignatureDefaultStreamName( ) throw (css::uno::RuntimeException, std::exception) override; - void SAL_CALL showCertificate( const css::uno::Reference< css::security::XCertificate >& Certificate ) throw (css::uno::RuntimeException, std::exception) override; - void SAL_CALL manageTrustedSources( ) throw (css::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isAuthorTrusted( const css::uno::Reference< css::security::XCertificate >& Author ) throw (css::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isLocationTrusted( const OUString& Location ) throw (css::uno::RuntimeException, std::exception) override; - void SAL_CALL addAuthorToTrustedSources( const css::uno::Reference< css::security::XCertificate >& Author ) throw (css::uno::RuntimeException, std::exception) override; - void SAL_CALL addLocationToTrustedSources( const OUString& Location ) throw (css::uno::RuntimeException, std::exception) override; - - css::uno::Reference< css::security::XCertificate > SAL_CALL chooseCertificate(OUString& rDescription) throw (css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL signDocumentContent( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Reference< css::io::XStream >& xSignStream ) override; + css::uno::Sequence< css::security::DocumentSignatureInformation > SAL_CALL verifyDocumentContentSignatures( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Reference< css::io::XInputStream >& xSignInStream ) override; + void SAL_CALL showDocumentContentSignatures( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Reference< css::io::XInputStream >& xSignInStream ) override; + OUString SAL_CALL getDocumentContentSignatureDefaultStreamName( ) override; + sal_Bool SAL_CALL signScriptingContent( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Reference< css::io::XStream >& xSignStream ) override; + css::uno::Sequence< css::security::DocumentSignatureInformation > SAL_CALL verifyScriptingContentSignatures( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Reference< css::io::XInputStream >& xSignInStream ) override; + void SAL_CALL showScriptingContentSignatures( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Reference< css::io::XInputStream >& xSignInStream ) override; + OUString SAL_CALL getScriptingContentSignatureDefaultStreamName( ) override; + sal_Bool SAL_CALL signPackage( const css::uno::Reference< css::embed::XStorage >& Storage, const css::uno::Reference< css::io::XStream >& xSignStream ) override; + css::uno::Sequence< css::security::DocumentSignatureInformation > SAL_CALL verifyPackageSignatures( const css::uno::Reference< css::embed::XStorage >& Storage, const css::uno::Reference< css::io::XInputStream >& xSignInStream ) override; + void SAL_CALL showPackageSignatures( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Reference< css::io::XInputStream >& xSignInStream ) override; + OUString SAL_CALL getPackageSignatureDefaultStreamName( ) override; + void SAL_CALL showCertificate( const css::uno::Reference< css::security::XCertificate >& Certificate ) override; + void SAL_CALL manageTrustedSources( ) override; + sal_Bool SAL_CALL isAuthorTrusted( const css::uno::Reference< css::security::XCertificate >& Author ) override; + sal_Bool SAL_CALL isLocationTrusted( const OUString& Location ) override; + void SAL_CALL addAuthorToTrustedSources( const css::uno::Reference< css::security::XCertificate >& Author ) override; + void SAL_CALL addLocationToTrustedSources( const OUString& Location ) override; + + css::uno::Reference< css::security::XCertificate > SAL_CALL chooseCertificate(OUString& rDescription) override; }; /// @throws css::uno::Exception css::uno::Reference< css::uno::XInterface > SAL_CALL DocumentDigitalSignatures_CreateInstance( - const css::uno::Reference< css::uno::XComponentContext >& rCtx) throw ( css::uno::Exception ); + const css::uno::Reference< css::uno::XComponentContext >& rCtx); #endif // INCLUDED_XMLSECURITY_SOURCE_COMPONENT_DOCUMENTDIGITALSIGNATURES_HXX diff --git a/xmlsecurity/source/framework/decryptorimpl.cxx b/xmlsecurity/source/framework/decryptorimpl.cxx index d499bcd96087..757b5d9507d6 100644 --- a/xmlsecurity/source/framework/decryptorimpl.cxx +++ b/xmlsecurity/source/framework/decryptorimpl.cxx @@ -64,7 +64,6 @@ bool DecryptorImpl::checkReady() const } void DecryptorImpl::notifyResultListener() const - throw (cssu::Exception, cssu::RuntimeException) /****** DecryptorImpl/notifyResultListener *********************************** * * NAME @@ -81,7 +80,6 @@ void DecryptorImpl::notifyResultListener() const void DecryptorImpl::startEngine( const cssu::Reference< cssxc::XXMLEncryptionTemplate >& xEncryptionTemplate) - throw (cssu::Exception, cssu::RuntimeException) /****** DecryptorImpl/startEngine ******************************************** * * NAME @@ -117,20 +115,17 @@ void DecryptorImpl::startEngine( const cssu::Reference< /* XDecryptionResultBroadcaster */ void SAL_CALL DecryptorImpl::addDecryptionResultListener( const cssu::Reference< cssxc::sax::XDecryptionResultListener >& listener ) - throw (cssu::Exception, cssu::RuntimeException, std::exception) { m_xResultListener = listener; tryToPerform(); } void SAL_CALL DecryptorImpl::removeDecryptionResultListener( const cssu::Reference< cssxc::sax::XDecryptionResultListener >&) - throw (cssu::RuntimeException, std::exception) { } /* XInitialization */ void SAL_CALL DecryptorImpl::initialize( const cssu::Sequence< cssu::Any >& aArguments ) - throw (cssu::Exception, cssu::RuntimeException, std::exception) { OSL_ASSERT(aArguments.getLength() == 5); @@ -146,39 +141,33 @@ void SAL_CALL DecryptorImpl::initialize( const cssu::Sequence< cssu::Any >& aArg } OUString DecryptorImpl_getImplementationName () - throw (cssu::RuntimeException) { return OUString ( IMPLEMENTATION_NAME ); } cssu::Sequence< OUString > SAL_CALL DecryptorImpl_getSupportedServiceNames( ) - throw (cssu::RuntimeException) { cssu::Sequence<OUString> aRet { "com.sun.star.xml.crypto.sax.Decryptor" }; return aRet; } cssu::Reference< cssu::XInterface > SAL_CALL DecryptorImpl_createInstance( const cssu::Reference< cssl::XMultiServiceFactory >& xMSF) - throw( cssu::Exception ) { return static_cast<cppu::OWeakObject*>(new DecryptorImpl( comphelper::getComponentContext( xMSF ) )); } /* XServiceInfo */ OUString SAL_CALL DecryptorImpl::getImplementationName( ) - throw (cssu::RuntimeException, std::exception) { return DecryptorImpl_getImplementationName(); } sal_Bool SAL_CALL DecryptorImpl::supportsService( const OUString& rServiceName ) - throw (cssu::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } cssu::Sequence< OUString > SAL_CALL DecryptorImpl::getSupportedServiceNames( ) - throw (cssu::RuntimeException, std::exception) { return DecryptorImpl_getSupportedServiceNames(); } diff --git a/xmlsecurity/source/framework/decryptorimpl.hxx b/xmlsecurity/source/framework/decryptorimpl.hxx index 0c485250210f..b1b72c1ef0e9 100644 --- a/xmlsecurity/source/framework/decryptorimpl.hxx +++ b/xmlsecurity/source/framework/decryptorimpl.hxx @@ -51,13 +51,11 @@ class DecryptorImpl : public DecryptorImpl_Base private: css::uno::Reference< css::xml::crypto::XXMLSecurityContext > m_xXMLSecurityContext; - virtual void notifyResultListener() const - throw (css::uno::Exception, css::uno::RuntimeException) override; + virtual void notifyResultListener() const override; virtual bool checkReady() const override; virtual void startEngine( const css::uno::Reference< css::xml::crypto::XXMLEncryptionTemplate >& - xEncryptionTemplate) - throw (css::uno::Exception, css::uno::RuntimeException) override; + xEncryptionTemplate) override; public: explicit DecryptorImpl(const css::uno::Reference< css::uno::XComponentContext > & xContext); @@ -65,38 +63,29 @@ public: /* XDecryptionResultBroadcaster */ virtual void SAL_CALL addDecryptionResultListener( - const css::uno::Reference< css::xml::crypto::sax::XDecryptionResultListener >& listener ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::xml::crypto::sax::XDecryptionResultListener >& listener ) override; virtual void SAL_CALL removeDecryptionResultListener( - const css::uno::Reference< css::xml::crypto::sax::XDecryptionResultListener >& listener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::xml::crypto::sax::XDecryptionResultListener >& listener ) override; /* XInitialization */ virtual void SAL_CALL initialize( - const css::uno::Sequence< css::uno::Any >& aArguments ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Any >& aArguments ) override; /* XServiceInfo */ - 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) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; /// @throws css::uno::RuntimeException -OUString DecryptorImpl_getImplementationName() - throw ( css::uno::RuntimeException ); +OUString DecryptorImpl_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL DecryptorImpl_getSupportedServiceNames( ) - throw ( css::uno::RuntimeException ); +css::uno::Sequence< OUString > SAL_CALL DecryptorImpl_getSupportedServiceNames( ); /// @throws css::uno::Exception css::uno::Reference< css::uno::XInterface > -SAL_CALL DecryptorImpl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& rSMgr) - throw ( css::uno::Exception ); +SAL_CALL DecryptorImpl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& rSMgr); #endif diff --git a/xmlsecurity/source/framework/encryptionengine.cxx b/xmlsecurity/source/framework/encryptionengine.cxx index eb236e81be97..8cf7d295da5c 100644 --- a/xmlsecurity/source/framework/encryptionengine.cxx +++ b/xmlsecurity/source/framework/encryptionengine.cxx @@ -74,7 +74,6 @@ bool EncryptionEngine::checkReady() const } void EncryptionEngine::tryToPerform( ) - throw (Exception, RuntimeException) /****** EncryptionEngine/tryToPerform **************************************** * * NAME @@ -152,7 +151,6 @@ void EncryptionEngine::clearUp( ) const /* XBlockerMonitor */ void SAL_CALL EncryptionEngine::setBlockerId( sal_Int32 id ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { m_nIdOfBlocker = id; tryToPerform(); diff --git a/xmlsecurity/source/framework/encryptionengine.hxx b/xmlsecurity/source/framework/encryptionengine.hxx index c71ec058c739..33915c5ceb0e 100644 --- a/xmlsecurity/source/framework/encryptionengine.hxx +++ b/xmlsecurity/source/framework/encryptionengine.hxx @@ -69,8 +69,7 @@ protected: explicit EncryptionEngine( const css::uno::Reference< css::uno::XComponentContext > & xContext ); virtual ~EncryptionEngine() override {}; - virtual void tryToPerform( ) - throw (css::uno::Exception, css::uno::RuntimeException) override; + virtual void tryToPerform( ) override; virtual void clearUp( ) const override; virtual bool checkReady() const override; @@ -82,13 +81,11 @@ protected: /// @throws css::uno::Exception /// @throws css::uno::RuntimeException virtual void startEngine( const css::uno::Reference< css::xml::crypto::XXMLEncryptionTemplate >&) - throw (css::uno::Exception, css::uno::RuntimeException) {}; public: /* XBlockerMonitor */ - virtual void SAL_CALL setBlockerId( sal_Int32 id ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setBlockerId( sal_Int32 id ) override; }; #endif diff --git a/xmlsecurity/source/framework/encryptorimpl.cxx b/xmlsecurity/source/framework/encryptorimpl.cxx index 33bd583b5d85..8c274147c26f 100644 --- a/xmlsecurity/source/framework/encryptorimpl.cxx +++ b/xmlsecurity/source/framework/encryptorimpl.cxx @@ -73,7 +73,6 @@ bool EncryptorImpl::checkReady() const } void EncryptorImpl::notifyResultListener() const - throw (Exception, RuntimeException) /****** DecryptorImpl/notifyResultListener *********************************** * * NAME @@ -90,7 +89,6 @@ void EncryptorImpl::notifyResultListener() const void EncryptorImpl::startEngine( const Reference< cssxc::XXMLEncryptionTemplate >& xEncryptionTemplate) - throw (Exception, RuntimeException) /****** EncryptorImpl/startEngine ******************************************** * * NAME @@ -136,7 +134,6 @@ void EncryptorImpl::startEngine( const Reference< /* XReferenceCollector */ void SAL_CALL EncryptorImpl::setReferenceCount(sal_Int32) - throw (Exception, RuntimeException, std::exception) { /* * dummy method, because there is only one reference in @@ -146,27 +143,23 @@ void SAL_CALL EncryptorImpl::setReferenceCount(sal_Int32) } void SAL_CALL EncryptorImpl::setReferenceId( sal_Int32 id ) - throw (Exception, RuntimeException, std::exception) { m_nReferenceId = id; } /* XEncryptionResultBroadcaster */ void SAL_CALL EncryptorImpl::addEncryptionResultListener( const Reference< cssxc::sax::XEncryptionResultListener >& listener ) - throw (Exception, RuntimeException, std::exception) { m_xResultListener = listener; tryToPerform(); } void SAL_CALL EncryptorImpl::removeEncryptionResultListener( const Reference< cssxc::sax::XEncryptionResultListener >&) - throw (RuntimeException, std::exception) { } /* XInitialization */ void SAL_CALL EncryptorImpl::initialize( const Sequence< Any >& aArguments ) - throw (Exception, RuntimeException, std::exception) { OSL_ASSERT(aArguments.getLength() == 5); @@ -183,13 +176,11 @@ void SAL_CALL EncryptorImpl::initialize( const Sequence< Any >& aArguments ) OUString EncryptorImpl_getImplementationName () - throw (RuntimeException) { return OUString ( IMPLEMENTATION_NAME ); } Sequence< OUString > SAL_CALL EncryptorImpl_getSupportedServiceNames( ) - throw (RuntimeException) { Sequence<OUString> aRet { "com.sun.star.xml.crypto.sax.Encryptor" }; return aRet; @@ -197,26 +188,22 @@ Sequence< OUString > SAL_CALL EncryptorImpl_getSupportedServiceNames( ) Reference< XInterface > SAL_CALL EncryptorImpl_createInstance( const Reference< cssl::XMultiServiceFactory >& xMSF) - throw( Exception ) { return static_cast<cppu::OWeakObject*>(new EncryptorImpl( comphelper::getComponentContext( xMSF ) )); } /* XServiceInfo */ OUString SAL_CALL EncryptorImpl::getImplementationName( ) - throw (RuntimeException, std::exception) { return EncryptorImpl_getImplementationName(); } sal_Bool SAL_CALL EncryptorImpl::supportsService( const OUString& rServiceName ) - throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL EncryptorImpl::getSupportedServiceNames( ) - throw (RuntimeException, std::exception) { return EncryptorImpl_getSupportedServiceNames(); } diff --git a/xmlsecurity/source/framework/encryptorimpl.hxx b/xmlsecurity/source/framework/encryptorimpl.hxx index 561c041aa493..d0e8f05c5073 100644 --- a/xmlsecurity/source/framework/encryptorimpl.hxx +++ b/xmlsecurity/source/framework/encryptorimpl.hxx @@ -60,13 +60,11 @@ private: css::uno::Reference< css::xml::crypto::XSecurityEnvironment > m_xSecurityEnvironment; - virtual void notifyResultListener() const - throw (css::uno::Exception, css::uno::RuntimeException) override; + virtual void notifyResultListener() const override; virtual bool checkReady() const override; virtual void startEngine( const css::uno::Reference< css::xml::crypto::XXMLEncryptionTemplate >& - xEncryptionTemplate) - throw (css::uno::Exception, css::uno::RuntimeException) override; + xEncryptionTemplate) override; public: explicit EncryptorImpl(const css::uno::Reference< css::uno::XComponentContext > & xContext); @@ -76,48 +74,37 @@ public: virtual void SAL_CALL addEncryptionResultListener( const css::uno::Reference< css::xml::crypto::sax::XEncryptionResultListener >& - listener ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + listener ) override; virtual void SAL_CALL removeEncryptionResultListener( const css::uno::Reference< css::xml::crypto::sax::XEncryptionResultListener >& - listener ) - throw (css::uno::RuntimeException, std::exception) override; + listener ) override; /* XReferenceCollector */ - virtual void SAL_CALL setReferenceCount( sal_Int32 count ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setReferenceCount( sal_Int32 count ) override; - virtual void SAL_CALL setReferenceId( sal_Int32 id ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setReferenceId( sal_Int32 id ) override; /* XInitialization */ virtual void SAL_CALL initialize( - const css::uno::Sequence< css::uno::Any >& aArguments ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Any >& aArguments ) override; /* XServiceInfo */ - 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) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; /// @throws css::uno::RuntimeException -OUString EncryptorImpl_getImplementationName() - throw ( css::uno::RuntimeException ); +OUString EncryptorImpl_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL EncryptorImpl_getSupportedServiceNames( ) - throw ( css::uno::RuntimeException ); +css::uno::Sequence< OUString > SAL_CALL EncryptorImpl_getSupportedServiceNames( ); /// @throws css::uno::Exception css::uno::Reference< css::uno::XInterface > SAL_CALL EncryptorImpl_createInstance( - const css::uno::Reference< css::lang::XMultiServiceFactory >& rSMgr) - throw ( css::uno::Exception ); + const css::uno::Reference< css::lang::XMultiServiceFactory >& rSMgr); #endif diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx index e14bc1fa7830..bb1ce37ff4f2 100644 --- a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx +++ b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx @@ -858,7 +858,6 @@ sal_Int32 SAXEventKeeperImpl::createBlocker() /* XSAXEventKeeper */ sal_Int32 SAL_CALL SAXEventKeeperImpl::addElementCollector( ) - throw (cssu::RuntimeException, std::exception) { return createElementCollector( cssxc::sax::ElementMarkPriority_AFTERMODIFY, @@ -867,32 +866,27 @@ sal_Int32 SAL_CALL SAXEventKeeperImpl::addElementCollector( ) } void SAL_CALL SAXEventKeeperImpl::removeElementCollector( sal_Int32 id ) - throw (cssu::RuntimeException, std::exception) { markElementMarkBuffer(id); } sal_Int32 SAL_CALL SAXEventKeeperImpl::addBlocker( ) - throw (cssu::RuntimeException, std::exception) { return createBlocker(); } void SAL_CALL SAXEventKeeperImpl::removeBlocker( sal_Int32 id ) - throw (cssu::RuntimeException, std::exception) { markElementMarkBuffer(id); } sal_Bool SAL_CALL SAXEventKeeperImpl::isBlocking( ) - throw (cssu::RuntimeException, std::exception) { return (m_pCurrentBlockingBufferNode != nullptr); } cssu::Reference< cssxw::XXMLElementWrapper > SAL_CALL SAXEventKeeperImpl::getElement( sal_Int32 id ) - throw (cssu::RuntimeException, std::exception) { cssu::Reference< cssxw::XXMLElementWrapper > rc; @@ -908,7 +902,6 @@ cssu::Reference< cssxw::XXMLElementWrapper > SAL_CALL void SAL_CALL SAXEventKeeperImpl::setElement( sal_Int32 id, const cssu::Reference< cssxw::XXMLElementWrapper >& aElement ) - throw (cssu::RuntimeException, std::exception) { if (aElement.is()) { @@ -939,7 +932,6 @@ void SAL_CALL SAXEventKeeperImpl::setElement( cssu::Reference< cssxs::XDocumentHandler > SAL_CALL SAXEventKeeperImpl::setNextHandler( const cssu::Reference< cssxs::XDocumentHandler >& xNewHandler ) - throw (cssu::RuntimeException, std::exception) { cssu::Reference< cssxs::XDocumentHandler > xOldHandler = m_xNextHandler; @@ -948,7 +940,6 @@ cssu::Reference< cssxs::XDocumentHandler > SAL_CALL SAXEventKeeperImpl::setNextH } OUString SAL_CALL SAXEventKeeperImpl::printBufferNodeTree() - throw (cssu::RuntimeException, std::exception) { OUString rc; @@ -962,7 +953,6 @@ OUString SAL_CALL SAXEventKeeperImpl::printBufferNodeTree() } cssu::Reference< cssxw::XXMLElementWrapper > SAL_CALL SAXEventKeeperImpl::getCurrentBlockingNode() - throw (cssu::RuntimeException, std::exception) { cssu::Reference< cssxw::XXMLElementWrapper > rc; @@ -978,7 +968,6 @@ cssu::Reference< cssxw::XXMLElementWrapper > SAL_CALL SAXEventKeeperImpl::getCur sal_Int32 SAL_CALL SAXEventKeeperImpl::addSecurityElementCollector( cssxc::sax::ElementMarkPriority priority, sal_Bool modifyElement ) - throw (cssu::RuntimeException, std::exception) { return createElementCollector( priority, @@ -987,7 +976,6 @@ sal_Int32 SAL_CALL SAXEventKeeperImpl::addSecurityElementCollector( } void SAL_CALL SAXEventKeeperImpl::setSecurityId( sal_Int32 id, sal_Int32 securityId ) - throw (cssu::RuntimeException, std::exception) { ElementMark* pElementMark = findElementMarkBuffer(id); if (pElementMark != nullptr) @@ -1001,7 +989,6 @@ void SAL_CALL SAXEventKeeperImpl::setSecurityId( sal_Int32 id, sal_Int32 securit void SAL_CALL SAXEventKeeperImpl::addReferenceResolvedListener( sal_Int32 referenceId, const cssu::Reference< cssxc::sax::XReferenceResolvedListener >& listener ) - throw (cssu::RuntimeException, std::exception) { ElementCollector* pElementCollector = static_cast<ElementCollector*>(findElementMarkBuffer(referenceId)); if (pElementCollector != nullptr) @@ -1013,27 +1000,23 @@ void SAL_CALL SAXEventKeeperImpl::addReferenceResolvedListener( void SAL_CALL SAXEventKeeperImpl::removeReferenceResolvedListener( sal_Int32 /*referenceId*/, const cssu::Reference< cssxc::sax::XReferenceResolvedListener >&) - throw (cssu::RuntimeException, std::exception) { } /* XSAXEventKeeperStatusChangeBroadcaster */ void SAL_CALL SAXEventKeeperImpl::addSAXEventKeeperStatusChangeListener( const cssu::Reference< cssxc::sax::XSAXEventKeeperStatusChangeListener >& listener ) - throw (cssu::RuntimeException, std::exception) { m_xSAXEventKeeperStatusChangeListener = listener; } void SAL_CALL SAXEventKeeperImpl::removeSAXEventKeeperStatusChangeListener( const cssu::Reference< cssxc::sax::XSAXEventKeeperStatusChangeListener >&) - throw (cssu::RuntimeException, std::exception) { } /* XDocumentHandler */ void SAL_CALL SAXEventKeeperImpl::startDocument( ) - throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { if ( m_xNextHandler.is()) { @@ -1042,7 +1025,6 @@ void SAL_CALL SAXEventKeeperImpl::startDocument( ) } void SAL_CALL SAXEventKeeperImpl::endDocument( ) - throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { if ( m_xNextHandler.is()) { @@ -1053,7 +1035,6 @@ void SAL_CALL SAXEventKeeperImpl::endDocument( ) void SAL_CALL SAXEventKeeperImpl::startElement( const OUString& aName, const cssu::Reference< cssxs::XAttributeList >& xAttribs ) - throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { /* * If there is a following handler and no blocking now, then @@ -1091,7 +1072,6 @@ void SAL_CALL SAXEventKeeperImpl::startElement( } void SAL_CALL SAXEventKeeperImpl::endElement( const OUString& aName ) - throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { bool bIsCurrent = m_xXMLDocument->isCurrent(m_pCurrentBufferNode->getXMLElement()); @@ -1144,7 +1124,6 @@ void SAL_CALL SAXEventKeeperImpl::endElement( const OUString& aName ) } void SAL_CALL SAXEventKeeperImpl::characters( const OUString& aChars ) - throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { if (!m_bIsForwarding) { @@ -1162,14 +1141,12 @@ void SAL_CALL SAXEventKeeperImpl::characters( const OUString& aChars ) } void SAL_CALL SAXEventKeeperImpl::ignorableWhitespace( const OUString& aWhitespaces ) - throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { characters( aWhitespaces ); } void SAL_CALL SAXEventKeeperImpl::processingInstruction( const OUString& aTarget, const OUString& aData ) - throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { if (!m_bIsForwarding) { @@ -1187,13 +1164,11 @@ void SAL_CALL SAXEventKeeperImpl::processingInstruction( } void SAL_CALL SAXEventKeeperImpl::setDocumentLocator( const cssu::Reference< cssxs::XLocator >&) - throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { } /* XInitialization */ void SAL_CALL SAXEventKeeperImpl::initialize( const cssu::Sequence< cssu::Any >& aArguments ) - throw (cssu::Exception, cssu::RuntimeException, std::exception) { OSL_ASSERT(aArguments.getLength() == 1); @@ -1206,13 +1181,11 @@ void SAL_CALL SAXEventKeeperImpl::initialize( const cssu::Sequence< cssu::Any >& } OUString SAXEventKeeperImpl_getImplementationName () - throw (cssu::RuntimeException) { return OUString ( IMPLEMENTATION_NAME ); } cssu::Sequence< OUString > SAL_CALL SAXEventKeeperImpl_getSupportedServiceNames( ) - throw (cssu::RuntimeException) { cssu::Sequence<OUString> aRet { "com.sun.star.xml.crypto.sax.SAXEventKeeper" }; return aRet; @@ -1220,26 +1193,22 @@ cssu::Sequence< OUString > SAL_CALL SAXEventKeeperImpl_getSupportedServiceNames( cssu::Reference< cssu::XInterface > SAL_CALL SAXEventKeeperImpl_createInstance( const cssu::Reference< cssl::XMultiServiceFactory > &) - throw( cssu::Exception ) { return static_cast<cppu::OWeakObject*>(new SAXEventKeeperImpl()); } /* XServiceInfo */ OUString SAL_CALL SAXEventKeeperImpl::getImplementationName( ) - throw (cssu::RuntimeException, std::exception) { return SAXEventKeeperImpl_getImplementationName(); } sal_Bool SAL_CALL SAXEventKeeperImpl::supportsService( const OUString& rServiceName ) - throw (cssu::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } cssu::Sequence< OUString > SAL_CALL SAXEventKeeperImpl::getSupportedServiceNames( ) - throw (cssu::RuntimeException, std::exception) { return SAXEventKeeperImpl_getSupportedServiceNames(); } diff --git a/xmlsecurity/source/framework/securityengine.cxx b/xmlsecurity/source/framework/securityengine.cxx index 80e7ecfb8be1..fa8ec96428c1 100644 --- a/xmlsecurity/source/framework/securityengine.cxx +++ b/xmlsecurity/source/framework/securityengine.cxx @@ -34,7 +34,6 @@ SecurityEngine::SecurityEngine() /* XReferenceResolvedListener */ void SAL_CALL SecurityEngine::referenceResolved( sal_Int32 /*referenceId*/) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { m_nNumOfResolvedReferences++; tryToPerform(); @@ -42,7 +41,6 @@ void SAL_CALL SecurityEngine::referenceResolved( sal_Int32 /*referenceId*/) /* XKeyCollector */ void SAL_CALL SecurityEngine::setKeyId( sal_Int32 id ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { m_nIdOfKeyEC = id; tryToPerform(); @@ -50,7 +48,6 @@ void SAL_CALL SecurityEngine::setKeyId( sal_Int32 id ) /* XMissionTaker */ sal_Bool SAL_CALL SecurityEngine::endMission( ) - throw (css::uno::RuntimeException, std::exception) { bool rc = m_bMissionDone; diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.cxx b/xmlsecurity/source/framework/signaturecreatorimpl.cxx index 3e289b90f134..d938601afed7 100644 --- a/xmlsecurity/source/framework/signaturecreatorimpl.cxx +++ b/xmlsecurity/source/framework/signaturecreatorimpl.cxx @@ -68,7 +68,6 @@ bool SignatureCreatorImpl::checkReady() const } void SignatureCreatorImpl::notifyResultListener() const - throw (cssu::Exception, cssu::RuntimeException) /****** SignatureCreatorImpl/notifyResultListener ***************************** * * NAME @@ -85,7 +84,6 @@ void SignatureCreatorImpl::notifyResultListener() const void SignatureCreatorImpl::startEngine( const cssu::Reference< cssxc::XXMLSignatureTemplate >& xSignatureTemplate) - throw (cssu::Exception, cssu::RuntimeException) /****** SignatureCreatorImpl/startEngine ************************************* * * NAME @@ -147,7 +145,6 @@ void SignatureCreatorImpl::clearUp() const /* XBlockerMonitor */ void SAL_CALL SignatureCreatorImpl::setBlockerId( sal_Int32 id ) - throw (cssu::Exception, cssu::RuntimeException, std::exception) { m_nIdOfBlocker = id; tryToPerform(); @@ -156,7 +153,6 @@ void SAL_CALL SignatureCreatorImpl::setBlockerId( sal_Int32 id ) /* XSignatureCreationResultBroadcaster */ void SAL_CALL SignatureCreatorImpl::addSignatureCreationResultListener( const cssu::Reference< cssxc::sax::XSignatureCreationResultListener >& listener ) - throw (cssu::Exception, cssu::RuntimeException, std::exception) { m_xResultListener = listener; tryToPerform(); @@ -164,13 +160,11 @@ void SAL_CALL SignatureCreatorImpl::addSignatureCreationResultListener( void SAL_CALL SignatureCreatorImpl::removeSignatureCreationResultListener( const cssu::Reference< cssxc::sax::XSignatureCreationResultListener >&) - throw (cssu::RuntimeException, std::exception) { } /* XInitialization */ void SAL_CALL SignatureCreatorImpl::initialize( const cssu::Sequence< cssu::Any >& aArguments ) - throw (cssu::Exception, cssu::RuntimeException, std::exception) { OSL_ASSERT(aArguments.getLength() == 5); @@ -187,13 +181,11 @@ void SAL_CALL SignatureCreatorImpl::initialize( const cssu::Sequence< cssu::Any OUString SignatureCreatorImpl_getImplementationName () - throw (cssu::RuntimeException) { return OUString ( IMPLEMENTATION_NAME ); } cssu::Sequence< OUString > SAL_CALL SignatureCreatorImpl_getSupportedServiceNames( ) - throw (cssu::RuntimeException) { cssu::Sequence<OUString> aRet { "com.sun.star.xml.crypto.sax.SignatureCreator" }; return aRet; @@ -201,26 +193,22 @@ cssu::Sequence< OUString > SAL_CALL SignatureCreatorImpl_getSupportedServiceName cssu::Reference< cssu::XInterface > SAL_CALL SignatureCreatorImpl_createInstance( const cssu::Reference< cssl::XMultiServiceFactory >& /*xMSF*/ ) - throw( cssu::Exception ) { return static_cast<cppu::OWeakObject*>(new SignatureCreatorImpl); } /* XServiceInfo */ OUString SAL_CALL SignatureCreatorImpl::getImplementationName( ) - throw (cssu::RuntimeException, std::exception) { return SignatureCreatorImpl_getImplementationName(); } sal_Bool SAL_CALL SignatureCreatorImpl::supportsService( const OUString& rServiceName ) - throw (cssu::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } cssu::Sequence< OUString > SAL_CALL SignatureCreatorImpl::getSupportedServiceNames( ) - throw (cssu::RuntimeException, std::exception) { return SignatureCreatorImpl_getSupportedServiceNames(); } diff --git a/xmlsecurity/source/framework/signatureengine.cxx b/xmlsecurity/source/framework/signatureengine.cxx index b22d97cbccf4..8b570465c44d 100644 --- a/xmlsecurity/source/framework/signatureengine.cxx +++ b/xmlsecurity/source/framework/signatureengine.cxx @@ -75,7 +75,6 @@ bool SignatureEngine::checkReady() const } void SignatureEngine::tryToPerform( ) - throw (cssu::Exception, cssu::RuntimeException) /****** SignatureEngine/tryToPerform ***************************************** * * NAME @@ -164,14 +163,12 @@ void SignatureEngine::clearUp( ) const /* XReferenceCollector */ void SAL_CALL SignatureEngine::setReferenceCount( sal_Int32 count ) - throw (cssu::Exception, cssu::RuntimeException, std::exception) { m_nTotalReferenceNumber = count; tryToPerform(); } void SAL_CALL SignatureEngine::setReferenceId( sal_Int32 id ) - throw (cssu::Exception, cssu::RuntimeException, std::exception) { m_vReferenceIds.push_back( id ); } @@ -180,14 +177,12 @@ void SAL_CALL SignatureEngine::setReferenceId( sal_Int32 id ) void SAL_CALL SignatureEngine::setUriBinding( const OUString& uri, const cssu::Reference< css::io::XInputStream >& aInputStream ) - throw (cssu::Exception, cssu::RuntimeException, std::exception) { m_vUris.push_back(uri); m_vXInputStreams.push_back(aInputStream); } cssu::Reference< css::io::XInputStream > SAL_CALL SignatureEngine::getUriBinding( const OUString& uri ) - throw (cssu::Exception, cssu::RuntimeException, std::exception) { cssu::Reference< css::io::XInputStream > xInputStream; diff --git a/xmlsecurity/source/framework/signatureverifierimpl.cxx b/xmlsecurity/source/framework/signatureverifierimpl.cxx index b399af103718..0ae3b619ddcc 100644 --- a/xmlsecurity/source/framework/signatureverifierimpl.cxx +++ b/xmlsecurity/source/framework/signatureverifierimpl.cxx @@ -63,7 +63,6 @@ bool SignatureVerifierImpl::checkReady() const } void SignatureVerifierImpl::notifyResultListener() const - throw (cssu::Exception, cssu::RuntimeException) /****** SignatureVerifierImpl/notifyResultListener *************************** * * NAME @@ -79,7 +78,6 @@ void SignatureVerifierImpl::notifyResultListener() const void SignatureVerifierImpl::startEngine( const cssu::Reference< cssxc::XXMLSignatureTemplate >& xSignatureTemplate) - throw (cssu::Exception, cssu::RuntimeException) /****** SignatureVerifierImpl/startEngine ************************************ * * NAME @@ -108,7 +106,6 @@ void SignatureVerifierImpl::startEngine( const cssu::Reference< /* XSignatureVerifyResultBroadcaster */ void SAL_CALL SignatureVerifierImpl::addSignatureVerifyResultListener( const cssu::Reference< cssxc::sax::XSignatureVerifyResultListener >& listener ) - throw (cssu::Exception, cssu::RuntimeException, std::exception) { m_xResultListener = listener; tryToPerform(); @@ -116,14 +113,12 @@ void SAL_CALL SignatureVerifierImpl::addSignatureVerifyResultListener( void SAL_CALL SignatureVerifierImpl::removeSignatureVerifyResultListener( const cssu::Reference< cssxc::sax::XSignatureVerifyResultListener >&) - throw (cssu::RuntimeException, std::exception) { } /* XInitialization */ void SAL_CALL SignatureVerifierImpl::initialize( const cssu::Sequence< cssu::Any >& aArguments ) - throw (cssu::Exception, cssu::RuntimeException, std::exception) { OSL_ASSERT(aArguments.getLength() == 5); @@ -140,13 +135,11 @@ void SAL_CALL SignatureVerifierImpl::initialize( OUString SignatureVerifierImpl_getImplementationName () - throw (cssu::RuntimeException) { return OUString( IMPLEMENTATION_NAME ); } cssu::Sequence< OUString > SAL_CALL SignatureVerifierImpl_getSupportedServiceNames( ) - throw (cssu::RuntimeException) { cssu::Sequence<OUString> aRet { "com.sun.star.xml.crypto.sax.SignatureVerifier" }; return aRet; @@ -154,26 +147,22 @@ cssu::Sequence< OUString > SAL_CALL SignatureVerifierImpl_getSupportedServiceNam cssu::Reference< cssu::XInterface > SAL_CALL SignatureVerifierImpl_createInstance( const cssu::Reference< cssl::XMultiServiceFactory >& /*rSMgr*/) - throw( cssu::Exception ) { return static_cast<cppu::OWeakObject*>(new SignatureVerifierImpl); } /* XServiceInfo */ OUString SAL_CALL SignatureVerifierImpl::getImplementationName( ) - throw (cssu::RuntimeException, std::exception) { return SignatureVerifierImpl_getImplementationName(); } sal_Bool SAL_CALL SignatureVerifierImpl::supportsService( const OUString& rServiceName ) - throw (cssu::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } cssu::Sequence< OUString > SAL_CALL SignatureVerifierImpl::getSupportedServiceNames( ) - throw (cssu::RuntimeException, std::exception) { return SignatureVerifierImpl_getSupportedServiceNames(); } diff --git a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx index 2cb06278d19a..923f4bb73b3a 100644 --- a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx +++ b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx @@ -39,51 +39,45 @@ XMLEncryptionTemplateImpl::~XMLEncryptionTemplateImpl() { /* XXMLEncryptionTemplate */ void SAL_CALL XMLEncryptionTemplateImpl::setTemplate( const Reference< XXMLElementWrapper >& aTemplate ) - throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) { m_xTemplate = aTemplate ; } /* XXMLEncryptionTemplate */ Reference< XXMLElementWrapper > SAL_CALL XMLEncryptionTemplateImpl::getTemplate() -throw (css::uno::RuntimeException, std::exception) { return m_xTemplate ; } /* XXMLEncryptionTemplate */ -void SAL_CALL XMLEncryptionTemplateImpl::setTarget( const Reference< XXMLElementWrapper >& aTarget ) - throw( css::lang::IllegalArgumentException, std::exception ) { +void SAL_CALL XMLEncryptionTemplateImpl::setTarget( const Reference< XXMLElementWrapper >& aTarget ) { m_xTarget = aTarget ; } /* XXMLEncryptionTemplate */ Reference< XXMLElementWrapper > SAL_CALL XMLEncryptionTemplateImpl::getTarget() -throw (css::uno::RuntimeException, std::exception) { return m_xTarget ; } void SAL_CALL XMLEncryptionTemplateImpl::setStatus( css::xml::crypto::SecurityOperationStatus status ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { m_nStatus = status; } css::xml::crypto::SecurityOperationStatus SAL_CALL XMLEncryptionTemplateImpl::getStatus( ) - throw (css::uno::RuntimeException, std::exception) { return m_nStatus; } /* XServiceInfo */ -OUString SAL_CALL XMLEncryptionTemplateImpl::getImplementationName() throw( RuntimeException, std::exception ) { +OUString SAL_CALL XMLEncryptionTemplateImpl::getImplementationName() { return impl_getImplementationName() ; } /* XServiceInfo */ -sal_Bool SAL_CALL XMLEncryptionTemplateImpl::supportsService( const OUString& serviceName) throw( RuntimeException, std::exception ) { +sal_Bool SAL_CALL XMLEncryptionTemplateImpl::supportsService( const OUString& serviceName) { Sequence< OUString > seqServiceNames = getSupportedServiceNames() ; const OUString* pArray = seqServiceNames.getConstArray() ; for( sal_Int32 i = 0 ; i < seqServiceNames.getLength() ; i ++ ) { @@ -94,7 +88,7 @@ sal_Bool SAL_CALL XMLEncryptionTemplateImpl::supportsService( const OUString& se } /* XServiceInfo */ -Sequence< OUString > SAL_CALL XMLEncryptionTemplateImpl::getSupportedServiceNames() throw( RuntimeException, std::exception ) { +Sequence< OUString > SAL_CALL XMLEncryptionTemplateImpl::getSupportedServiceNames() { return impl_getSupportedServiceNames() ; } @@ -105,12 +99,12 @@ Sequence< OUString > XMLEncryptionTemplateImpl::impl_getSupportedServiceNames() return seqServiceNames; } -OUString XMLEncryptionTemplateImpl::impl_getImplementationName() throw( RuntimeException ) { +OUString XMLEncryptionTemplateImpl::impl_getImplementationName() { return OUString("com.sun.star.xml.security.framework.XMLEncryptionTemplateImpl") ; } //Helper for registry -Reference< XInterface > SAL_CALL XMLEncryptionTemplateImpl::impl_createInstance( const Reference< XMultiServiceFactory >& ) throw( RuntimeException ) { +Reference< XInterface > SAL_CALL XMLEncryptionTemplateImpl::impl_createInstance( const Reference< XMultiServiceFactory >& ) { return Reference< XInterface >( *new XMLEncryptionTemplateImpl ) ; } diff --git a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx index e5bec6a3e098..adc92a868d48 100644 --- a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx +++ b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx @@ -50,44 +50,41 @@ class XMLEncryptionTemplateImpl : public ::cppu::WeakImplHelper< //Methods from XXMLEncryptionTemplate virtual void SAL_CALL setTemplate( const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& aXmlElement - ) - throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override; + ) override; virtual css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > SAL_CALL getTemplate( - ) throw (css::uno::RuntimeException, std::exception) override; + ) override; virtual void SAL_CALL setTarget( const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& aXmlElement - ) throw( css::lang::IllegalArgumentException, std::exception) override; + ) override; virtual css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > SAL_CALL getTarget( - ) throw (css::uno::RuntimeException, std::exception) override ; + ) override ; virtual void SAL_CALL setStatus( - css::xml::crypto::SecurityOperationStatus status ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + css::xml::crypto::SecurityOperationStatus status ) override; virtual css::xml::crypto::SecurityOperationStatus - SAL_CALL getStatus( ) - throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getStatus( ) override; //Methods from XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override ; + virtual OUString SAL_CALL getImplementationName() override ; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName - ) throw( css::uno::RuntimeException, std::exception ) override ; + ) override ; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override ; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override ; //Helper for XServiceInfo static css::uno::Sequence< OUString > impl_getSupportedServiceNames() ; /// @throws css::uno::RuntimeException - static OUString impl_getImplementationName() throw( css::uno::RuntimeException ) ; + static OUString impl_getImplementationName() ; //Helper for registry /// @throws css::uno::RuntimeException - static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) throw( css::uno::RuntimeException ) ; + static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ; static css::uno::Reference< css::lang::XSingleServiceFactory > impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ; } ; diff --git a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx index a2f7b9bd41dc..8d85579e4a7b 100644 --- a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx +++ b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx @@ -40,26 +40,22 @@ XMLSignatureTemplateImpl::~XMLSignatureTemplateImpl() { /* XXMLSignatureTemplate */ void SAL_CALL XMLSignatureTemplateImpl::setTemplate( const Reference< XXMLElementWrapper >& aTemplate ) - throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) { m_xTemplate = aTemplate ; } /* XXMLSignatureTemplate */ Reference< XXMLElementWrapper > SAL_CALL XMLSignatureTemplateImpl::getTemplate() - throw (css::uno::RuntimeException, std::exception) { return m_xTemplate ; } void SAL_CALL XMLSignatureTemplateImpl::setTarget( const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& aXmlElement ) - throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) { targets.push_back( aXmlElement ); } css::uno::Sequence< css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > > SAL_CALL XMLSignatureTemplateImpl::getTargets() - throw (css::uno::RuntimeException, std::exception) { sal_Int32 length = targets.size(); css::uno::Sequence< css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > > aTargets (length); @@ -76,37 +72,33 @@ css::uno::Sequence< css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > void SAL_CALL XMLSignatureTemplateImpl::setBinding( const css::uno::Reference< css::xml::crypto::XUriBinding >& aUriBinding ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { m_xUriBinding = aUriBinding; } css::uno::Reference< css::xml::crypto::XUriBinding > SAL_CALL XMLSignatureTemplateImpl::getBinding() - throw (css::uno::RuntimeException, std::exception) { return m_xUriBinding; } void SAL_CALL XMLSignatureTemplateImpl::setStatus( css::xml::crypto::SecurityOperationStatus status ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { m_nStatus = status; } css::xml::crypto::SecurityOperationStatus SAL_CALL XMLSignatureTemplateImpl::getStatus( ) - throw (css::uno::RuntimeException, std::exception) { return m_nStatus; } /* XServiceInfo */ -OUString SAL_CALL XMLSignatureTemplateImpl::getImplementationName() throw( RuntimeException, std::exception ) { +OUString SAL_CALL XMLSignatureTemplateImpl::getImplementationName() { return impl_getImplementationName() ; } /* XServiceInfo */ -sal_Bool SAL_CALL XMLSignatureTemplateImpl::supportsService( const OUString& serviceName) throw( RuntimeException, std::exception ) { +sal_Bool SAL_CALL XMLSignatureTemplateImpl::supportsService( const OUString& serviceName) { Sequence< OUString > seqServiceNames = getSupportedServiceNames() ; const OUString* pArray = seqServiceNames.getConstArray() ; for( sal_Int32 i = 0 ; i < seqServiceNames.getLength() ; i ++ ) { @@ -117,7 +109,7 @@ sal_Bool SAL_CALL XMLSignatureTemplateImpl::supportsService( const OUString& ser } /* XServiceInfo */ -Sequence< OUString > SAL_CALL XMLSignatureTemplateImpl::getSupportedServiceNames() throw( RuntimeException, std::exception ) { +Sequence< OUString > SAL_CALL XMLSignatureTemplateImpl::getSupportedServiceNames() { return impl_getSupportedServiceNames() ; } @@ -128,12 +120,12 @@ Sequence< OUString > XMLSignatureTemplateImpl::impl_getSupportedServiceNames() { return seqServiceNames ; } -OUString XMLSignatureTemplateImpl::impl_getImplementationName() throw( RuntimeException ) { +OUString XMLSignatureTemplateImpl::impl_getImplementationName() { return OUString("com.sun.star.xml.security.framework.XMLSignatureTemplateImpl") ; } //Helper for registry -Reference< XInterface > SAL_CALL XMLSignatureTemplateImpl::impl_createInstance( const Reference< XMultiServiceFactory >& ) throw( RuntimeException ) { +Reference< XInterface > SAL_CALL XMLSignatureTemplateImpl::impl_createInstance( const Reference< XMultiServiceFactory >& ) { return Reference< XInterface >( *new XMLSignatureTemplateImpl ) ; } diff --git a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx index ad04b808a967..62f713aecc6f 100644 --- a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx +++ b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx @@ -52,50 +52,46 @@ class XMLSignatureTemplateImpl : public ::cppu::WeakImplHelper< //Methods from XXMLSignatureTemplate virtual void SAL_CALL setTemplate( const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& aXmlElement - ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override; + ) override; virtual css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > SAL_CALL getTemplate( - ) throw (css::uno::RuntimeException, std::exception) override; + ) override; virtual void SAL_CALL setTarget( const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& aXmlElement - ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) override; + ) override; virtual css::uno::Sequence< css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > > SAL_CALL getTargets( - ) throw (css::uno::RuntimeException, std::exception) override; + ) override; virtual void SAL_CALL setBinding( - const css::uno::Reference< css::xml::crypto::XUriBinding >& aUriBinding ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::xml::crypto::XUriBinding >& aUriBinding ) override; virtual css::uno::Reference< css::xml::crypto::XUriBinding > - SAL_CALL getBinding( ) - throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getBinding( ) override; virtual void SAL_CALL setStatus( - css::xml::crypto::SecurityOperationStatus status ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + css::xml::crypto::SecurityOperationStatus status ) override; virtual css::xml::crypto::SecurityOperationStatus - SAL_CALL getStatus( ) - throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getStatus( ) override; //Methods from XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override ; + virtual OUString SAL_CALL getImplementationName() override ; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName - ) throw( css::uno::RuntimeException, std::exception ) override ; + ) override ; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override ; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override ; //Helper for XServiceInfo static css::uno::Sequence< OUString > impl_getSupportedServiceNames() ; /// @throws css::uno::RuntimeException - static OUString impl_getImplementationName() throw( css::uno::RuntimeException ) ; + static OUString impl_getImplementationName() ; //Helper for registry /// @throws css::uno::RuntimeException - static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) throw( css::uno::RuntimeException ) ; + static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ; static css::uno::Reference< css::lang::XSingleServiceFactory > impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ; } ; diff --git a/xmlsecurity/source/helper/ooxmlsecparser.cxx b/xmlsecurity/source/helper/ooxmlsecparser.cxx index 8535c8279c49..aff5c1d302c5 100644 --- a/xmlsecurity/source/helper/ooxmlsecparser.cxx +++ b/xmlsecurity/source/helper/ooxmlsecparser.cxx @@ -30,20 +30,19 @@ OOXMLSecParser::~OOXMLSecParser() { } -void SAL_CALL OOXMLSecParser::startDocument() throw (xml::sax::SAXException, uno::RuntimeException, std::exception) +void SAL_CALL OOXMLSecParser::startDocument() { if (m_xNextHandler.is()) m_xNextHandler->startDocument(); } -void SAL_CALL OOXMLSecParser::endDocument() throw (xml::sax::SAXException, uno::RuntimeException, std::exception) +void SAL_CALL OOXMLSecParser::endDocument() { if (m_xNextHandler.is()) m_xNextHandler->endDocument(); } void SAL_CALL OOXMLSecParser::startElement(const OUString& rName, const uno::Reference<xml::sax::XAttributeList>& xAttribs) -throw (xml::sax::SAXException, uno::RuntimeException, std::exception) { OUString aId = xAttribs->getValueByName("Id"); if (!aId.isEmpty()) @@ -123,7 +122,7 @@ throw (xml::sax::SAXException, uno::RuntimeException, std::exception) m_xNextHandler->startElement(rName, xAttribs); } -void SAL_CALL OOXMLSecParser::endElement(const OUString& rName) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) +void SAL_CALL OOXMLSecParser::endElement(const OUString& rName) { if (rName == "SignedInfo") m_pXSecController->setReferenceCount(); @@ -179,7 +178,7 @@ void SAL_CALL OOXMLSecParser::endElement(const OUString& rName) throw (xml::sax: m_xNextHandler->endElement(rName); } -void SAL_CALL OOXMLSecParser::characters(const OUString& rChars) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) +void SAL_CALL OOXMLSecParser::characters(const OUString& rChars) { if (m_bInDigestValue && !m_bInCertDigest) m_aDigestValue += rChars; @@ -202,25 +201,25 @@ void SAL_CALL OOXMLSecParser::characters(const OUString& rChars) throw (xml::sax m_xNextHandler->characters(rChars); } -void SAL_CALL OOXMLSecParser::ignorableWhitespace(const OUString& rWhitespace) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) +void SAL_CALL OOXMLSecParser::ignorableWhitespace(const OUString& rWhitespace) { if (m_xNextHandler.is()) m_xNextHandler->ignorableWhitespace(rWhitespace); } -void SAL_CALL OOXMLSecParser::processingInstruction(const OUString& rTarget, const OUString& rData) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) +void SAL_CALL OOXMLSecParser::processingInstruction(const OUString& rTarget, const OUString& rData) { if (m_xNextHandler.is()) m_xNextHandler->processingInstruction(rTarget, rData); } -void SAL_CALL OOXMLSecParser::setDocumentLocator(const uno::Reference<xml::sax::XLocator>& xLocator) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) +void SAL_CALL OOXMLSecParser::setDocumentLocator(const uno::Reference<xml::sax::XLocator>& xLocator) { if (m_xNextHandler.is()) m_xNextHandler->setDocumentLocator(xLocator); } -void SAL_CALL OOXMLSecParser::initialize(const uno::Sequence<uno::Any>& rArguments) throw (uno::Exception, uno::RuntimeException, std::exception) +void SAL_CALL OOXMLSecParser::initialize(const uno::Sequence<uno::Any>& rArguments) { rArguments[0] >>= m_xNextHandler; } diff --git a/xmlsecurity/source/helper/ooxmlsecparser.hxx b/xmlsecurity/source/helper/ooxmlsecparser.hxx index a78c3e369c24..068ffb22a930 100644 --- a/xmlsecurity/source/helper/ooxmlsecparser.hxx +++ b/xmlsecurity/source/helper/ooxmlsecparser.hxx @@ -56,26 +56,24 @@ public: virtual ~OOXMLSecParser() override; // XDocumentHandler - virtual void SAL_CALL startDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL startDocument() override; - virtual void SAL_CALL endDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL endDocument() override; - virtual void SAL_CALL startElement(const OUString& aName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttribs) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL startElement(const OUString& aName, const css::uno::Reference<css::xml::sax::XAttributeList>& xAttribs) override; - virtual void SAL_CALL endElement(const OUString& aName) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL endElement(const OUString& aName) override; - virtual void SAL_CALL characters(const OUString& aChars) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL characters(const OUString& aChars) override; - virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) override; - virtual void SAL_CALL processingInstruction(const OUString& aTarget, const OUString& aData) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL processingInstruction(const OUString& aTarget, const OUString& aData) override; - virtual void SAL_CALL setDocumentLocator(const css::uno::Reference<css::xml::sax::XLocator>& xLocator) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDocumentLocator(const css::uno::Reference<css::xml::sax::XLocator>& xLocator) override; // XInitialization - virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArguments) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArguments) override; }; #endif diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx index 772b7cd56a5b..926f445fbd16 100644 --- a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx +++ b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx @@ -52,14 +52,12 @@ void ImplXMLSignatureListener::setNextHandler( } void SAL_CALL ImplXMLSignatureListener::signatureCreated( sal_Int32 securityId, css::xml::crypto::SecurityOperationStatus nResult ) - throw (css::uno::RuntimeException, std::exception) { XMLSignatureCreationResult aResult( securityId, nResult ); maCreationResultListenerListener.Call( aResult ); } void SAL_CALL ImplXMLSignatureListener::signatureVerified( sal_Int32 securityId, css::xml::crypto::SecurityOperationStatus nResult ) - throw (css::uno::RuntimeException, std::exception) { XMLSignatureVerifyResult aResult( securityId, nResult ); maVerifyResultListenerListener.Call( aResult ); @@ -67,7 +65,6 @@ void SAL_CALL ImplXMLSignatureListener::signatureVerified( sal_Int32 securityId, // XDocumentHandler void SAL_CALL ImplXMLSignatureListener::startDocument( ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) { if (m_xNextHandler.is()) { @@ -76,7 +73,6 @@ void SAL_CALL ImplXMLSignatureListener::startDocument( ) } void SAL_CALL ImplXMLSignatureListener::endDocument( ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) { if (m_xNextHandler.is()) { @@ -85,7 +81,6 @@ void SAL_CALL ImplXMLSignatureListener::endDocument( ) } void SAL_CALL ImplXMLSignatureListener::startElement( const OUString& aName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) { if ( aName == "Signature" ) { @@ -99,7 +94,6 @@ void SAL_CALL ImplXMLSignatureListener::startElement( const OUString& aName, con } void SAL_CALL ImplXMLSignatureListener::endElement( const OUString& aName ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) { if (m_xNextHandler.is()) { @@ -108,7 +102,6 @@ void SAL_CALL ImplXMLSignatureListener::endElement( const OUString& aName ) } void SAL_CALL ImplXMLSignatureListener::characters( const OUString& aChars ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) { if (m_xNextHandler.is()) { @@ -117,7 +110,6 @@ void SAL_CALL ImplXMLSignatureListener::characters( const OUString& aChars ) } void SAL_CALL ImplXMLSignatureListener::ignorableWhitespace( const OUString& aWhitespaces ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) { if (m_xNextHandler.is()) { @@ -126,7 +118,6 @@ void SAL_CALL ImplXMLSignatureListener::ignorableWhitespace( const OUString& aWh } void SAL_CALL ImplXMLSignatureListener::processingInstruction( const OUString& aTarget, const OUString& aData ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) { if (m_xNextHandler.is()) { @@ -135,7 +126,6 @@ void SAL_CALL ImplXMLSignatureListener::processingInstruction( const OUString& a } void SAL_CALL ImplXMLSignatureListener::setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) { if (m_xNextHandler.is()) { @@ -155,12 +145,10 @@ UriBindingHelper::UriBindingHelper( const css::uno::Reference < css::embed::XSto } void SAL_CALL UriBindingHelper::setUriBinding( const OUString& /*uri*/, const uno::Reference< io::XInputStream >&) - throw (uno::Exception, uno::RuntimeException, std::exception) { } uno::Reference< io::XInputStream > SAL_CALL UriBindingHelper::getUriBinding( const OUString& uri ) - throw (uno::Exception, uno::RuntimeException, std::exception) { uno::Reference< io::XInputStream > xInputStream; if ( mxStorage.is() ) diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.hxx b/xmlsecurity/source/helper/xmlsignaturehelper2.hxx index 7c76a9a86ffa..6518aa96d610 100644 --- a/xmlsecurity/source/helper/xmlsignaturehelper2.hxx +++ b/xmlsecurity/source/helper/xmlsignaturehelper2.hxx @@ -68,37 +68,27 @@ public: void setNextHandler(const css::uno::Reference< css::xml::sax::XDocumentHandler >& xNextHandler); // css::xml::crypto::sax::XSignatureCreationResultListener - virtual void SAL_CALL signatureCreated( sal_Int32 securityId, css::xml::crypto::SecurityOperationStatus creationResult ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL signatureCreated( sal_Int32 securityId, css::xml::crypto::SecurityOperationStatus creationResult ) override; // css::xml::crypto::sax::XSignatureVerifyResultListener - virtual void SAL_CALL signatureVerified( sal_Int32 securityId, css::xml::crypto::SecurityOperationStatus verifyResult ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL signatureVerified( sal_Int32 securityId, css::xml::crypto::SecurityOperationStatus verifyResult ) override; // css::xml::sax::XDocumentHandler - virtual void SAL_CALL startElement( const OUString& aName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL startElement( const OUString& aName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs ) override; - virtual void SAL_CALL startDocument( ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL startDocument( ) override; - virtual void SAL_CALL endDocument( ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL endDocument( ) override; - virtual void SAL_CALL endElement( const OUString& aName ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL endElement( const OUString& aName ) override; - virtual void SAL_CALL characters( const OUString& aChars ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL characters( const OUString& aChars ) override; - virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) override; - virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) override; - virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) override; }; // XUriBinding @@ -112,11 +102,9 @@ public: UriBindingHelper(); explicit UriBindingHelper( const css::uno::Reference < css::embed::XStorage >& rxStorage ); - void SAL_CALL setUriBinding( const OUString& uri, const css::uno::Reference< css::io::XInputStream >& aInputStream ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + void SAL_CALL setUriBinding( const OUString& uri, const css::uno::Reference< css::io::XInputStream >& aInputStream ) override; - css::uno::Reference< css::io::XInputStream > SAL_CALL getUriBinding( const OUString& uri ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::io::XInputStream > SAL_CALL getUriBinding( const OUString& uri ) override; static css::uno::Reference < css::io::XInputStream > OpenInputStream( const css::uno::Reference < css::embed::XStorage >& rxStore, const OUString& rURI ); }; diff --git a/xmlsecurity/source/helper/xsecctl.cxx b/xmlsecurity/source/helper/xsecctl.cxx index e27101b4cdf8..ff2e47219216 100644 --- a/xmlsecurity/source/helper/xsecctl.cxx +++ b/xmlsecurity/source/helper/xsecctl.cxx @@ -911,7 +911,6 @@ SignatureInformations XSecController::getSignatureInformations() const */ void SAL_CALL XSecController::blockingStatusChanged( sal_Bool isBlocking ) - throw (cssu::RuntimeException, std::exception) { this->m_bIsBlocking = isBlocking; checkChainingStatus(); @@ -919,14 +918,12 @@ void SAL_CALL XSecController::blockingStatusChanged( sal_Bool isBlocking ) void SAL_CALL XSecController::collectionStatusChanged( sal_Bool isInsideCollectedElement ) - throw (cssu::RuntimeException, std::exception) { this->m_bIsCollectingElement = isInsideCollectedElement; checkChainingStatus(); } void SAL_CALL XSecController::bufferStatusChanged( sal_Bool /*isBufferEmpty*/) - throw (cssu::RuntimeException, std::exception) { } @@ -935,7 +932,6 @@ void SAL_CALL XSecController::bufferStatusChanged( sal_Bool /*isBufferEmpty*/) * XSignatureCreationResultListener */ void SAL_CALL XSecController::signatureCreated( sal_Int32 securityId, css::xml::crypto::SecurityOperationStatus nResult ) - throw (css::uno::RuntimeException, std::exception) { int index = findSignatureInfor(securityId); assert(index != -1 && "Signature Not Found!"); @@ -947,7 +943,6 @@ void SAL_CALL XSecController::signatureCreated( sal_Int32 securityId, css::xml:: * XSignatureVerifyResultListener */ void SAL_CALL XSecController::signatureVerified( sal_Int32 securityId, css::xml::crypto::SecurityOperationStatus nResult ) - throw (css::uno::RuntimeException, std::exception) { int index = findSignatureInfor(securityId); assert(index != -1 && "Signature Not Found!"); diff --git a/xmlsecurity/source/helper/xsecparser.cxx b/xmlsecurity/source/helper/xsecparser.cxx index d4c9f9dcfe0d..210db2d113cc 100644 --- a/xmlsecurity/source/helper/xsecparser.cxx +++ b/xmlsecurity/source/helper/xsecparser.cxx @@ -62,7 +62,6 @@ OUString XSecParser::getIdAttr(const cssu::Reference< cssxs::XAttributeList >& x * XDocumentHandler */ void SAL_CALL XSecParser::startDocument( ) - throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { m_bInX509IssuerName = false; m_bInX509SerialNumber = false; @@ -79,7 +78,6 @@ void SAL_CALL XSecParser::startDocument( ) } void SAL_CALL XSecParser::endDocument( ) - throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { if (m_xNextHandler.is()) { @@ -90,7 +88,6 @@ void SAL_CALL XSecParser::endDocument( ) void SAL_CALL XSecParser::startElement( const OUString& aName, const cssu::Reference< cssxs::XAttributeList >& xAttribs ) - throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { try { @@ -243,7 +240,6 @@ void SAL_CALL XSecParser::startElement( } void SAL_CALL XSecParser::endElement( const OUString& aName ) - throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { try { @@ -338,7 +334,6 @@ void SAL_CALL XSecParser::endElement( const OUString& aName ) } void SAL_CALL XSecParser::characters( const OUString& aChars ) - throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { if (m_bInX509IssuerName) { @@ -388,7 +383,6 @@ void SAL_CALL XSecParser::characters( const OUString& aChars ) } void SAL_CALL XSecParser::ignorableWhitespace( const OUString& aWhitespaces ) - throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { if (m_xNextHandler.is()) { @@ -397,7 +391,6 @@ void SAL_CALL XSecParser::ignorableWhitespace( const OUString& aWhitespaces ) } void SAL_CALL XSecParser::processingInstruction( const OUString& aTarget, const OUString& aData ) - throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { if (m_xNextHandler.is()) { @@ -406,7 +399,6 @@ void SAL_CALL XSecParser::processingInstruction( const OUString& aTarget, const } void SAL_CALL XSecParser::setDocumentLocator( const cssu::Reference< cssxs::XLocator >& xLocator ) - throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { if (m_xNextHandler.is()) { @@ -419,7 +411,6 @@ void SAL_CALL XSecParser::setDocumentLocator( const cssu::Reference< cssxs::XLoc */ void SAL_CALL XSecParser::initialize( const cssu::Sequence< cssu::Any >& aArguments ) - throw(cssu::Exception, cssu::RuntimeException, std::exception) { aArguments[0] >>= m_xNextHandler; } diff --git a/xmlsecurity/source/helper/xsecparser.hxx b/xmlsecurity/source/helper/xsecparser.hxx index c9463cc485dc..098e41ee3034 100644 --- a/xmlsecurity/source/helper/xsecparser.hxx +++ b/xmlsecurity/source/helper/xsecparser.hxx @@ -117,43 +117,34 @@ public: /* * XDocumentHandler */ - virtual void SAL_CALL startDocument( ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL startDocument( ) override; - virtual void SAL_CALL endDocument( ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL endDocument( ) override; virtual void SAL_CALL startElement( const OUString& aName, const css::uno::Reference< - css::xml::sax::XAttributeList >& xAttribs ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + css::xml::sax::XAttributeList >& xAttribs ) override; - virtual void SAL_CALL endElement( const OUString& aName ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL endElement( const OUString& aName ) override; - virtual void SAL_CALL characters( const OUString& aChars ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL characters( const OUString& aChars ) override; - virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) override; virtual void SAL_CALL processingInstruction( const OUString& aTarget, - const OUString& aData ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + const OUString& aData ) override; virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< - css::xml::sax::XLocator >& xLocator ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + css::xml::sax::XLocator >& xLocator ) override; /* * XInitialization */ virtual void SAL_CALL initialize( - const css::uno::Sequence< css::uno::Any >& aArguments ) - throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Any >& aArguments ) override; }; #endif diff --git a/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx index 6c6723f08aad..112aebc7f7d8 100644 --- a/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx +++ b/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx @@ -37,17 +37,17 @@ class CertificateExtension_XmlSecImpl : public ::cppu::WeakImplHelper< public: //Methods from XCertificateExtension - virtual sal_Bool SAL_CALL isCritical() throw( css::uno::RuntimeException, std::exception ) override + virtual sal_Bool SAL_CALL isCritical() override { return m_Extn.m_critical; } - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getExtensionId() throw( css::uno::RuntimeException, std::exception ) override + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getExtensionId() override { return m_Extn.m_xExtnId; } - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getExtensionValue() throw( css::uno::RuntimeException, std::exception ) override + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getExtensionValue() override { return m_Extn.m_xExtnValue; } diff --git a/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx index c5ce74dbf400..5fba1ff146d3 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx @@ -44,20 +44,20 @@ SanExtensionImpl::~SanExtensionImpl() { //Methods from XCertificateExtension -sal_Bool SAL_CALL SanExtensionImpl::isCritical() throw( css::uno::RuntimeException ) { +sal_Bool SAL_CALL SanExtensionImpl::isCritical() { return m_critical ; } -css::uno::Sequence< sal_Int8 > SAL_CALL SanExtensionImpl::getExtensionId() throw( css::uno::RuntimeException ) { +css::uno::Sequence< sal_Int8 > SAL_CALL SanExtensionImpl::getExtensionId() { return m_xExtnId ; } -css::uno::Sequence< sal_Int8 > SAL_CALL SanExtensionImpl::getExtensionValue() throw( css::uno::RuntimeException ) { +css::uno::Sequence< sal_Int8 > SAL_CALL SanExtensionImpl::getExtensionValue() { return m_xExtnValue ; } //Methods from XSanExtension -css::uno::Sequence< css::security::CertAltNameEntry > SAL_CALL SanExtensionImpl::getAlternativeNames() throw( css::uno::RuntimeException ){ +css::uno::Sequence< css::security::CertAltNameEntry > SAL_CALL SanExtensionImpl::getAlternativeNames(){ if (!m_Entries.hasElements()) { diff --git a/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx index c4e391a65fa9..795e08d1a7cf 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx +++ b/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx @@ -53,15 +53,15 @@ class SanExtensionImpl : public ::cppu::WeakImplHelper< virtual ~SanExtensionImpl() override; //Methods from XCertificateExtension - virtual sal_Bool SAL_CALL isCritical() throw( css::uno::RuntimeException ) override; + virtual sal_Bool SAL_CALL isCritical() override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getExtensionId() throw( css::uno::RuntimeException ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getExtensionId() override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getExtensionValue() throw( css::uno::RuntimeException ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getExtensionValue() override; //Methods from XSanExtension - virtual css::uno::Sequence< css::security::CertAltNameEntry > SAL_CALL getAlternativeNames() throw( css::uno::RuntimeException ) override; + virtual css::uno::Sequence< css::security::CertAltNameEntry > SAL_CALL getAlternativeNames() override; //Helper method void setCertExtn( unsigned char* value, unsigned int vlen, unsigned char* id, unsigned int idlen, bool critical ) ; diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx index 39f52f76d753..f383046aa5d3 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx @@ -154,12 +154,12 @@ SecurityEnvironment_MSCryptImpl::~SecurityEnvironment_MSCryptImpl() { } /* XServiceInfo */ -OUString SAL_CALL SecurityEnvironment_MSCryptImpl::getImplementationName() throw( RuntimeException ) { +OUString SAL_CALL SecurityEnvironment_MSCryptImpl::getImplementationName() { return impl_getImplementationName() ; } /* XServiceInfo */ -sal_Bool SAL_CALL SecurityEnvironment_MSCryptImpl::supportsService( const OUString& serviceName) throw( RuntimeException ) { +sal_Bool SAL_CALL SecurityEnvironment_MSCryptImpl::supportsService( const OUString& serviceName) { Sequence< OUString > seqServiceNames = getSupportedServiceNames() ; const OUString* pArray = seqServiceNames.getConstArray() ; for( sal_Int32 i = 0 ; i < seqServiceNames.getLength() ; i ++ ) { @@ -170,7 +170,7 @@ sal_Bool SAL_CALL SecurityEnvironment_MSCryptImpl::supportsService( const OUStri } /* XServiceInfo */ -Sequence< OUString > SAL_CALL SecurityEnvironment_MSCryptImpl::getSupportedServiceNames() throw( RuntimeException ) { +Sequence< OUString > SAL_CALL SecurityEnvironment_MSCryptImpl::getSupportedServiceNames() { return impl_getSupportedServiceNames() ; } @@ -181,12 +181,12 @@ Sequence< OUString > SecurityEnvironment_MSCryptImpl::impl_getSupportedServiceNa return seqServiceNames ; } -OUString SecurityEnvironment_MSCryptImpl::impl_getImplementationName() throw( RuntimeException ) { +OUString SecurityEnvironment_MSCryptImpl::impl_getImplementationName() { return OUString("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl") ; } //Helper for registry -Reference< XInterface > SAL_CALL SecurityEnvironment_MSCryptImpl::impl_createInstance( const Reference< XMultiServiceFactory >& aServiceManager ) throw( RuntimeException ) { +Reference< XInterface > SAL_CALL SecurityEnvironment_MSCryptImpl::impl_createInstance( const Reference< XMultiServiceFactory >& aServiceManager ) { return Reference< XInterface >( *new SecurityEnvironment_MSCryptImpl( aServiceManager ) ) ; } @@ -196,7 +196,6 @@ Reference< XSingleServiceFactory > SecurityEnvironment_MSCryptImpl::impl_createF /* XUnoTunnel */ sal_Int64 SAL_CALL SecurityEnvironment_MSCryptImpl::getSomething( const Sequence< sal_Int8 >& aIdentifier ) - throw( RuntimeException ) { if( aIdentifier.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), aIdentifier.getConstArray(), 16 ) ) { return reinterpret_cast<sal_Int64>(this); @@ -225,11 +224,11 @@ SecurityEnvironment_MSCryptImpl* SecurityEnvironment_MSCryptImpl::getImplementat return nullptr ; } -HCRYPTPROV SecurityEnvironment_MSCryptImpl::getCryptoProvider() throw( css::uno::Exception , css::uno::RuntimeException ) { +HCRYPTPROV SecurityEnvironment_MSCryptImpl::getCryptoProvider() { return m_hProv ; } -void SecurityEnvironment_MSCryptImpl::setCryptoProvider( HCRYPTPROV aProv ) throw( css::uno::Exception , css::uno::RuntimeException ) { +void SecurityEnvironment_MSCryptImpl::setCryptoProvider( HCRYPTPROV aProv ) { if( m_hProv != NULL ) { CryptReleaseContext( m_hProv, 0 ) ; m_hProv = NULL ; @@ -240,21 +239,21 @@ void SecurityEnvironment_MSCryptImpl::setCryptoProvider( HCRYPTPROV aProv ) thro } } -LPCTSTR SecurityEnvironment_MSCryptImpl::getKeyContainer() throw( css::uno::Exception , css::uno::RuntimeException ) { +LPCTSTR SecurityEnvironment_MSCryptImpl::getKeyContainer() { return m_pszContainer ; } -void SecurityEnvironment_MSCryptImpl::setKeyContainer( LPCTSTR aKeyContainer ) throw( css::uno::Exception , css::uno::RuntimeException ) { +void SecurityEnvironment_MSCryptImpl::setKeyContainer( LPCTSTR aKeyContainer ) { //TODO: Don't know whether or not it should be copied. m_pszContainer = aKeyContainer ; } -HCERTSTORE SecurityEnvironment_MSCryptImpl::getCryptoSlot() throw( Exception , RuntimeException ) { +HCERTSTORE SecurityEnvironment_MSCryptImpl::getCryptoSlot() { return m_hKeyStore ; } -void SecurityEnvironment_MSCryptImpl::setCryptoSlot( HCERTSTORE aSlot) throw( Exception , RuntimeException ) { +void SecurityEnvironment_MSCryptImpl::setCryptoSlot( HCERTSTORE aSlot) { if( m_hKeyStore != nullptr ) { CertCloseStore( m_hKeyStore, CERT_CLOSE_STORE_FORCE_FLAG ) ; m_hKeyStore = nullptr ; @@ -265,11 +264,11 @@ void SecurityEnvironment_MSCryptImpl::setCryptoSlot( HCERTSTORE aSlot) throw( Ex } } -HCERTSTORE SecurityEnvironment_MSCryptImpl::getCertDb() throw( Exception , RuntimeException ) { +HCERTSTORE SecurityEnvironment_MSCryptImpl::getCertDb() { return m_hCertStore ; } -void SecurityEnvironment_MSCryptImpl::setCertDb( HCERTSTORE aCertDb ) throw( Exception , RuntimeException ) { +void SecurityEnvironment_MSCryptImpl::setCertDb( HCERTSTORE aCertDb ) { if( m_hCertStore != nullptr ) { CertCloseStore( m_hCertStore, CERT_CLOSE_STORE_FORCE_FLAG ) ; m_hCertStore = nullptr ; @@ -346,7 +345,7 @@ extern "C" BOOL WINAPI cert_enum_system_store_callback(const void *pvSystemStore #endif //Methods from XSecurityEnvironment -Sequence< Reference < XCertificate > > SecurityEnvironment_MSCryptImpl::getPersonalCertificates() throw( SecurityException , RuntimeException ) +Sequence< Reference < XCertificate > > SecurityEnvironment_MSCryptImpl::getPersonalCertificates() { sal_Int32 length ; X509Certificate_MSCryptImpl* xcert ; @@ -421,7 +420,7 @@ Sequence< Reference < XCertificate > > SecurityEnvironment_MSCryptImpl::getPerso } -Reference< XCertificate > SecurityEnvironment_MSCryptImpl::getCertificate( const OUString& issuerName, const Sequence< sal_Int8 >& serialNumber ) throw( SecurityException , RuntimeException ) { +Reference< XCertificate > SecurityEnvironment_MSCryptImpl::getCertificate( const OUString& issuerName, const Sequence< sal_Int8 >& serialNumber ) { unsigned int i ; LPCSTR pszName ; X509Certificate_MSCryptImpl *xcert = nullptr ; @@ -618,12 +617,12 @@ Reference< XCertificate > SecurityEnvironment_MSCryptImpl::getCertificate( const return xcert ; } -Reference< XCertificate > SecurityEnvironment_MSCryptImpl::getCertificate( const OUString& issuerName, const OUString& serialNumber ) throw( SecurityException , RuntimeException ) { +Reference< XCertificate > SecurityEnvironment_MSCryptImpl::getCertificate( const OUString& issuerName, const OUString& serialNumber ) { Sequence< sal_Int8 > serial = numericStringToBigInteger( serialNumber ) ; return getCertificate( issuerName, serial ) ; } -Sequence< Reference < XCertificate > > SecurityEnvironment_MSCryptImpl::buildCertificatePath( const Reference< XCertificate >& begin ) throw( SecurityException , RuntimeException ) { +Sequence< Reference < XCertificate > > SecurityEnvironment_MSCryptImpl::buildCertificatePath( const Reference< XCertificate >& begin ) { PCCERT_CHAIN_CONTEXT pChainContext ; PCCERT_CONTEXT pCertContext ; const X509Certificate_MSCryptImpl* xcert ; @@ -745,7 +744,7 @@ Sequence< Reference < XCertificate > > SecurityEnvironment_MSCryptImpl::buildCer return Sequence< Reference < XCertificate > >(); } -Reference< XCertificate > SecurityEnvironment_MSCryptImpl::createCertificateFromRaw( const Sequence< sal_Int8 >& rawCertificate ) throw( SecurityException , RuntimeException ) { +Reference< XCertificate > SecurityEnvironment_MSCryptImpl::createCertificateFromRaw( const Sequence< sal_Int8 >& rawCertificate ) { X509Certificate_MSCryptImpl* xcert ; if( rawCertificate.getLength() > 0 ) { @@ -758,7 +757,7 @@ Reference< XCertificate > SecurityEnvironment_MSCryptImpl::createCertificateFrom return xcert ; } -Reference< XCertificate > SecurityEnvironment_MSCryptImpl::createCertificateFromAscii( const OUString& asciiCertificate ) throw( SecurityException , RuntimeException ) { +Reference< XCertificate > SecurityEnvironment_MSCryptImpl::createCertificateFromAscii( const OUString& asciiCertificate ) { xmlChar* chCert ; xmlSecSize certSize ; @@ -809,7 +808,6 @@ HCERTSTORE getCertStoreForIntermediatCerts( sal_Int32 SecurityEnvironment_MSCryptImpl::verifyCertificate( const Reference< css::security::XCertificate >& aCert, const Sequence< Reference< css::security::XCertificate > >& seqCerts) - throw( css::uno::SecurityException, css::uno::RuntimeException ) { sal_Int32 validity = 0; PCCERT_CHAIN_CONTEXT pChainContext = nullptr; @@ -978,7 +976,7 @@ sal_Int32 SecurityEnvironment_MSCryptImpl::verifyCertificate( return validity ; } -sal_Int32 SecurityEnvironment_MSCryptImpl::getCertificateCharacters( const css::uno::Reference< css::security::XCertificate >& aCert ) throw( css::uno::SecurityException, css::uno::RuntimeException ) { +sal_Int32 SecurityEnvironment_MSCryptImpl::getCertificateCharacters( const css::uno::Reference< css::security::XCertificate >& aCert ) { sal_Int32 characters ; PCCERT_CONTEXT pCertContext ; const X509Certificate_MSCryptImpl* xcert ; @@ -1027,11 +1025,11 @@ sal_Int32 SecurityEnvironment_MSCryptImpl::getCertificateCharacters( const css:: return characters ; } -void SecurityEnvironment_MSCryptImpl::enableDefaultCrypt( bool enable ) throw( Exception, RuntimeException ) { +void SecurityEnvironment_MSCryptImpl::enableDefaultCrypt( bool enable ) { m_bEnableDefault = enable ; } -bool SecurityEnvironment_MSCryptImpl::defaultEnabled() throw( Exception, RuntimeException ) { +bool SecurityEnvironment_MSCryptImpl::defaultEnabled() { return m_bEnableDefault ; } @@ -1049,12 +1047,12 @@ static X509Certificate_MSCryptImpl* MswcryCertContextToXCert( PCCERT_CONTEXT cer return xcert ; } -OUString SecurityEnvironment_MSCryptImpl::getSecurityEnvironmentInformation() throw( css::uno::RuntimeException ) +OUString SecurityEnvironment_MSCryptImpl::getSecurityEnvironmentInformation() { return OUString("Microsoft Crypto API"); } -xmlSecKeysMngrPtr SecurityEnvironment_MSCryptImpl::createKeysManager() throw( Exception, RuntimeException ) { +xmlSecKeysMngrPtr SecurityEnvironment_MSCryptImpl::createKeysManager() { xmlSecKeysMngrPtr pKeysMngr = nullptr ; @@ -1112,7 +1110,7 @@ xmlSecKeysMngrPtr SecurityEnvironment_MSCryptImpl::createKeysManager() throw( Ex return pKeysMngr ; } -void SecurityEnvironment_MSCryptImpl::destroyKeysManager(xmlSecKeysMngrPtr pKeysMngr) throw( Exception, RuntimeException ) { +void SecurityEnvironment_MSCryptImpl::destroyKeysManager(xmlSecKeysMngrPtr pKeysMngr) { if( pKeysMngr != nullptr ) { xmlSecKeysMngrDestroy( pKeysMngr ) ; } diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx index 3a4280bfb10a..932f69cd89c7 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx +++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx @@ -83,117 +83,109 @@ class SecurityEnvironment_MSCryptImpl : public ::cppu::WeakImplHelper< virtual ~SecurityEnvironment_MSCryptImpl() override; //Methods from XSecurityEnvironment - virtual css::uno::Sequence< css::uno::Reference< css::security::XCertificate > > SAL_CALL getPersonalCertificates() - throw( css::uno::SecurityException , css::uno::RuntimeException ) override; + virtual css::uno::Sequence< css::uno::Reference< css::security::XCertificate > > SAL_CALL getPersonalCertificates() override; virtual css::uno::Reference< css::security::XCertificate > SAL_CALL getCertificate( const OUString& issuerName, - const css::uno::Sequence< sal_Int8 >& serialNumber ) - throw( css::uno::SecurityException , css::uno::RuntimeException ) override; + const css::uno::Sequence< sal_Int8 >& serialNumber ) override; + /// @throws css::uno::SecurityException + /// @throws css::uno::RuntimeException virtual css::uno::Reference< css::security::XCertificate > SAL_CALL getCertificate( const OUString& issuerName, - const OUString& serialNumber ) - throw( css::uno::SecurityException , css::uno::RuntimeException ) ; + const OUString& serialNumber ) ; virtual css::uno::Sequence< css::uno::Reference< css::security::XCertificate > > SAL_CALL buildCertificatePath( - const css::uno::Reference< css::security::XCertificate >& beginCert ) - throw( css::uno::SecurityException , css::uno::RuntimeException ) override; + const css::uno::Reference< css::security::XCertificate >& beginCert ) override; virtual css::uno::Reference< css::security::XCertificate > SAL_CALL createCertificateFromRaw( - const css::uno::Sequence< sal_Int8 >& rawCertificate ) - throw( css::uno::SecurityException , css::uno::RuntimeException ) override; + const css::uno::Sequence< sal_Int8 >& rawCertificate ) override; virtual css::uno::Reference< css::security::XCertificate > SAL_CALL createCertificateFromAscii( - const OUString& asciiCertificate ) - throw( css::uno::SecurityException , css::uno::RuntimeException ) override; + const OUString& asciiCertificate ) override; virtual ::sal_Int32 SAL_CALL verifyCertificate( const css::uno::Reference< css::security::XCertificate >& xCert, const css::uno::Sequence< css::uno::Reference< - css::security::XCertificate > >& intermediateCertificates) - throw (css::uno::SecurityException, css::uno::RuntimeException) override; + css::security::XCertificate > >& intermediateCertificates) override; virtual ::sal_Int32 SAL_CALL getCertificateCharacters( - const css::uno::Reference< css::security::XCertificate >& xCert ) - throw (css::uno::SecurityException, css::uno::RuntimeException) override; + const css::uno::Reference< css::security::XCertificate >& xCert ) override; - virtual OUString SAL_CALL getSecurityEnvironmentInformation( ) - throw (css::uno::RuntimeException) override; + virtual OUString SAL_CALL getSecurityEnvironmentInformation( ) override; //Methods from XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ) override; + virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName - ) throw( css::uno::RuntimeException ) override; + ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; //Helper for XServiceInfo static css::uno::Sequence< OUString > impl_getSupportedServiceNames() ; /// @throws css::uno::RuntimeException - static OUString impl_getImplementationName() throw( css::uno::RuntimeException ) ; + static OUString impl_getImplementationName() ; //Helper for registry + /// @throws css::uno::RuntimeException static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( - const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) - throw( css::uno::RuntimeException ) ; + const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ; static css::uno::Reference< css::lang::XSingleServiceFactory > impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ; //Methods from XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) - throw (css::uno::RuntimeException) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId() ; static SecurityEnvironment_MSCryptImpl* getImplementation( const css::uno::Reference< css::uno::XInterface >& rObj ) ; /// @throws css::uno::Exception /// @throws css::uno::RuntimeException - HCRYPTPROV getCryptoProvider() throw( css::uno::Exception , css::uno::RuntimeException ) ; + HCRYPTPROV getCryptoProvider() ; /// @throws css::uno::Exception /// @throws css::uno::RuntimeException - void setCryptoProvider( HCRYPTPROV aProv ) throw( css::uno::Exception , css::uno::RuntimeException ) ; + void setCryptoProvider( HCRYPTPROV aProv ) ; /// @throws css::uno::Exception /// @throws css::uno::RuntimeException - LPCTSTR getKeyContainer() throw( css::uno::Exception , css::uno::RuntimeException ) ; + LPCTSTR getKeyContainer() ; /// @throws css::uno::Exception /// @throws css::uno::RuntimeException - void setKeyContainer( LPCTSTR aKeyContainer ) throw( css::uno::Exception , css::uno::RuntimeException ) ; + void setKeyContainer( LPCTSTR aKeyContainer ) ; /// @throws css::uno::Exception /// @throws css::uno::RuntimeException - HCERTSTORE getCryptoSlot() throw( css::uno::Exception , css::uno::RuntimeException ) ; + HCERTSTORE getCryptoSlot() ; /// @throws css::uno::Exception /// @throws css::uno::RuntimeException - void setCryptoSlot( HCERTSTORE aKeyStore ) throw( css::uno::Exception , css::uno::RuntimeException ) ; + void setCryptoSlot( HCERTSTORE aKeyStore ) ; /// @throws css::uno::Exception /// @throws css::uno::RuntimeException - HCERTSTORE getCertDb() throw( css::uno::Exception , css::uno::RuntimeException ) ; + HCERTSTORE getCertDb() ; /// @throws css::uno::Exception /// @throws css::uno::RuntimeException - void setCertDb( HCERTSTORE aCertDb ) throw( css::uno::Exception , css::uno::RuntimeException ) ; + void setCertDb( HCERTSTORE aCertDb ) ; /// @throws css::uno::Exception /// @throws css::uno::RuntimeException - void enableDefaultCrypt( bool enable ) throw( css::uno::Exception , css::uno::RuntimeException ) ; + void enableDefaultCrypt( bool enable ) ; /// @throws css::uno::Exception /// @throws css::uno::RuntimeException - bool defaultEnabled() throw( css::uno::Exception , css::uno::RuntimeException ) ; + bool defaultEnabled() ; /// @throws css::uno::Exception /// @throws css::uno::RuntimeException - xmlSecKeysMngrPtr createKeysManager() throw( css::uno::Exception , css::uno::RuntimeException ) ; + xmlSecKeysMngrPtr createKeysManager() ; /// @throws css::uno::Exception /// @throws css::uno::RuntimeException - static void destroyKeysManager(xmlSecKeysMngrPtr pKeysMngr) throw( css::uno::Exception , css::uno::RuntimeException ) ; + static void destroyKeysManager(xmlSecKeysMngrPtr pKeysMngr) ; } ; #endif // INCLUDED_XMLSECURITY_SOURCE_XMLSEC_MSCRYPT_SECURITYENVIRONMENT_MSCRYPTIMPL_HXX diff --git a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx index 91158dd14d6b..72b50e292079 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx @@ -47,7 +47,6 @@ SEInitializer_MSCryptImpl::~SEInitializer_MSCryptImpl() cssu::Reference< cssxc::XXMLSecurityContext > SAL_CALL SEInitializer_MSCryptImpl::createSecurityContext( const OUString& sCertDB ) - throw (cssu::RuntimeException) { const char* n_pCertStore ; HCERTSTORE n_hStoreHandle ; @@ -118,7 +117,6 @@ cssu::Reference< cssxc::XXMLSecurityContext > SAL_CALL } void SAL_CALL SEInitializer_MSCryptImpl::freeSecurityContext( const cssu::Reference< cssxc::XXMLSecurityContext >&) - throw (cssu::RuntimeException) { /* cssu::Reference< cssxc::XSecurityEnvironment > xSecEnv @@ -148,39 +146,33 @@ void SAL_CALL SEInitializer_MSCryptImpl::freeSecurityContext( const cssu::Refere } OUString SEInitializer_MSCryptImpl_getImplementationName() - throw (cssu::RuntimeException) { return OUString( "com.sun.star.xml.security.bridge.xmlsec.SEInitializer_MSCryptImpl" ); } cssu::Sequence< OUString > SAL_CALL SEInitializer_MSCryptImpl_getSupportedServiceNames() - throw (cssu::RuntimeException) { cssu::Sequence<OUString> aRet { "com.sun.star.xml.crypto.SEInitializer" }; return aRet; } cssu::Reference< cssu::XInterface > SAL_CALL SEInitializer_MSCryptImpl_createInstance( const cssu::Reference< cssl::XMultiServiceFactory > & rSMgr) - throw( cssu::Exception ) { return static_cast<cppu::OWeakObject*>(new SEInitializer_MSCryptImpl( comphelper::getComponentContext(rSMgr) )); } /* XServiceInfo */ OUString SAL_CALL SEInitializer_MSCryptImpl::getImplementationName() - throw (cssu::RuntimeException) { return SEInitializer_MSCryptImpl_getImplementationName(); } sal_Bool SAL_CALL SEInitializer_MSCryptImpl::supportsService( const OUString& rServiceName ) - throw (cssu::RuntimeException) { return cppu::supportsService( this, rServiceName ); } cssu::Sequence< OUString > SAL_CALL SEInitializer_MSCryptImpl::getSupportedServiceNames() - throw (cssu::RuntimeException) { return SEInitializer_MSCryptImpl_getSupportedServiceNames(); } diff --git a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx index b36da2d65986..05afb7bd0db8 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx +++ b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx @@ -56,37 +56,28 @@ public: /* XSEInitializer */ virtual css::uno::Reference< css::xml::crypto::XXMLSecurityContext > - SAL_CALL createSecurityContext( const OUString& certDB ) - throw (css::uno::RuntimeException) override; + SAL_CALL createSecurityContext( const OUString& certDB ) override; virtual void SAL_CALL freeSecurityContext( const css::uno::Reference< - css::xml::crypto::XXMLSecurityContext >& securityContext ) - throw (css::uno::RuntimeException) override; + css::xml::crypto::XXMLSecurityContext >& securityContext ) override; /* XServiceInfo */ - virtual OUString SAL_CALL getImplementationName( ) - throw (css::uno::RuntimeException) override; + virtual OUString SAL_CALL getImplementationName( ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (css::uno::RuntimeException) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; /// @throws css::uno::RuntimeException -OUString SEInitializer_MSCryptImpl_getImplementationName() - throw ( css::uno::RuntimeException ); +OUString SEInitializer_MSCryptImpl_getImplementationName(); -bool SAL_CALL SEInitializer_MSCryptImpl_supportsService( const OUString& ServiceName ) - throw ( css::uno::RuntimeException ); - -css::uno::Sequence< OUString > SAL_CALL SEInitializer_MSCryptImpl_getSupportedServiceNames( ) - throw ( css::uno::RuntimeException ); +/// @throws css::uno::RuntimeException +css::uno::Sequence< OUString > SAL_CALL SEInitializer_MSCryptImpl_getSupportedServiceNames( ); +/// @throws css::uno::Exception css::uno::Reference< css::uno::XInterface > -SAL_CALL SEInitializer_MSCryptImpl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) - throw ( css::uno::Exception ); +SAL_CALL SEInitializer_MSCryptImpl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr); #endif diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx index c2033024f8c2..b468bf109a25 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx @@ -181,7 +181,7 @@ X509Certificate_MSCryptImpl::~X509Certificate_MSCryptImpl() { } //Methods from XCertificate -sal_Int16 SAL_CALL X509Certificate_MSCryptImpl::getVersion() throw ( css::uno::RuntimeException) { +sal_Int16 SAL_CALL X509Certificate_MSCryptImpl::getVersion() { if( m_pCertContext != nullptr && m_pCertContext->pCertInfo != nullptr ) { return ( char )m_pCertContext->pCertInfo->dwVersion ; } else { @@ -189,7 +189,7 @@ sal_Int16 SAL_CALL X509Certificate_MSCryptImpl::getVersion() throw ( css::uno::R } } -css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getSerialNumber() throw ( css::uno::RuntimeException) { +css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getSerialNumber() { if( m_pCertContext != nullptr && m_pCertContext->pCertInfo != nullptr ) { Sequence< sal_Int8 > serial( m_pCertContext->pCertInfo->SerialNumber.cbData ) ; for( unsigned int i = 0 ; i < m_pCertContext->pCertInfo->SerialNumber.cbData ; i ++ ) @@ -201,7 +201,7 @@ css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getSerialNu } } -OUString SAL_CALL X509Certificate_MSCryptImpl::getIssuerName() throw ( css::uno::RuntimeException) { +OUString SAL_CALL X509Certificate_MSCryptImpl::getIssuerName() { if( m_pCertContext != nullptr && m_pCertContext->pCertInfo != nullptr ) { DWORD cbIssuer ; @@ -247,7 +247,7 @@ OUString SAL_CALL X509Certificate_MSCryptImpl::getIssuerName() throw ( css::uno: } } -OUString SAL_CALL X509Certificate_MSCryptImpl::getSubjectName() throw ( css::uno::RuntimeException) +OUString SAL_CALL X509Certificate_MSCryptImpl::getSubjectName() { if( m_pCertContext != nullptr && m_pCertContext->pCertInfo != nullptr ) { @@ -291,7 +291,7 @@ OUString SAL_CALL X509Certificate_MSCryptImpl::getSubjectName() throw ( css::uno } } -css::util::DateTime SAL_CALL X509Certificate_MSCryptImpl::getNotValidBefore() throw ( css::uno::RuntimeException ) { +css::util::DateTime SAL_CALL X509Certificate_MSCryptImpl::getNotValidBefore() { if( m_pCertContext != nullptr && m_pCertContext->pCertInfo != nullptr ) { SYSTEMTIME explTime ; DateTime dateTime ; @@ -317,7 +317,7 @@ css::util::DateTime SAL_CALL X509Certificate_MSCryptImpl::getNotValidBefore() th } } -css::util::DateTime SAL_CALL X509Certificate_MSCryptImpl::getNotValidAfter() throw ( css::uno::RuntimeException) { +css::util::DateTime SAL_CALL X509Certificate_MSCryptImpl::getNotValidAfter() { if( m_pCertContext != nullptr && m_pCertContext->pCertInfo != nullptr ) { SYSTEMTIME explTime ; DateTime dateTime ; @@ -343,7 +343,7 @@ css::util::DateTime SAL_CALL X509Certificate_MSCryptImpl::getNotValidAfter() thr } } -css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getIssuerUniqueID() throw ( css::uno::RuntimeException) { +css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getIssuerUniqueID() { if( m_pCertContext != nullptr && m_pCertContext->pCertInfo != nullptr ) { Sequence< sal_Int8 > issuerUid( m_pCertContext->pCertInfo->IssuerUniqueId.cbData ) ; for( unsigned int i = 0 ; i < m_pCertContext->pCertInfo->IssuerUniqueId.cbData; i ++ ) @@ -355,7 +355,7 @@ css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getIssuerUn } } -css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getSubjectUniqueID() throw ( css::uno::RuntimeException ) { +css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getSubjectUniqueID() { if( m_pCertContext != nullptr && m_pCertContext->pCertInfo != nullptr ) { Sequence< sal_Int8 > subjectUid( m_pCertContext->pCertInfo->SubjectUniqueId.cbData ) ; for( unsigned int i = 0 ; i < m_pCertContext->pCertInfo->SubjectUniqueId.cbData; i ++ ) @@ -367,7 +367,7 @@ css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getSubjectU } } -css::uno::Sequence< css::uno::Reference< css::security::XCertificateExtension > > SAL_CALL X509Certificate_MSCryptImpl::getExtensions() throw ( css::uno::RuntimeException ) { +css::uno::Sequence< css::uno::Reference< css::security::XCertificateExtension > > SAL_CALL X509Certificate_MSCryptImpl::getExtensions() { if( m_pCertContext != nullptr && m_pCertContext->pCertInfo != nullptr && m_pCertContext->pCertInfo->cExtension != 0 ) { CertificateExtension_XmlSecImpl* xExtn ; Sequence< Reference< XCertificateExtension > > xExtns( m_pCertContext->pCertInfo->cExtension ) ; @@ -396,7 +396,7 @@ css::uno::Sequence< css::uno::Reference< css::security::XCertificateExtension > } } -css::uno::Reference< css::security::XCertificateExtension > SAL_CALL X509Certificate_MSCryptImpl::findCertificateExtension( const css::uno::Sequence< sal_Int8 >& /*oid*/ ) throw (css::uno::RuntimeException) { +css::uno::Reference< css::security::XCertificateExtension > SAL_CALL X509Certificate_MSCryptImpl::findCertificateExtension( const css::uno::Sequence< sal_Int8 >& /*oid*/ ) { if( m_pCertContext != nullptr && m_pCertContext->pCertInfo != nullptr && m_pCertContext->pCertInfo->cExtension != 0 ) { CertificateExtension_XmlSecImpl* xExtn ; @@ -421,7 +421,7 @@ css::uno::Reference< css::security::XCertificateExtension > SAL_CALL X509Certifi } -css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getEncoded() throw ( css::uno::RuntimeException) { +css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getEncoded() { if( m_pCertContext != nullptr && m_pCertContext->cbCertEncoded > 0 ) { Sequence< sal_Int8 > rawCert( m_pCertContext->cbCertEncoded ) ; @@ -454,7 +454,7 @@ const CERT_CONTEXT* X509Certificate_MSCryptImpl::getMswcryCert() const { } } -void X509Certificate_MSCryptImpl::setRawCert( Sequence< sal_Int8 > const & rawCert ) throw ( css::uno::RuntimeException) { +void X509Certificate_MSCryptImpl::setRawCert( Sequence< sal_Int8 > const & rawCert ) { if( m_pCertContext != nullptr ) { CertFreeCertificateContext( m_pCertContext ) ; m_pCertContext = nullptr ; @@ -466,7 +466,7 @@ void X509Certificate_MSCryptImpl::setRawCert( Sequence< sal_Int8 > const & rawCe } /* XUnoTunnel */ -sal_Int64 SAL_CALL X509Certificate_MSCryptImpl::getSomething( const Sequence< sal_Int8 >& aIdentifier ) throw( RuntimeException ) { +sal_Int64 SAL_CALL X509Certificate_MSCryptImpl::getSomething( const Sequence< sal_Int8 >& aIdentifier ) { if( aIdentifier.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), aIdentifier.getConstArray(), 16 ) ) { return reinterpret_cast<sal_Int64>(this); } @@ -535,7 +535,6 @@ css::uno::Sequence< sal_Int8 > getThumbprint(const CERT_CONTEXT* pCertContext, D } OUString SAL_CALL X509Certificate_MSCryptImpl::getSubjectPublicKeyAlgorithm() - throw ( css::uno::RuntimeException) { if( m_pCertContext != nullptr && m_pCertContext->pCertInfo != nullptr ) { @@ -549,7 +548,6 @@ OUString SAL_CALL X509Certificate_MSCryptImpl::getSubjectPublicKeyAlgorithm() } css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getSubjectPublicKeyValue() - throw ( css::uno::RuntimeException) { if( m_pCertContext != nullptr && m_pCertContext->pCertInfo != nullptr ) { @@ -570,7 +568,6 @@ css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getSubjectP } OUString SAL_CALL X509Certificate_MSCryptImpl::getSignatureAlgorithm() - throw ( css::uno::RuntimeException) { if( m_pCertContext != nullptr && m_pCertContext->pCertInfo != nullptr ) { @@ -583,25 +580,22 @@ OUString SAL_CALL X509Certificate_MSCryptImpl::getSignatureAlgorithm() } } -uno::Sequence<sal_Int8> X509Certificate_MSCryptImpl::getSHA256Thumbprint() throw (uno::RuntimeException, std::exception) +uno::Sequence<sal_Int8> X509Certificate_MSCryptImpl::getSHA256Thumbprint() { return getThumbprint(m_pCertContext, CERT_SHA256_HASH_PROP_ID); } css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getSHA1Thumbprint() - throw ( css::uno::RuntimeException) { return getThumbprint(m_pCertContext, CERT_SHA1_HASH_PROP_ID); } css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_MSCryptImpl::getMD5Thumbprint() - throw ( css::uno::RuntimeException) { return getThumbprint(m_pCertContext, CERT_MD5_HASH_PROP_ID); } sal_Int32 SAL_CALL X509Certificate_MSCryptImpl::getCertificateUsage( ) - throw ( css::uno::RuntimeException) { sal_Int32 usage = CERT_DATA_ENCIPHERMENT_KEY_USAGE | diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx index 27be6535f702..f7ba8a21a3fc 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx +++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx @@ -50,36 +50,31 @@ class X509Certificate_MSCryptImpl : public ::cppu::WeakImplHelper< virtual ~X509Certificate_MSCryptImpl() override; //Methods from XCertificate - virtual sal_Int16 SAL_CALL getVersion() throw ( css::uno::RuntimeException) override; + virtual sal_Int16 SAL_CALL getVersion() override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSerialNumber() throw ( css::uno::RuntimeException) override; - virtual OUString SAL_CALL getIssuerName() throw ( css::uno::RuntimeException) override; - virtual OUString SAL_CALL getSubjectName() throw ( css::uno::RuntimeException) override; - virtual css::util::DateTime SAL_CALL getNotValidBefore() throw ( css::uno::RuntimeException) override; - virtual css::util::DateTime SAL_CALL getNotValidAfter() throw ( css::uno::RuntimeException) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getIssuerUniqueID() throw ( css::uno::RuntimeException) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSubjectUniqueID() throw ( css::uno::RuntimeException) override; - virtual css::uno::Sequence< css::uno::Reference< css::security::XCertificateExtension > > SAL_CALL getExtensions() throw ( css::uno::RuntimeException) override; - virtual css::uno::Reference< css::security::XCertificateExtension > SAL_CALL findCertificateExtension( const css::uno::Sequence< sal_Int8 >& oid ) throw (css::uno::RuntimeException) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getEncoded() throw ( css::uno::RuntimeException) override; - virtual OUString SAL_CALL getSubjectPublicKeyAlgorithm() - throw ( css::uno::RuntimeException) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSubjectPublicKeyValue() - throw ( css::uno::RuntimeException) override; - virtual OUString SAL_CALL getSignatureAlgorithm() - throw ( css::uno::RuntimeException) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSHA1Thumbprint() - throw ( css::uno::RuntimeException) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getMD5Thumbprint() - throw ( css::uno::RuntimeException) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSerialNumber() override; + virtual OUString SAL_CALL getIssuerName() override; + virtual OUString SAL_CALL getSubjectName() override; + virtual css::util::DateTime SAL_CALL getNotValidBefore() override; + virtual css::util::DateTime SAL_CALL getNotValidAfter() override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getIssuerUniqueID() override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSubjectUniqueID() override; + virtual css::uno::Sequence< css::uno::Reference< css::security::XCertificateExtension > > SAL_CALL getExtensions() override; + virtual css::uno::Reference< css::security::XCertificateExtension > SAL_CALL findCertificateExtension( const css::uno::Sequence< sal_Int8 >& oid ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getEncoded() override; + virtual OUString SAL_CALL getSubjectPublicKeyAlgorithm() override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSubjectPublicKeyValue() override; + virtual OUString SAL_CALL getSignatureAlgorithm() override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSHA1Thumbprint() override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getMD5Thumbprint() override; - virtual sal_Int32 SAL_CALL getCertificateUsage( ) throw ( css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getCertificateUsage( ) override; //Methods from XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw (css::uno::RuntimeException) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; /// @see xmlsecurity::Certificate::getSHA256Thumbprint(). - virtual css::uno::Sequence<sal_Int8> getSHA256Thumbprint() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<sal_Int8> getSHA256Thumbprint() override; static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId() ; static X509Certificate_MSCryptImpl* getImplementation( const css::uno::Reference< css::uno::XInterface >& rObj ) ; @@ -88,7 +83,7 @@ class X509Certificate_MSCryptImpl : public ::cppu::WeakImplHelper< void setMswcryCert( const CERT_CONTEXT* cert ) ; const CERT_CONTEXT* getMswcryCert() const ; /// @throws css::uno::RuntimeException - void setRawCert( css::uno::Sequence< sal_Int8 > const & rawCert ) throw ( css::uno::RuntimeException) ; + void setRawCert( css::uno::Sequence< sal_Int8 > const & rawCert ) ; } ; #endif // INCLUDED_XMLSECURITY_SOURCE_XMLSEC_MSCRYPT_X509CERTIFICATE_MSCRYPTIMPL_HXX diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx index 7d5fd3ef32b3..6e520d6503af 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx @@ -58,8 +58,7 @@ Reference< XXMLEncryptionTemplate > SAL_CALL XMLEncryption_MSCryptImpl::encrypt( const Reference< XXMLEncryptionTemplate >& aTemplate , const Reference< XSecurityEnvironment >& aEnvironment -) throw( css::xml::crypto::XMLEncryptionException, - css::uno::SecurityException ) +) { xmlSecKeysMngrPtr pMngr = nullptr ; xmlSecEncCtxPtr pEncCtx = nullptr ; @@ -194,8 +193,7 @@ Reference< XXMLEncryptionTemplate > SAL_CALL XMLEncryption_MSCryptImpl::decrypt( const Reference< XXMLEncryptionTemplate >& aTemplate , const Reference< XXMLSecurityContext >& aSecurityCtx -) throw( css::xml::crypto::XMLEncryptionException , - css::uno::SecurityException) { +) { xmlSecKeysMngrPtr pMngr = nullptr ; xmlSecEncCtxPtr pEncCtx = nullptr ; xmlNodePtr pEncryptedData = nullptr ; @@ -320,12 +318,12 @@ XMLEncryption_MSCryptImpl::decrypt( } /* XServiceInfo */ -OUString SAL_CALL XMLEncryption_MSCryptImpl::getImplementationName() throw( RuntimeException ) { +OUString SAL_CALL XMLEncryption_MSCryptImpl::getImplementationName() { return impl_getImplementationName() ; } /* XServiceInfo */ -sal_Bool SAL_CALL XMLEncryption_MSCryptImpl::supportsService( const OUString& serviceName) throw( RuntimeException ) { +sal_Bool SAL_CALL XMLEncryption_MSCryptImpl::supportsService( const OUString& serviceName) { Sequence< OUString > seqServiceNames = getSupportedServiceNames() ; const OUString* pArray = seqServiceNames.getConstArray() ; for( sal_Int32 i = 0 ; i < seqServiceNames.getLength() ; i ++ ) { @@ -336,7 +334,7 @@ sal_Bool SAL_CALL XMLEncryption_MSCryptImpl::supportsService( const OUString& se } /* XServiceInfo */ -Sequence< OUString > SAL_CALL XMLEncryption_MSCryptImpl::getSupportedServiceNames() throw( RuntimeException ) { +Sequence< OUString > SAL_CALL XMLEncryption_MSCryptImpl::getSupportedServiceNames() { return impl_getSupportedServiceNames() ; } @@ -347,12 +345,12 @@ Sequence< OUString > XMLEncryption_MSCryptImpl::impl_getSupportedServiceNames() return seqServiceNames ; } -OUString XMLEncryption_MSCryptImpl::impl_getImplementationName() throw( RuntimeException ) { +OUString XMLEncryption_MSCryptImpl::impl_getImplementationName() { return OUString("com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_MSCryptImpl") ; } //Helper for registry -Reference< XInterface > SAL_CALL XMLEncryption_MSCryptImpl::impl_createInstance( const Reference< XMultiServiceFactory >& aServiceManager ) throw( RuntimeException ) { +Reference< XInterface > SAL_CALL XMLEncryption_MSCryptImpl::impl_createInstance( const Reference< XMultiServiceFactory >& aServiceManager ) { return Reference< XInterface >( *new XMLEncryption_MSCryptImpl( aServiceManager ) ) ; } diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx index 5d773a29573a..c445cea1bdc8 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx @@ -50,32 +50,31 @@ class XMLEncryption_MSCryptImpl : public ::cppu::WeakImplHelper< const css::uno::Reference< css::xml::crypto::XXMLEncryptionTemplate >& aTemplate , const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& aEnvironment) // ) throw( css::uno::Exception , css::uno::RuntimeException ) ; - throw ( css::xml::crypto::XMLEncryptionException , - css::uno::SecurityException) override; + override; virtual css::uno::Reference< css::xml::crypto::XXMLEncryptionTemplate > SAL_CALL decrypt( const css::uno::Reference< css::xml::crypto::XXMLEncryptionTemplate >& aTemplate , const css::uno::Reference< css::xml::crypto::XXMLSecurityContext >& aContext - ) throw( css::xml::crypto::XMLEncryptionException , - css::uno::SecurityException) override; + ) override; //Methods from XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ) override; + virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName - ) throw( css::uno::RuntimeException ) override; + ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; //Helper for XServiceInfo static css::uno::Sequence< OUString > impl_getSupportedServiceNames() ; /// @throws css::uno::RuntimeException - static OUString impl_getImplementationName() throw( css::uno::RuntimeException ) ; + static OUString impl_getImplementationName() ; //Helper for registry - static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) throw( css::uno::RuntimeException ) ; + /// @throws css::uno::RuntimeException + static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ; static css::uno::Reference< css::lang::XSingleServiceFactory > impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ; } ; diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx index e1de76a5473d..df5fb696db25 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx @@ -65,7 +65,6 @@ XMLSecurityContext_MSCryptImpl::~XMLSecurityContext_MSCryptImpl() { sal_Int32 SAL_CALL XMLSecurityContext_MSCryptImpl::addSecurityEnvironment( const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& aSecurityEnvironment) - throw (css::security::SecurityInfrastructureException, css::uno::RuntimeException) { if( !aSecurityEnvironment.is() ) { @@ -79,14 +78,12 @@ sal_Int32 SAL_CALL XMLSecurityContext_MSCryptImpl::addSecurityEnvironment( sal_Int32 SAL_CALL XMLSecurityContext_MSCryptImpl::getSecurityEnvironmentNumber( ) - throw (css::uno::RuntimeException) { return 1; } css::uno::Reference< css::xml::crypto::XSecurityEnvironment > SAL_CALL XMLSecurityContext_MSCryptImpl::getSecurityEnvironmentByIndex( sal_Int32 index ) - throw (css::uno::RuntimeException) { if (index == 0) { @@ -98,30 +95,27 @@ css::uno::Reference< css::xml::crypto::XSecurityEnvironment > SAL_CALL css::uno::Reference< css::xml::crypto::XSecurityEnvironment > SAL_CALL XMLSecurityContext_MSCryptImpl::getSecurityEnvironment( ) - throw (css::uno::RuntimeException) { return m_xSecurityEnvironment; } sal_Int32 SAL_CALL XMLSecurityContext_MSCryptImpl::getDefaultSecurityEnvironmentIndex( ) - throw (css::uno::RuntimeException) { return 0; } void SAL_CALL XMLSecurityContext_MSCryptImpl::setDefaultSecurityEnvironmentIndex( sal_Int32 /*nDefaultEnvIndex*/ ) - throw (css::uno::RuntimeException) { //dummy } /* XServiceInfo */ -OUString SAL_CALL XMLSecurityContext_MSCryptImpl::getImplementationName() throw( RuntimeException ) { +OUString SAL_CALL XMLSecurityContext_MSCryptImpl::getImplementationName() { return impl_getImplementationName() ; } /* XServiceInfo */ -sal_Bool SAL_CALL XMLSecurityContext_MSCryptImpl::supportsService( const OUString& serviceName) throw( RuntimeException ) { +sal_Bool SAL_CALL XMLSecurityContext_MSCryptImpl::supportsService( const OUString& serviceName) { Sequence< OUString > seqServiceNames = getSupportedServiceNames() ; const OUString* pArray = seqServiceNames.getConstArray() ; for( sal_Int32 i = 0 ; i < seqServiceNames.getLength() ; i ++ ) { @@ -132,7 +126,7 @@ sal_Bool SAL_CALL XMLSecurityContext_MSCryptImpl::supportsService( const OUStrin } /* XServiceInfo */ -Sequence< OUString > SAL_CALL XMLSecurityContext_MSCryptImpl::getSupportedServiceNames() throw( RuntimeException ) { +Sequence< OUString > SAL_CALL XMLSecurityContext_MSCryptImpl::getSupportedServiceNames() { return impl_getSupportedServiceNames() ; } @@ -143,12 +137,12 @@ Sequence< OUString > XMLSecurityContext_MSCryptImpl::impl_getSupportedServiceNam return seqServiceNames ; } -OUString XMLSecurityContext_MSCryptImpl::impl_getImplementationName() throw( RuntimeException ) { +OUString XMLSecurityContext_MSCryptImpl::impl_getImplementationName() { return OUString("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_MSCryptImpl") ; } //Helper for registry -Reference< XInterface > SAL_CALL XMLSecurityContext_MSCryptImpl::impl_createInstance( const Reference< XMultiServiceFactory >& ) throw( RuntimeException ) { +Reference< XInterface > SAL_CALL XMLSecurityContext_MSCryptImpl::impl_createInstance( const Reference< XMultiServiceFactory >& ) { return Reference< XInterface >( *new XMLSecurityContext_MSCryptImpl ) ; } diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx index 4ed4153bca54..3f9bc3c40ba7 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx @@ -50,45 +50,41 @@ class XMLSecurityContext_MSCryptImpl : public ::cppu::WeakImplHelper< //Methods from XXMLSecurityContext virtual sal_Int32 SAL_CALL addSecurityEnvironment( const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& aSecurityEnvironment - ) throw (css::security::SecurityInfrastructureException, css::uno::RuntimeException) override; + ) override; - virtual ::sal_Int32 SAL_CALL getSecurityEnvironmentNumber( ) - throw (css::uno::RuntimeException) override; + virtual ::sal_Int32 SAL_CALL getSecurityEnvironmentNumber( ) override; virtual css::uno::Reference< css::xml::crypto::XSecurityEnvironment > SAL_CALL - getSecurityEnvironmentByIndex( ::sal_Int32 index ) - throw (css::uno::RuntimeException) override; + getSecurityEnvironmentByIndex( ::sal_Int32 index ) override; virtual css::uno::Reference< css::xml::crypto::XSecurityEnvironment > SAL_CALL - getSecurityEnvironment( ) - throw (css::uno::RuntimeException) override; + getSecurityEnvironment( ) override; - virtual ::sal_Int32 SAL_CALL getDefaultSecurityEnvironmentIndex( ) - throw (css::uno::RuntimeException) override; + virtual ::sal_Int32 SAL_CALL getDefaultSecurityEnvironmentIndex( ) override; - virtual void SAL_CALL setDefaultSecurityEnvironmentIndex( sal_Int32 nDefaultEnvIndex ) - throw (css::uno::RuntimeException) override; + virtual void SAL_CALL setDefaultSecurityEnvironmentIndex( sal_Int32 nDefaultEnvIndex ) override; //Methods from XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ) override; + virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName - ) throw( css::uno::RuntimeException ) override; + ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; //Helper for XServiceInfo static css::uno::Sequence< OUString > impl_getSupportedServiceNames() ; /// @throws css::uno::RuntimeException - static OUString impl_getImplementationName() throw( css::uno::RuntimeException ) ; + static OUString impl_getImplementationName() ; //Helper for registry - static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) throw( css::uno::RuntimeException ) ; + /// @throws css::uno::RuntimeException + static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ; static css::uno::Reference< css::lang::XSingleServiceFactory > impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ; diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx index ac5ffda6f87b..7b6ee686a05c 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx @@ -55,8 +55,7 @@ Reference< XXMLSignatureTemplate > SAL_CALL XMLSignature_MSCryptImpl::generate( const Reference< XXMLSignatureTemplate >& aTemplate , const Reference< XSecurityEnvironment >& aEnvironment -) throw( css::xml::crypto::XMLSignatureException, - css::uno::SecurityException ) +) { xmlSecKeysMngrPtr pMngr = nullptr ; xmlSecDSigCtxPtr pDsigCtx = nullptr ; @@ -151,9 +150,7 @@ Reference< XXMLSignatureTemplate > SAL_CALL XMLSignature_MSCryptImpl::validate( const Reference< XXMLSignatureTemplate >& aTemplate , const Reference< XXMLSecurityContext >& aSecurityCtx -) throw( css::uno::RuntimeException, - css::uno::SecurityException, - css::xml::crypto::XMLSignatureException ) { +) { xmlSecKeysMngrPtr pMngr = nullptr ; xmlSecDSigCtxPtr pDsigCtx = nullptr ; xmlNodePtr pNode = nullptr ; @@ -265,12 +262,12 @@ SAL_CALL XMLSignature_MSCryptImpl::validate( } /* XServiceInfo */ -OUString SAL_CALL XMLSignature_MSCryptImpl::getImplementationName() throw( RuntimeException ) { +OUString SAL_CALL XMLSignature_MSCryptImpl::getImplementationName() { return impl_getImplementationName() ; } /* XServiceInfo */ -sal_Bool SAL_CALL XMLSignature_MSCryptImpl::supportsService( const OUString& serviceName) throw( RuntimeException ) { +sal_Bool SAL_CALL XMLSignature_MSCryptImpl::supportsService( const OUString& serviceName) { Sequence< OUString > seqServiceNames = getSupportedServiceNames() ; const OUString* pArray = seqServiceNames.getConstArray() ; for( sal_Int32 i = 0 ; i < seqServiceNames.getLength() ; i ++ ) { @@ -281,7 +278,7 @@ sal_Bool SAL_CALL XMLSignature_MSCryptImpl::supportsService( const OUString& ser } /* XServiceInfo */ -Sequence< OUString > SAL_CALL XMLSignature_MSCryptImpl::getSupportedServiceNames() throw( RuntimeException ) { +Sequence< OUString > SAL_CALL XMLSignature_MSCryptImpl::getSupportedServiceNames() { return impl_getSupportedServiceNames() ; } @@ -292,12 +289,12 @@ Sequence< OUString > XMLSignature_MSCryptImpl::impl_getSupportedServiceNames() { return seqServiceNames ; } -OUString XMLSignature_MSCryptImpl::impl_getImplementationName() throw( RuntimeException ) { +OUString XMLSignature_MSCryptImpl::impl_getImplementationName() { return OUString("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_MSCryptImpl") ; } //Helper for registry -Reference< XInterface > SAL_CALL XMLSignature_MSCryptImpl::impl_createInstance( const Reference< XMultiServiceFactory >& aServiceManager ) throw( RuntimeException ) { +Reference< XInterface > SAL_CALL XMLSignature_MSCryptImpl::impl_createInstance( const Reference< XMultiServiceFactory >& aServiceManager ) { return Reference< XInterface >( *new XMLSignature_MSCryptImpl( aServiceManager ) ) ; } diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx index 32def55df640..a5cb5c6398a7 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx @@ -49,33 +49,31 @@ class XMLSignature_MSCryptImpl : public ::cppu::WeakImplHelper< virtual css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate > SAL_CALL generate( const css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate >& aTemplate , const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& aEnvironment - ) throw( css::xml::crypto::XMLSignatureException, - css::uno::SecurityException) override; + ) override; virtual css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate > SAL_CALL validate( const css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate >& aTemplate , const css::uno::Reference< css::xml::crypto::XXMLSecurityContext >& aContext - ) throw( css::uno::RuntimeException, - css::uno::SecurityException, - css::xml::crypto::XMLSignatureException) override; + ) override; //Methods from XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ) override; + virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName - ) throw( css::uno::RuntimeException ) override; + ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; //Helper for XServiceInfo static css::uno::Sequence< OUString > impl_getSupportedServiceNames() ; /// @throws css::uno::RuntimeException - static OUString impl_getImplementationName() throw( css::uno::RuntimeException ) ; + static OUString impl_getImplementationName() ; //Helper for registry - static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) throw( css::uno::RuntimeException ) ; + /// @throws css::uno::RuntimeException + static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ; static css::uno::Reference< css::lang::XSingleServiceFactory > impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ; } ; diff --git a/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx b/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx index 6d9d40ade222..c1532d77bea3 100644 --- a/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx +++ b/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx @@ -91,7 +91,6 @@ void OCipherContext::Dispose() } uno::Sequence< ::sal_Int8 > SAL_CALL OCipherContext::convertWithCipherContext( const uno::Sequence< ::sal_Int8 >& aData ) - throw ( lang::IllegalArgumentException, lang::DisposedException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -172,7 +171,6 @@ uno::Sequence< ::sal_Int8 > SAL_CALL OCipherContext::convertWithCipherContext( c } uno::Sequence< ::sal_Int8 > SAL_CALL OCipherContext::finalizeCipherContextAndDispose() - throw (lang::DisposedException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/xmlsecurity/source/xmlsec/nss/ciphercontext.hxx b/xmlsecurity/source/xmlsec/nss/ciphercontext.hxx index 9d8d54535caf..a7a4e6dad54e 100644 --- a/xmlsecurity/source/xmlsec/nss/ciphercontext.hxx +++ b/xmlsecurity/source/xmlsec/nss/ciphercontext.hxx @@ -73,8 +73,8 @@ public: static css::uno::Reference< css::xml::crypto::XCipherContext > Create( CK_MECHANISM_TYPE nNSSCipherID, const css::uno::Sequence< ::sal_Int8 >& aKey, const css::uno::Sequence< ::sal_Int8 >& aInitializationVector, bool bEncryption, bool bW3CPadding ); // XCipherContext - virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL convertWithCipherContext( const css::uno::Sequence< ::sal_Int8 >& aData ) throw (css::lang::IllegalArgumentException, css::lang::DisposedException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL finalizeCipherContextAndDispose( ) throw (css::lang::DisposedException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL convertWithCipherContext( const css::uno::Sequence< ::sal_Int8 >& aData ) override; + virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL finalizeCipherContextAndDispose( ) override; }; #endif diff --git a/xmlsecurity/source/xmlsec/nss/digestcontext.cxx b/xmlsecurity/source/xmlsec/nss/digestcontext.cxx index 86f8c77b6f63..538452e641c2 100644 --- a/xmlsecurity/source/xmlsec/nss/digestcontext.cxx +++ b/xmlsecurity/source/xmlsec/nss/digestcontext.cxx @@ -33,7 +33,6 @@ ODigestContext::~ODigestContext() } void SAL_CALL ODigestContext::updateDigest( const uno::Sequence< ::sal_Int8 >& aData ) - throw (lang::DisposedException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -62,7 +61,6 @@ void SAL_CALL ODigestContext::updateDigest( const uno::Sequence< ::sal_Int8 >& a } uno::Sequence< ::sal_Int8 > SAL_CALL ODigestContext::finalizeDigestAndDispose() - throw (lang::DisposedException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/xmlsecurity/source/xmlsec/nss/digestcontext.hxx b/xmlsecurity/source/xmlsec/nss/digestcontext.hxx index 59074b282d08..7e20cd8d99d0 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 css::uno::Sequence< ::sal_Int8 >& aData ) throw (css::lang::DisposedException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL finalizeDigestAndDispose() throw (css::lang::DisposedException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateDigest( const css::uno::Sequence< ::sal_Int8 >& aData ) override; + virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL finalizeDigestAndDispose() override; }; #endif diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx index 136c8d6b79d6..c25bc9fe973b 100644 --- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx +++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx @@ -393,7 +393,6 @@ bool ONSSInitializer::initNSS( const css::uno::Reference< css::uno::XComponentCo } css::uno::Reference< css::xml::crypto::XDigestContext > SAL_CALL ONSSInitializer::getDigestContext( ::sal_Int32 nDigestID, const css::uno::Sequence< css::beans::NamedValue >& aParams ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { SECOidTag nNSSDigestID = SEC_OID_UNKNOWN; sal_Int32 nDigestLength = 0; @@ -430,7 +429,6 @@ css::uno::Reference< css::xml::crypto::XDigestContext > SAL_CALL ONSSInitializer } css::uno::Reference< css::xml::crypto::XCipherContext > SAL_CALL ONSSInitializer::getCipherContext( ::sal_Int32 nCipherID, const css::uno::Sequence< ::sal_Int8 >& aKey, const css::uno::Sequence< ::sal_Int8 >& aInitializationVector, sal_Bool bEncryption, const css::uno::Sequence< css::beans::NamedValue >& aParams ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { CK_MECHANISM_TYPE nNSSCipherID = 0; bool bW3CPadding = false; @@ -461,40 +459,34 @@ css::uno::Reference< css::xml::crypto::XCipherContext > SAL_CALL ONSSInitializer } OUString ONSSInitializer_getImplementationName () - throw (cssu::RuntimeException) { return OUString ( IMPLEMENTATION_NAME ); } cssu::Sequence< OUString > SAL_CALL ONSSInitializer_getSupportedServiceNames( ) - throw (cssu::RuntimeException) { cssu::Sequence<OUString> aRet { NSS_SERVICE_NAME }; return aRet; } cssu::Reference< cssu::XInterface > SAL_CALL ONSSInitializer_createInstance( const cssu::Reference< cssl::XMultiServiceFactory > & rSMgr) - throw( cssu::Exception ) { return static_cast<cppu::OWeakObject*>(new ONSSInitializer( comphelper::getComponentContext(rSMgr) )); } /* XServiceInfo */ OUString SAL_CALL ONSSInitializer::getImplementationName() - throw (cssu::RuntimeException, std::exception) { return ONSSInitializer_getImplementationName(); } sal_Bool SAL_CALL ONSSInitializer::supportsService( const OUString& rServiceName ) - throw (cssu::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } cssu::Sequence< OUString > SAL_CALL ONSSInitializer::getSupportedServiceNames( ) - throw (cssu::RuntimeException, std::exception) { return ONSSInitializer_getSupportedServiceNames(); } diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx index d7fd1737bf3d..9e07b6eda444 100644 --- a/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx +++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx @@ -47,34 +47,28 @@ public: static bool initNSS( const css::uno::Reference< css::uno::XComponentContext > &rxContext ); /* XDigestContextSupplier */ - virtual css::uno::Reference< css::xml::crypto::XDigestContext > SAL_CALL getDigestContext( ::sal_Int32 nDigestID, const css::uno::Sequence< css::beans::NamedValue >& aParams ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::crypto::XDigestContext > SAL_CALL getDigestContext( ::sal_Int32 nDigestID, const css::uno::Sequence< css::beans::NamedValue >& aParams ) override; /* XCipherContextSupplier */ - virtual css::uno::Reference< css::xml::crypto::XCipherContext > SAL_CALL getCipherContext( ::sal_Int32 nCipherID, const css::uno::Sequence< ::sal_Int8 >& aKey, const css::uno::Sequence< ::sal_Int8 >& aInitializationVector, sal_Bool bEncryption, const css::uno::Sequence< css::beans::NamedValue >& aParams ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::crypto::XCipherContext > SAL_CALL getCipherContext( ::sal_Int32 nCipherID, const css::uno::Sequence< ::sal_Int8 >& aKey, const css::uno::Sequence< ::sal_Int8 >& aInitializationVector, sal_Bool bEncryption, const css::uno::Sequence< css::beans::NamedValue >& aParams ) override; /* XServiceInfo */ - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; /// @throws css::uno::RuntimeException -OUString ONSSInitializer_getImplementationName() - throw ( css::uno::RuntimeException ); +OUString ONSSInitializer_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL ONSSInitializer_getSupportedServiceNames() - throw ( css::uno::RuntimeException ); +css::uno::Sequence< OUString > SAL_CALL ONSSInitializer_getSupportedServiceNames(); /// @throws css::uno::Exception css::uno::Reference< css::uno::XInterface > -SAL_CALL ONSSInitializer_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) - throw ( css::uno::Exception ); +SAL_CALL ONSSInitializer_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ); #endif diff --git a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx index fc0e05e3ff1e..a1d4200214e5 100644 --- a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx @@ -58,7 +58,7 @@ namespace { } //Methods from XSanExtension -css::uno::Sequence< css::security::CertAltNameEntry > SAL_CALL SanExtensionImpl::getAlternativeNames() throw( css::uno::RuntimeException, std::exception ) +css::uno::Sequence< css::security::CertAltNameEntry > SAL_CALL SanExtensionImpl::getAlternativeNames() { if (m_Entries.empty()) { diff --git a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx index df81eee47408..3e2d85b739e4 100644 --- a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx @@ -43,17 +43,17 @@ class SanExtensionImpl : public ::cppu::WeakImplHelper< public: //Methods from XCertificateExtension - virtual sal_Bool SAL_CALL isCritical() throw( css::uno::RuntimeException, std::exception ) override + virtual sal_Bool SAL_CALL isCritical() override { return m_Extn.m_critical; } - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getExtensionId() throw( css::uno::RuntimeException, std::exception ) override + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getExtensionId() override { return m_Extn.m_xExtnId; } - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getExtensionValue() throw( css::uno::RuntimeException, std::exception ) override + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getExtensionValue() override { return m_Extn.m_xExtnValue; } @@ -65,7 +65,7 @@ class SanExtensionImpl : public ::cppu::WeakImplHelper< //Methods from XSanExtension - virtual css::uno::Sequence< css::security::CertAltNameEntry > SAL_CALL getAlternativeNames() throw( css::uno::RuntimeException, std::exception ) override ; + virtual css::uno::Sequence< css::security::CertAltNameEntry > SAL_CALL getAlternativeNames() override ; } ; #endif // INCLUDED_XMLSECURITY_SOURCE_XMLSEC_NSS_SANEXTENSION_NSSIMPL_HXX diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx index f5eb1d2ebfb5..769d183b17fe 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx @@ -142,12 +142,12 @@ SecurityEnvironment_NssImpl::~SecurityEnvironment_NssImpl() { } /* XServiceInfo */ -OUString SAL_CALL SecurityEnvironment_NssImpl::getImplementationName() throw( RuntimeException, std::exception ) { +OUString SAL_CALL SecurityEnvironment_NssImpl::getImplementationName() { return impl_getImplementationName() ; } /* XServiceInfo */ -sal_Bool SAL_CALL SecurityEnvironment_NssImpl::supportsService( const OUString& serviceName) throw( RuntimeException, std::exception ) { +sal_Bool SAL_CALL SecurityEnvironment_NssImpl::supportsService( const OUString& serviceName) { Sequence< OUString > seqServiceNames = getSupportedServiceNames() ; const OUString* pArray = seqServiceNames.getConstArray() ; for( sal_Int32 i = 0 ; i < seqServiceNames.getLength() ; i ++ ) { @@ -158,7 +158,7 @@ sal_Bool SAL_CALL SecurityEnvironment_NssImpl::supportsService( const OUString& } /* XServiceInfo */ -Sequence< OUString > SAL_CALL SecurityEnvironment_NssImpl::getSupportedServiceNames() throw( RuntimeException, std::exception ) { +Sequence< OUString > SAL_CALL SecurityEnvironment_NssImpl::getSupportedServiceNames() { return impl_getSupportedServiceNames() ; } @@ -169,12 +169,12 @@ Sequence< OUString > SecurityEnvironment_NssImpl::impl_getSupportedServiceNames( return seqServiceNames ; } -OUString SecurityEnvironment_NssImpl::impl_getImplementationName() throw( RuntimeException ) { +OUString SecurityEnvironment_NssImpl::impl_getImplementationName() { return OUString("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl") ; } //Helper for registry -Reference< XInterface > SAL_CALL SecurityEnvironment_NssImpl::impl_createInstance( const Reference< XMultiServiceFactory >& ) throw( RuntimeException ) { +Reference< XInterface > SAL_CALL SecurityEnvironment_NssImpl::impl_createInstance( const Reference< XMultiServiceFactory >& ) { return Reference< XInterface >( *new SecurityEnvironment_NssImpl ) ; } @@ -184,7 +184,6 @@ Reference< XSingleServiceFactory > SecurityEnvironment_NssImpl::impl_createFacto /* XUnoTunnel */ sal_Int64 SAL_CALL SecurityEnvironment_NssImpl::getSomething( const Sequence< sal_Int8 >& aIdentifier ) - throw( RuntimeException, std::exception ) { if( aIdentifier.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), aIdentifier.getConstArray(), 16 ) ) { return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_uIntPtr>(this)); @@ -203,7 +202,7 @@ const Sequence< sal_Int8>& SecurityEnvironment_NssImpl::getUnoTunnelId() { return theSecurityEnvironment_NssImplUnoTunnelId::get().getSeq(); } -OUString SecurityEnvironment_NssImpl::getSecurityEnvironmentInformation() throw( css::uno::RuntimeException, std::exception ) +OUString SecurityEnvironment_NssImpl::getSecurityEnvironmentInformation() { OUStringBuffer buff; for (CIT_SLOTS is = m_Slots.begin(); is != m_Slots.end(); is++) @@ -214,18 +213,18 @@ OUString SecurityEnvironment_NssImpl::getSecurityEnvironmentInformation() throw( return buff.makeStringAndClear(); } -void SecurityEnvironment_NssImpl::addCryptoSlot( PK11SlotInfo* aSlot) throw( Exception , RuntimeException ) +void SecurityEnvironment_NssImpl::addCryptoSlot( PK11SlotInfo* aSlot) { PK11_ReferenceSlot(aSlot); m_Slots.push_back(aSlot); } //Could we have multiple cert dbs? -void SecurityEnvironment_NssImpl::setCertDb( CERTCertDBHandle* aCertDb ) throw( Exception , RuntimeException ) { +void SecurityEnvironment_NssImpl::setCertDb( CERTCertDBHandle* aCertDb ) { m_pHandler = aCertDb ; } -void SecurityEnvironment_NssImpl::adoptSymKey( PK11SymKey* aSymKey ) throw( Exception , RuntimeException ) { +void SecurityEnvironment_NssImpl::adoptSymKey( PK11SymKey* aSymKey ) { std::list< PK11SymKey* >::iterator keyIt ; if( aSymKey != nullptr ) { @@ -248,7 +247,7 @@ void SecurityEnvironment_NssImpl::adoptSymKey( PK11SymKey* aSymKey ) throw( Exce } } -PK11SymKey* SecurityEnvironment_NssImpl::getSymKey( unsigned int position ) throw( Exception , RuntimeException ) { +PK11SymKey* SecurityEnvironment_NssImpl::getSymKey( unsigned int position ) { PK11SymKey* symkey ; std::list< PK11SymKey* >::iterator keyIt ; unsigned int pos ; @@ -262,7 +261,7 @@ PK11SymKey* SecurityEnvironment_NssImpl::getSymKey( unsigned int position ) thro return symkey ; } -SECKEYPublicKey* SecurityEnvironment_NssImpl::getPubKey( unsigned int position ) throw( Exception , RuntimeException ) { +SECKEYPublicKey* SecurityEnvironment_NssImpl::getPubKey( unsigned int position ) { SECKEYPublicKey* pubkey ; std::list< SECKEYPublicKey* >::iterator keyIt ; unsigned int pos ; @@ -276,7 +275,7 @@ SECKEYPublicKey* SecurityEnvironment_NssImpl::getPubKey( unsigned int position ) return pubkey ; } -SECKEYPrivateKey* SecurityEnvironment_NssImpl::getPriKey( unsigned int position ) throw( css::uno::Exception , css::uno::RuntimeException ) { +SECKEYPrivateKey* SecurityEnvironment_NssImpl::getPriKey( unsigned int position ) { SECKEYPrivateKey* prikey ; std::list< SECKEYPrivateKey* >::iterator keyIt ; unsigned int pos ; @@ -346,7 +345,7 @@ void SecurityEnvironment_NssImpl::updateSlots() } Sequence< Reference < XCertificate > > -SecurityEnvironment_NssImpl::getPersonalCertificates() throw( SecurityException , RuntimeException, std::exception ) +SecurityEnvironment_NssImpl::getPersonalCertificates() { sal_Int32 length ; X509Certificate_NssImpl* xcert ; @@ -413,7 +412,7 @@ SecurityEnvironment_NssImpl::getPersonalCertificates() throw( SecurityException return Sequence< Reference < XCertificate > > (); } -Reference< XCertificate > SecurityEnvironment_NssImpl::getCertificate( const OUString& issuerName, const Sequence< sal_Int8 >& serialNumber ) throw( SecurityException , RuntimeException, std::exception ) +Reference< XCertificate > SecurityEnvironment_NssImpl::getCertificate( const OUString& issuerName, const Sequence< sal_Int8 >& serialNumber ) { X509Certificate_NssImpl* xcert = nullptr; @@ -474,7 +473,7 @@ Reference< XCertificate > SecurityEnvironment_NssImpl::getCertificate( const OUS return xcert ; } -Sequence< Reference < XCertificate > > SecurityEnvironment_NssImpl::buildCertificatePath( const Reference< XCertificate >& begin ) throw( SecurityException , RuntimeException, std::exception ) { +Sequence< Reference < XCertificate > > SecurityEnvironment_NssImpl::buildCertificatePath( const Reference< XCertificate >& begin ) { const X509Certificate_NssImpl* xcert ; const CERTCertificate* cert ; CERTCertList* certChain ; @@ -530,7 +529,7 @@ Sequence< Reference < XCertificate > > SecurityEnvironment_NssImpl::buildCertifi return Sequence< Reference < XCertificate > >(); } -Reference< XCertificate > SecurityEnvironment_NssImpl::createCertificateFromRaw( const Sequence< sal_Int8 >& rawCertificate ) throw( SecurityException , RuntimeException, std::exception ) { +Reference< XCertificate > SecurityEnvironment_NssImpl::createCertificateFromRaw( const Sequence< sal_Int8 >& rawCertificate ) { X509Certificate_NssImpl* xcert ; if( rawCertificate.getLength() > 0 ) { @@ -546,7 +545,7 @@ Reference< XCertificate > SecurityEnvironment_NssImpl::createCertificateFromRaw( return xcert ; } -Reference< XCertificate > SecurityEnvironment_NssImpl::createCertificateFromAscii( const OUString& asciiCertificate ) throw( SecurityException , RuntimeException, std::exception ) +Reference< XCertificate > SecurityEnvironment_NssImpl::createCertificateFromAscii( const OUString& asciiCertificate ) { OString oscert = OUStringToOString( asciiCertificate , RTL_TEXTENCODING_ASCII_US ) ; xmlChar* chCert = xmlStrndup( reinterpret_cast<const xmlChar*>(oscert.getStr()), ( int )oscert.getLength() ) ; @@ -570,7 +569,6 @@ Reference< XCertificate > SecurityEnvironment_NssImpl::createCertificateFromAsci sal_Int32 SecurityEnvironment_NssImpl :: verifyCertificate( const Reference< csss::XCertificate >& aCert, const Sequence< Reference< csss::XCertificate > >& intermediateCerts ) - throw( css::uno::SecurityException, css::uno::RuntimeException, std::exception ) { sal_Int32 validity = csss::CertificateValidity::INVALID; const X509Certificate_NssImpl* xcert ; @@ -795,7 +793,7 @@ verifyCertificate( const Reference< csss::XCertificate >& aCert, } sal_Int32 SecurityEnvironment_NssImpl::getCertificateCharacters( - const css::uno::Reference< css::security::XCertificate >& aCert ) throw( css::uno::SecurityException, css::uno::RuntimeException, std::exception ) { + const css::uno::Reference< css::security::XCertificate >& aCert ) { sal_Int32 characters ; const X509Certificate_NssImpl* xcert ; const CERTCertificate* cert ; @@ -896,7 +894,7 @@ X509Certificate_NssImpl* NssPrivKeyToXCert( SECKEYPrivateKey* priKey ) /* Native methods */ -xmlSecKeysMngrPtr SecurityEnvironment_NssImpl::createKeysManager() throw( Exception, RuntimeException ) { +xmlSecKeysMngrPtr SecurityEnvironment_NssImpl::createKeysManager() { unsigned int i ; CERTCertDBHandle* handler = nullptr ; @@ -950,7 +948,7 @@ xmlSecKeysMngrPtr SecurityEnvironment_NssImpl::createKeysManager() throw( Except } return pKeysMngr ; } -void SecurityEnvironment_NssImpl::destroyKeysManager(xmlSecKeysMngrPtr pKeysMngr) throw( Exception, RuntimeException ) { +void SecurityEnvironment_NssImpl::destroyKeysManager(xmlSecKeysMngrPtr pKeysMngr) { if( pKeysMngr != nullptr ) { xmlSecKeysMngrDestroy( pKeysMngr ) ; } diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx index 117d599c34e4..5b0e8920abd2 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx @@ -69,23 +69,23 @@ private: //Methods from XSecurityEnvironment //Methods from XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override ; + virtual OUString SAL_CALL getImplementationName() override ; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName - ) throw( css::uno::RuntimeException, std::exception ) override ; + ) override ; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override ; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override ; //Helper for XServiceInfo static css::uno::Sequence< OUString > impl_getSupportedServiceNames() ; /// @throws css::uno::RuntimeException - static OUString impl_getImplementationName() throw( css::uno::RuntimeException ) ; + static OUString impl_getImplementationName() ; //Helper for registry /// @throws css::uno::RuntimeException - static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) throw( css::uno::RuntimeException ) ; + static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ; static css::uno::Reference< css::lang::XSingleServiceFactory > impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ; @@ -94,61 +94,59 @@ private: css::security::XCertificate >& xCert, const css::uno::Sequence< css::uno::Reference< css::security::XCertificate > > & - intermediateCerts) - throw (css::uno::SecurityException, css::uno::RuntimeException, std::exception) override ; + intermediateCerts) override ; - virtual ::sal_Int32 SAL_CALL getCertificateCharacters( const css::uno::Reference< css::security::XCertificate >& xCert ) throw (css::uno::SecurityException, css::uno::RuntimeException, std::exception) override ; + virtual ::sal_Int32 SAL_CALL getCertificateCharacters( const css::uno::Reference< css::security::XCertificate >& xCert ) override ; - virtual OUString SAL_CALL getSecurityEnvironmentInformation( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getSecurityEnvironmentInformation( ) override; //Methods from XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId() ; /// @throws css::uno::Exception /// @throws css::uno::RuntimeException - void setCertDb( CERTCertDBHandle* aCertDb ) throw( css::uno::Exception , css::uno::RuntimeException ) ; + void setCertDb( CERTCertDBHandle* aCertDb ) ; /// @throws css::uno::Exception /// @throws css::uno::RuntimeException - void adoptSymKey( PK11SymKey* aSymKey ) throw( css::uno::Exception , css::uno::RuntimeException ) ; + void adoptSymKey( PK11SymKey* aSymKey ) ; /// @throws css::uno::Exception /// @throws css::uno::RuntimeException - PK11SymKey* getSymKey( unsigned int position ) throw( css::uno::Exception , css::uno::RuntimeException ) ; + PK11SymKey* getSymKey( unsigned int position ) ; /// @throws css::uno::Exception /// @throws css::uno::RuntimeException - SECKEYPublicKey* getPubKey( unsigned int position ) throw( css::uno::Exception , css::uno::RuntimeException ) ; + SECKEYPublicKey* getPubKey( unsigned int position ) ; /// @throws css::uno::Exception /// @throws css::uno::RuntimeException - SECKEYPrivateKey* getPriKey( unsigned int position ) throw( css::uno::Exception , css::uno::RuntimeException ) ; + SECKEYPrivateKey* getPriKey( unsigned int position ) ; - virtual css::uno::Sequence< css::uno::Reference< css::security::XCertificate > > SAL_CALL getPersonalCertificates() throw( css::uno::SecurityException , css::uno::RuntimeException, std::exception ) override ; + virtual css::uno::Sequence< css::uno::Reference< css::security::XCertificate > > SAL_CALL getPersonalCertificates() override ; - virtual css::uno::Reference< css::security::XCertificate > SAL_CALL getCertificate( const OUString& issuerName, const css::uno::Sequence< sal_Int8 >& serialNumber ) throw( css::uno::SecurityException , css::uno::RuntimeException, std::exception ) override ; + virtual css::uno::Reference< css::security::XCertificate > SAL_CALL getCertificate( const OUString& issuerName, const css::uno::Sequence< sal_Int8 >& serialNumber ) override ; - virtual css::uno::Sequence< css::uno::Reference< css::security::XCertificate > > SAL_CALL buildCertificatePath( const css::uno::Reference< css::security::XCertificate >& beginCert ) throw( css::uno::SecurityException , css::uno::RuntimeException, std::exception ) override ; + virtual css::uno::Sequence< css::uno::Reference< css::security::XCertificate > > SAL_CALL buildCertificatePath( const css::uno::Reference< css::security::XCertificate >& beginCert ) override ; - virtual css::uno::Reference< css::security::XCertificate > SAL_CALL createCertificateFromRaw( const css::uno::Sequence< sal_Int8 >& rawCertificate ) throw( css::uno::SecurityException , css::uno::RuntimeException, std::exception ) override ; - virtual css::uno::Reference< css::security::XCertificate > SAL_CALL createCertificateFromAscii( const OUString& asciiCertificate ) throw( css::uno::SecurityException , css::uno::RuntimeException, std::exception ) override ; + virtual css::uno::Reference< css::security::XCertificate > SAL_CALL createCertificateFromRaw( const css::uno::Sequence< sal_Int8 >& rawCertificate ) override ; + virtual css::uno::Reference< css::security::XCertificate > SAL_CALL createCertificateFromAscii( const OUString& asciiCertificate ) override ; //Native methods /// @throws css::uno::RuntimeException - xmlSecKeysMngrPtr createKeysManager() throw( css::uno::Exception , css::uno::RuntimeException ) ; + xmlSecKeysMngrPtr createKeysManager() ; /// @throws css::uno::Exception /// @throws css::uno::RuntimeException - static void destroyKeysManager(xmlSecKeysMngrPtr pKeysMngr) throw( css::uno::Exception , css::uno::RuntimeException ) ; + static void destroyKeysManager(xmlSecKeysMngrPtr pKeysMngr) ; private: void updateSlots(); /// @throws css::uno::Exception /// @throws css::uno::RuntimeException - void addCryptoSlot( PK11SlotInfo* aSlot ) throw( css::uno::Exception , css::uno::RuntimeException ) ; + void addCryptoSlot( PK11SlotInfo* aSlot ) ; } ; #endif // INCLUDED_XMLSECURITY_SOURCE_XMLSEC_NSS_SECURITYENVIRONMENT_NSSIMPL_HXX diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx index 012106c41c05..a45f34ee9714 100644 --- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx @@ -64,7 +64,6 @@ SEInitializer_NssImpl::~SEInitializer_NssImpl() /* XSEInitializer */ uno::Reference< cssxc::XXMLSecurityContext > SAL_CALL SEInitializer_NssImpl::createSecurityContext( const OUString& ) - throw (uno::RuntimeException, std::exception) { CERTCertDBHandle *pCertHandle = nullptr ; @@ -99,7 +98,6 @@ uno::Reference< cssxc::XXMLSecurityContext > SAL_CALL } void SAL_CALL SEInitializer_NssImpl::freeSecurityContext( const uno::Reference< cssxc::XXMLSecurityContext >& ) - throw (uno::RuntimeException, std::exception) { /* * because the security context will free all its content when it @@ -111,13 +109,11 @@ void SAL_CALL SEInitializer_NssImpl::freeSecurityContext( const uno::Reference< } OUString SEInitializer_NssImpl_getImplementationName () - throw (uno::RuntimeException) { return OUString ("com.sun.star.xml.security.bridge.xmlsec.SEInitializer_NssImpl" ); } uno::Sequence< OUString > SAL_CALL SEInitializer_NssImpl_getSupportedServiceNames( ) - throw (uno::RuntimeException) { uno::Sequence < OUString > aRet(2); OUString* pArray = aRet.getArray(); @@ -127,24 +123,20 @@ uno::Sequence< OUString > SAL_CALL SEInitializer_NssImpl_getSupportedServiceName } uno::Reference< uno::XInterface > SAL_CALL SEInitializer_NssImpl_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rxMSF) - throw( uno::Exception ) { return static_cast<cppu::OWeakObject*>(new SEInitializer_NssImpl(comphelper::getComponentContext(rxMSF))); } /* XServiceInfo */ OUString SAL_CALL SEInitializer_NssImpl::getImplementationName( ) - throw (uno::RuntimeException, std::exception) { return SEInitializer_NssImpl_getImplementationName(); } sal_Bool SAL_CALL SEInitializer_NssImpl::supportsService( const OUString& rServiceName ) - throw (uno::RuntimeException, std::exception) { return cppu::supportsService( this, rServiceName ); } uno::Sequence< OUString > SAL_CALL SEInitializer_NssImpl::getSupportedServiceNames( ) - throw (uno::RuntimeException, std::exception) { return SEInitializer_NssImpl_getSupportedServiceNames(); } diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx index 6b051315cb93..29335e780bb4 100644 --- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx @@ -41,36 +41,28 @@ public: /* XSEInitializer */ virtual css::uno::Reference< css::xml::crypto::XXMLSecurityContext > - SAL_CALL createSecurityContext( const OUString& ) - throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL createSecurityContext( const OUString& ) override; virtual void SAL_CALL freeSecurityContext( const css::uno::Reference< - css::xml::crypto::XXMLSecurityContext >& securityContext ) - throw (css::uno::RuntimeException, std::exception) override; + css::xml::crypto::XXMLSecurityContext >& securityContext ) override; /* XServiceInfo */ - virtual OUString SAL_CALL getImplementationName( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; /// @throws css::uno::RuntimeException -OUString SEInitializer_NssImpl_getImplementationName() - throw ( css::uno::RuntimeException ); +OUString SEInitializer_NssImpl_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL SEInitializer_NssImpl_getSupportedServiceNames( ) - throw ( css::uno::RuntimeException ); +css::uno::Sequence< OUString > SAL_CALL SEInitializer_NssImpl_getSupportedServiceNames( ); /// @throws css::uno::Exception css::uno::Reference< css::uno::XInterface > -SAL_CALL SEInitializer_NssImpl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rxMSF) - throw ( css::uno::Exception ); +SAL_CALL SEInitializer_NssImpl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rxMSF); #endif diff --git a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx index be930a222b3e..00582e4cf307 100644 --- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx @@ -55,7 +55,7 @@ X509Certificate_NssImpl::~X509Certificate_NssImpl() { } //Methods from XCertificate -sal_Int16 SAL_CALL X509Certificate_NssImpl::getVersion() throw ( css::uno::RuntimeException, std::exception) { +sal_Int16 SAL_CALL X509Certificate_NssImpl::getVersion() { if( m_pCert != nullptr ) { if( m_pCert->version.len > 0 ) { return ( char )*( m_pCert->version.data ) ; @@ -66,7 +66,7 @@ sal_Int16 SAL_CALL X509Certificate_NssImpl::getVersion() throw ( css::uno::Runti } } -css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getSerialNumber() throw ( css::uno::RuntimeException, std::exception) { +css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getSerialNumber() { if( m_pCert != nullptr && m_pCert->serialNumber.len > 0 ) { Sequence< sal_Int8 > serial( m_pCert->serialNumber.len ) ; for( unsigned int i = 0 ; i < m_pCert->serialNumber.len ; i ++ ) @@ -78,7 +78,7 @@ css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getSerialNumber } } -OUString SAL_CALL X509Certificate_NssImpl::getIssuerName() throw ( css::uno::RuntimeException, std::exception) { +OUString SAL_CALL X509Certificate_NssImpl::getIssuerName() { if( m_pCert != nullptr ) { return OUString(m_pCert->issuerName , PL_strlen(m_pCert->issuerName) , RTL_TEXTENCODING_UTF8) ; } else { @@ -86,7 +86,7 @@ OUString SAL_CALL X509Certificate_NssImpl::getIssuerName() throw ( css::uno::Run } } -OUString SAL_CALL X509Certificate_NssImpl::getSubjectName() throw ( css::uno::RuntimeException, std::exception) { +OUString SAL_CALL X509Certificate_NssImpl::getSubjectName() { if( m_pCert != nullptr ) { return OUString(m_pCert->subjectName , PL_strlen(m_pCert->subjectName) , RTL_TEXTENCODING_UTF8); } else { @@ -94,7 +94,7 @@ OUString SAL_CALL X509Certificate_NssImpl::getSubjectName() throw ( css::uno::Ru } } -css::util::DateTime SAL_CALL X509Certificate_NssImpl::getNotValidBefore() throw ( css::uno::RuntimeException, std::exception) { +css::util::DateTime SAL_CALL X509Certificate_NssImpl::getNotValidBefore() { if( m_pCert != nullptr ) { SECStatus rv ; PRTime notBefore ; @@ -123,7 +123,7 @@ css::util::DateTime SAL_CALL X509Certificate_NssImpl::getNotValidBefore() throw } } -css::util::DateTime SAL_CALL X509Certificate_NssImpl::getNotValidAfter() throw ( css::uno::RuntimeException, std::exception) { +css::util::DateTime SAL_CALL X509Certificate_NssImpl::getNotValidAfter() { if( m_pCert != nullptr ) { SECStatus rv ; PRTime notAfter ; @@ -152,7 +152,7 @@ css::util::DateTime SAL_CALL X509Certificate_NssImpl::getNotValidAfter() throw ( } } -css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getIssuerUniqueID() throw ( css::uno::RuntimeException, std::exception) { +css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getIssuerUniqueID() { if( m_pCert != nullptr && m_pCert->issuerID.len > 0 ) { Sequence< sal_Int8 > issuerUid( m_pCert->issuerID.len ) ; for( unsigned int i = 0 ; i < m_pCert->issuerID.len ; i ++ ) @@ -164,7 +164,7 @@ css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getIssuerUnique } } -css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getSubjectUniqueID() throw ( css::uno::RuntimeException, std::exception) { +css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getSubjectUniqueID() { if( m_pCert != nullptr && m_pCert->subjectID.len > 0 ) { Sequence< sal_Int8 > subjectUid( m_pCert->subjectID.len ) ; for( unsigned int i = 0 ; i < m_pCert->subjectID.len ; i ++ ) @@ -176,7 +176,7 @@ css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getSubjectUniqu } } -css::uno::Sequence< css::uno::Reference< css::security::XCertificateExtension > > SAL_CALL X509Certificate_NssImpl::getExtensions() throw ( css::uno::RuntimeException, std::exception) { +css::uno::Sequence< css::uno::Reference< css::security::XCertificateExtension > > SAL_CALL X509Certificate_NssImpl::getExtensions() { if( m_pCert != nullptr && m_pCert->extensions != nullptr ) { CERTCertExtension** extns ; int len ; @@ -227,7 +227,7 @@ css::uno::Sequence< css::uno::Reference< css::security::XCertificateExtension > } } -css::uno::Reference< css::security::XCertificateExtension > SAL_CALL X509Certificate_NssImpl::findCertificateExtension( const css::uno::Sequence< sal_Int8 >& oid ) throw (css::uno::RuntimeException, std::exception) { +css::uno::Reference< css::security::XCertificateExtension > SAL_CALL X509Certificate_NssImpl::findCertificateExtension( const css::uno::Sequence< sal_Int8 >& oid ) { if( m_pCert != nullptr && m_pCert->extensions != nullptr ) { CERTCertExtension** extns ; SECItem idItem ; @@ -277,7 +277,7 @@ css::uno::Reference< css::security::XCertificateExtension > SAL_CALL X509Certifi } -css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getEncoded() throw ( css::uno::RuntimeException, std::exception) { +css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getEncoded() { if( m_pCert != nullptr && m_pCert->derCert.len > 0 ) { Sequence< sal_Int8 > rawCert( m_pCert->derCert.len ) ; @@ -310,7 +310,7 @@ const CERTCertificate* X509Certificate_NssImpl::getNssCert() const { } } -void X509Certificate_NssImpl::setRawCert( const Sequence< sal_Int8 >& rawCert ) throw ( css::uno::RuntimeException) { +void X509Certificate_NssImpl::setRawCert( const Sequence< sal_Int8 >& rawCert ) { CERTCertificate* cert ; SECItem certItem ; @@ -330,7 +330,7 @@ void X509Certificate_NssImpl::setRawCert( const Sequence< sal_Int8 >& rawCert ) } /* XUnoTunnel */ -sal_Int64 SAL_CALL X509Certificate_NssImpl::getSomething( const Sequence< sal_Int8 >& aIdentifier ) throw( RuntimeException, std::exception ) { +sal_Int64 SAL_CALL X509Certificate_NssImpl::getSomething( const Sequence< sal_Int8 >& aIdentifier ) { if( aIdentifier.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), aIdentifier.getConstArray(), 16 ) ) { return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_uIntPtr>(this)); } @@ -395,7 +395,6 @@ css::uno::Sequence< sal_Int8 > getThumbprint(CERTCertificate *pCert, SECOidTag i } OUString SAL_CALL X509Certificate_NssImpl::getSubjectPublicKeyAlgorithm() - throw ( css::uno::RuntimeException, std::exception) { if( m_pCert != nullptr ) { @@ -408,7 +407,6 @@ OUString SAL_CALL X509Certificate_NssImpl::getSubjectPublicKeyAlgorithm() } css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getSubjectPublicKeyValue() - throw ( css::uno::RuntimeException, std::exception) { if( m_pCert != nullptr ) { @@ -431,7 +429,6 @@ css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getSubjectPubli } OUString SAL_CALL X509Certificate_NssImpl::getSignatureAlgorithm() - throw ( css::uno::RuntimeException, std::exception) { if( m_pCert != nullptr ) { @@ -444,24 +441,21 @@ OUString SAL_CALL X509Certificate_NssImpl::getSignatureAlgorithm() } css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getSHA1Thumbprint() - throw ( css::uno::RuntimeException, std::exception) { return getThumbprint(m_pCert, SEC_OID_SHA1); } -uno::Sequence<sal_Int8> X509Certificate_NssImpl::getSHA256Thumbprint() throw (uno::RuntimeException, std::exception) +uno::Sequence<sal_Int8> X509Certificate_NssImpl::getSHA256Thumbprint() { return getThumbprint(m_pCert, SEC_OID_SHA256); } css::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getMD5Thumbprint() - throw ( css::uno::RuntimeException, std::exception) { return getThumbprint(m_pCert, SEC_OID_MD5); } sal_Int32 SAL_CALL X509Certificate_NssImpl::getCertificateUsage( ) - throw ( css::uno::RuntimeException, std::exception) { SECStatus rv; SECItem tmpitem; diff --git a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx index 8c9e6ab502c8..08e9cf1185e7 100644 --- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx @@ -44,47 +44,42 @@ class X509Certificate_NssImpl : public ::cppu::WeakImplHelper< virtual ~X509Certificate_NssImpl() override ; //Methods from XCertificate - virtual sal_Int16 SAL_CALL getVersion( ) throw ( css::uno::RuntimeException, std::exception) override ; + virtual sal_Int16 SAL_CALL getVersion( ) override ; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSerialNumber( ) throw ( css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSerialNumber( ) override ; - virtual OUString SAL_CALL getIssuerName( ) throw ( css::uno::RuntimeException, std::exception) override ; - virtual OUString SAL_CALL getSubjectName( ) throw ( css::uno::RuntimeException, std::exception) override ; + virtual OUString SAL_CALL getIssuerName( ) override ; + virtual OUString SAL_CALL getSubjectName( ) override ; - virtual css::util::DateTime SAL_CALL getNotValidBefore( ) throw ( css::uno::RuntimeException, std::exception) override ; - virtual css::util::DateTime SAL_CALL getNotValidAfter( ) throw ( css::uno::RuntimeException, std::exception) override ; + virtual css::util::DateTime SAL_CALL getNotValidBefore( ) override ; + virtual css::util::DateTime SAL_CALL getNotValidAfter( ) override ; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getIssuerUniqueID( ) throw ( css::uno::RuntimeException, std::exception) override ; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSubjectUniqueID( ) throw ( css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getIssuerUniqueID( ) override ; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSubjectUniqueID( ) override ; - virtual css::uno::Sequence< css::uno::Reference< css::security::XCertificateExtension > > SAL_CALL getExtensions( ) throw ( css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Sequence< css::uno::Reference< css::security::XCertificateExtension > > SAL_CALL getExtensions( ) override ; - virtual css::uno::Reference< css::security::XCertificateExtension > SAL_CALL findCertificateExtension( const css::uno::Sequence< sal_Int8 >& oid ) throw (css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Reference< css::security::XCertificateExtension > SAL_CALL findCertificateExtension( const css::uno::Sequence< sal_Int8 >& oid ) override ; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getEncoded( ) throw ( css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getEncoded( ) override ; - virtual OUString SAL_CALL getSubjectPublicKeyAlgorithm() - throw ( css::uno::RuntimeException, std::exception) override ; + virtual OUString SAL_CALL getSubjectPublicKeyAlgorithm() override ; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSubjectPublicKeyValue() - throw ( css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSubjectPublicKeyValue() override ; - virtual OUString SAL_CALL getSignatureAlgorithm() - throw ( css::uno::RuntimeException, std::exception) override ; + virtual OUString SAL_CALL getSignatureAlgorithm() override ; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSHA1Thumbprint() - throw ( css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSHA1Thumbprint() override ; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getMD5Thumbprint() - throw ( css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getMD5Thumbprint() override ; - virtual sal_Int32 SAL_CALL getCertificateUsage( ) throw ( css::uno::RuntimeException, std::exception) override ; + virtual sal_Int32 SAL_CALL getCertificateUsage( ) override ; //Methods from XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; /// @see xmlsecurity::Certificate::getSHA256Thumbprint(). - virtual css::uno::Sequence<sal_Int8> getSHA256Thumbprint() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<sal_Int8> getSHA256Thumbprint() override; static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId() ; @@ -92,7 +87,7 @@ class X509Certificate_NssImpl : public ::cppu::WeakImplHelper< void setCert( CERTCertificate* cert ) ; const CERTCertificate* getNssCert() const ; /// @throws css::uno::RuntimeException - void setRawCert( const css::uno::Sequence< sal_Int8 >& rawCert ) throw ( css::uno::RuntimeException) ; + void setRawCert( const css::uno::Sequence< sal_Int8 >& rawCert ) ; } ; #endif // INCLUDED_XMLSECURITY_SOURCE_XMLSEC_NSS_X509CERTIFICATE_NSSIMPL_HXX diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx index 5f65cc37aaee..ccfb78098bda 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx @@ -54,9 +54,7 @@ Reference< XXMLEncryptionTemplate > SAL_CALL XMLEncryption_NssImpl::encrypt( const Reference< XXMLEncryptionTemplate >& aTemplate , const Reference< XSecurityEnvironment >& aEnvironment -) throw (css::xml::crypto::XMLEncryptionException, - css::uno::SecurityException, - css::uno::RuntimeException, std::exception) +) { xmlSecKeysMngrPtr pMngr = nullptr ; xmlSecEncCtxPtr pEncCtx = nullptr ; @@ -193,9 +191,7 @@ Reference< XXMLEncryptionTemplate > SAL_CALL XMLEncryption_NssImpl::decrypt( const Reference< XXMLEncryptionTemplate >& aTemplate , const Reference< XXMLSecurityContext >& aSecurityCtx -) throw (css::xml::crypto::XMLEncryptionException , - css::uno::SecurityException, - css::uno::RuntimeException, std::exception) +) { xmlSecKeysMngrPtr pMngr = nullptr ; xmlSecEncCtxPtr pEncCtx = nullptr ; @@ -310,12 +306,12 @@ SAL_CALL XMLEncryption_NssImpl::decrypt( } /* XServiceInfo */ -OUString SAL_CALL XMLEncryption_NssImpl::getImplementationName() throw( RuntimeException, std::exception ) { +OUString SAL_CALL XMLEncryption_NssImpl::getImplementationName() { return impl_getImplementationName() ; } /* XServiceInfo */ -sal_Bool SAL_CALL XMLEncryption_NssImpl::supportsService( const OUString& serviceName) throw( RuntimeException, std::exception ) { +sal_Bool SAL_CALL XMLEncryption_NssImpl::supportsService( const OUString& serviceName) { Sequence< OUString > seqServiceNames = getSupportedServiceNames() ; const OUString* pArray = seqServiceNames.getConstArray() ; for( sal_Int32 i = 0 ; i < seqServiceNames.getLength() ; i ++ ) { @@ -326,7 +322,7 @@ sal_Bool SAL_CALL XMLEncryption_NssImpl::supportsService( const OUString& servic } /* XServiceInfo */ -Sequence< OUString > SAL_CALL XMLEncryption_NssImpl::getSupportedServiceNames() throw( RuntimeException, std::exception ) { +Sequence< OUString > SAL_CALL XMLEncryption_NssImpl::getSupportedServiceNames() { return impl_getSupportedServiceNames() ; } @@ -337,12 +333,12 @@ Sequence< OUString > XMLEncryption_NssImpl::impl_getSupportedServiceNames() { return seqServiceNames ; } -OUString XMLEncryption_NssImpl::impl_getImplementationName() throw( RuntimeException ) { +OUString XMLEncryption_NssImpl::impl_getImplementationName() { return OUString("com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_NssImpl") ; } //Helper for registry -Reference< XInterface > SAL_CALL XMLEncryption_NssImpl::impl_createInstance( const Reference< XMultiServiceFactory >& ) throw( RuntimeException ) { +Reference< XInterface > SAL_CALL XMLEncryption_NssImpl::impl_createInstance( const Reference< XMultiServiceFactory >& ) { return Reference< XInterface >( *new XMLEncryption_NssImpl ) ; } diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx index 37d66f6b1dd1..276a4c5c0350 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx @@ -47,35 +47,31 @@ class XMLEncryption_NssImpl : public ::cppu::WeakImplHelper< const css::uno::Reference< css::xml::crypto::XXMLEncryptionTemplate >& aTemplate , const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& aEnvironment) // ) throw( css::uno::Exception , css::uno::RuntimeException ) ; - throw (css::xml::crypto::XMLEncryptionException , - css::uno::SecurityException, - css::uno::RuntimeException, std::exception) override; + override; virtual css::uno::Reference< css::xml::crypto::XXMLEncryptionTemplate > SAL_CALL decrypt( const css::uno::Reference< css::xml::crypto::XXMLEncryptionTemplate >& aTemplate , const css::uno::Reference< css::xml::crypto::XXMLSecurityContext >& aContext - ) throw (css::xml::crypto::XMLEncryptionException , - css::uno::SecurityException, - css::uno::RuntimeException, std::exception) override; + ) override; //Methods from XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override ; + virtual OUString SAL_CALL getImplementationName() override ; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName - ) throw( css::uno::RuntimeException, std::exception ) override ; + ) override ; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override ; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override ; //Helper for XServiceInfo static css::uno::Sequence< OUString > impl_getSupportedServiceNames() ; /// @throws css::uno::RuntimeException - static OUString impl_getImplementationName() throw( css::uno::RuntimeException ) ; + static OUString impl_getImplementationName() ; //Helper for registry /// @throws css::uno::RuntimeException - static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) throw( css::uno::RuntimeException ) ; + static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ; static css::uno::Reference< css::lang::XSingleServiceFactory > impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ; } ; diff --git a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx index 8e51babf6a08..6cf908545fa2 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx @@ -65,7 +65,6 @@ XMLSecurityContext_NssImpl::~XMLSecurityContext_NssImpl() sal_Int32 SAL_CALL XMLSecurityContext_NssImpl::addSecurityEnvironment( const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& aSecurityEnvironment) - throw (css::security::SecurityInfrastructureException, css::uno::RuntimeException, std::exception) { if( !aSecurityEnvironment.is() ) { @@ -79,14 +78,12 @@ sal_Int32 SAL_CALL XMLSecurityContext_NssImpl::addSecurityEnvironment( sal_Int32 SAL_CALL XMLSecurityContext_NssImpl::getSecurityEnvironmentNumber( ) - throw (css::uno::RuntimeException, std::exception) { return m_vSecurityEnvironments.size(); } css::uno::Reference< css::xml::crypto::XSecurityEnvironment > SAL_CALL XMLSecurityContext_NssImpl::getSecurityEnvironmentByIndex( sal_Int32 index ) - throw (css::uno::RuntimeException, std::exception) { css::uno::Reference< css::xml::crypto::XSecurityEnvironment > xSecurityEnvironment; @@ -102,7 +99,6 @@ css::uno::Reference< css::xml::crypto::XSecurityEnvironment > SAL_CALL css::uno::Reference< css::xml::crypto::XSecurityEnvironment > SAL_CALL XMLSecurityContext_NssImpl::getSecurityEnvironment( ) - throw (css::uno::RuntimeException, std::exception) { if (m_nDefaultEnvIndex >= 0 && m_nDefaultEnvIndex < ( sal_Int32 )m_vSecurityEnvironments.size()) return getSecurityEnvironmentByIndex(m_nDefaultEnvIndex); @@ -111,24 +107,22 @@ css::uno::Reference< css::xml::crypto::XSecurityEnvironment > SAL_CALL } sal_Int32 SAL_CALL XMLSecurityContext_NssImpl::getDefaultSecurityEnvironmentIndex( ) - throw (css::uno::RuntimeException, std::exception) { return m_nDefaultEnvIndex ; } void SAL_CALL XMLSecurityContext_NssImpl::setDefaultSecurityEnvironmentIndex( sal_Int32 nDefaultEnvIndex ) - throw (css::uno::RuntimeException, std::exception) { m_nDefaultEnvIndex = nDefaultEnvIndex; } /* XServiceInfo */ -OUString SAL_CALL XMLSecurityContext_NssImpl::getImplementationName() throw( RuntimeException, std::exception ) { +OUString SAL_CALL XMLSecurityContext_NssImpl::getImplementationName() { return impl_getImplementationName() ; } /* XServiceInfo */ -sal_Bool SAL_CALL XMLSecurityContext_NssImpl::supportsService( const OUString& serviceName) throw( RuntimeException, std::exception ) { +sal_Bool SAL_CALL XMLSecurityContext_NssImpl::supportsService( const OUString& serviceName) { Sequence< OUString > seqServiceNames = getSupportedServiceNames() ; const OUString* pArray = seqServiceNames.getConstArray() ; for( sal_Int32 i = 0 ; i < seqServiceNames.getLength() ; i ++ ) { @@ -139,7 +133,7 @@ sal_Bool SAL_CALL XMLSecurityContext_NssImpl::supportsService( const OUString& s } /* XServiceInfo */ -Sequence< OUString > SAL_CALL XMLSecurityContext_NssImpl::getSupportedServiceNames() throw( RuntimeException, std::exception ) { +Sequence< OUString > SAL_CALL XMLSecurityContext_NssImpl::getSupportedServiceNames() { return impl_getSupportedServiceNames() ; } @@ -150,12 +144,12 @@ Sequence< OUString > XMLSecurityContext_NssImpl::impl_getSupportedServiceNames() return seqServiceNames ; } -OUString XMLSecurityContext_NssImpl::impl_getImplementationName() throw( RuntimeException ) { +OUString XMLSecurityContext_NssImpl::impl_getImplementationName() { return OUString("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl") ; } //Helper for registry -Reference< XInterface > SAL_CALL XMLSecurityContext_NssImpl::impl_createInstance( const Reference< XMultiServiceFactory >& ) throw( RuntimeException ) { +Reference< XInterface > SAL_CALL XMLSecurityContext_NssImpl::impl_createInstance( const Reference< XMultiServiceFactory >& ) { return Reference< XInterface >( *new XMLSecurityContext_NssImpl ) ; } diff --git a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx index 52db8b1e9517..3d611424a9f3 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx @@ -52,45 +52,40 @@ class XMLSecurityContext_NssImpl : public ::cppu::WeakImplHelper< //Methods from XXMLSecurityContext virtual sal_Int32 SAL_CALL addSecurityEnvironment( const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& aSecurityEnvironment - ) throw (css::security::SecurityInfrastructureException, css::uno::RuntimeException, std::exception) override; + ) override; - virtual ::sal_Int32 SAL_CALL getSecurityEnvironmentNumber( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getSecurityEnvironmentNumber( ) override; virtual css::uno::Reference< css::xml::crypto::XSecurityEnvironment > SAL_CALL - getSecurityEnvironmentByIndex( ::sal_Int32 index ) - throw (css::uno::RuntimeException, std::exception) override; + getSecurityEnvironmentByIndex( ::sal_Int32 index ) override; virtual css::uno::Reference< css::xml::crypto::XSecurityEnvironment > SAL_CALL - getSecurityEnvironment( ) - throw (css::uno::RuntimeException, std::exception) override; + getSecurityEnvironment( ) override; - virtual ::sal_Int32 SAL_CALL getDefaultSecurityEnvironmentIndex( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getDefaultSecurityEnvironmentIndex( ) override; - virtual void SAL_CALL setDefaultSecurityEnvironmentIndex( sal_Int32 nDefaultEnvIndex ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDefaultSecurityEnvironmentIndex( sal_Int32 nDefaultEnvIndex ) override; //Methods from XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override ; + virtual OUString SAL_CALL getImplementationName() override ; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName - ) throw( css::uno::RuntimeException, std::exception ) override ; + ) override ; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override ; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override ; //Helper for XServiceInfo static css::uno::Sequence< OUString > impl_getSupportedServiceNames() ; /// @throws css::uno::RuntimeException - static OUString impl_getImplementationName() throw( css::uno::RuntimeException ) ; + static OUString impl_getImplementationName() ; //Helper for registry /// @throws css::uno::RuntimeException - static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) throw( css::uno::RuntimeException ) ; + static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ; static css::uno::Reference< css::lang::XSingleServiceFactory > impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ; diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx index 1a3fe0c95f47..566d3cc77d35 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx @@ -58,9 +58,7 @@ Reference< XXMLSignatureTemplate > SAL_CALL XMLSignature_NssImpl::generate( const Reference< XXMLSignatureTemplate >& aTemplate , const Reference< XSecurityEnvironment >& aEnvironment -) throw( css::xml::crypto::XMLSignatureException, - css::uno::SecurityException, - css::uno::RuntimeException, std::exception ) +) { xmlSecKeysMngrPtr pMngr = nullptr ; xmlSecDSigCtxPtr pDsigCtx = nullptr ; @@ -163,9 +161,7 @@ Reference< XXMLSignatureTemplate > SAL_CALL XMLSignature_NssImpl::validate( const Reference< XXMLSignatureTemplate >& aTemplate , const Reference< XXMLSecurityContext >& aSecurityCtx -) throw( css::uno::RuntimeException, - css::uno::SecurityException, - css::xml::crypto::XMLSignatureException, std::exception ) { +) { xmlSecKeysMngrPtr pMngr = nullptr ; xmlSecDSigCtxPtr pDsigCtx = nullptr ; xmlNodePtr pNode = nullptr ; @@ -284,12 +280,12 @@ SAL_CALL XMLSignature_NssImpl::validate( } /* XServiceInfo */ -OUString SAL_CALL XMLSignature_NssImpl::getImplementationName() throw( RuntimeException, std::exception ) { +OUString SAL_CALL XMLSignature_NssImpl::getImplementationName() { return impl_getImplementationName() ; } /* XServiceInfo */ -sal_Bool SAL_CALL XMLSignature_NssImpl::supportsService( const OUString& serviceName) throw( RuntimeException, std::exception ) { +sal_Bool SAL_CALL XMLSignature_NssImpl::supportsService( const OUString& serviceName) { Sequence< OUString > seqServiceNames = getSupportedServiceNames() ; const OUString* pArray = seqServiceNames.getConstArray() ; for( sal_Int32 i = 0 ; i < seqServiceNames.getLength() ; i ++ ) { @@ -300,7 +296,7 @@ sal_Bool SAL_CALL XMLSignature_NssImpl::supportsService( const OUString& service } /* XServiceInfo */ -Sequence< OUString > SAL_CALL XMLSignature_NssImpl::getSupportedServiceNames() throw( RuntimeException, std::exception ) { +Sequence< OUString > SAL_CALL XMLSignature_NssImpl::getSupportedServiceNames() { return impl_getSupportedServiceNames() ; } @@ -311,12 +307,12 @@ Sequence< OUString > XMLSignature_NssImpl::impl_getSupportedServiceNames() { return seqServiceNames ; } -OUString XMLSignature_NssImpl::impl_getImplementationName() throw( RuntimeException ) { +OUString XMLSignature_NssImpl::impl_getImplementationName() { return OUString("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_NssImpl") ; } //Helper for registry -Reference< XInterface > SAL_CALL XMLSignature_NssImpl::impl_createInstance( const Reference< XMultiServiceFactory >& ) throw( RuntimeException ) { +Reference< XInterface > SAL_CALL XMLSignature_NssImpl::impl_createInstance( const Reference< XMultiServiceFactory >& ) { return Reference< XInterface >( *new XMLSignature_NssImpl ) ; } diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx index 5e6fe23a1ca0..92f50d9acb26 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx @@ -46,35 +46,31 @@ class XMLSignature_NssImpl : public ::cppu::WeakImplHelper< virtual css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate > SAL_CALL generate( const css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate >& aTemplate , const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& aEnvironment - ) throw (css::xml::crypto::XMLSignatureException, - css::uno::SecurityException, - css::uno::RuntimeException, std::exception) override ; + ) override ; virtual css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate > SAL_CALL validate( const css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate >& aTemplate , const css::uno::Reference< css::xml::crypto::XXMLSecurityContext >& aContext - ) throw( css::uno::RuntimeException, - css::uno::SecurityException, - css::xml::crypto::XMLSignatureException, std::exception) override; + ) override; //Methods from XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override ; + virtual OUString SAL_CALL getImplementationName() override ; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName - ) throw( css::uno::RuntimeException, std::exception ) override ; + ) override ; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override ; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override ; //Helper for XServiceInfo static css::uno::Sequence< OUString > impl_getSupportedServiceNames() ; /// @throws css::uno::RuntimeException - static OUString impl_getImplementationName() throw( css::uno::RuntimeException ) ; + static OUString impl_getImplementationName() ; //Helper for registry /// @throws css::uno::RuntimeException - static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) throw( css::uno::RuntimeException ) ; + static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ; static css::uno::Reference< css::lang::XSingleServiceFactory > impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& aServiceManager ) ; } ; diff --git a/xmlsecurity/source/xmlsec/saxhelper.cxx b/xmlsecurity/source/xmlsec/saxhelper.cxx index 3a6a499eb94b..6fb61db139f6 100644 --- a/xmlsecurity/source/xmlsec/saxhelper.cxx +++ b/xmlsecurity/source/xmlsec/saxhelper.cxx @@ -214,7 +214,6 @@ void SAXHelper::setCurrentNode(const xmlNodePtr pNode) * XDocumentHandler -- start an xml document */ void SAXHelper::startDocument() - throw( cssxs::SAXException , cssu::RuntimeException ) { if( m_pParserCtxt == nullptr) { @@ -243,7 +242,6 @@ void SAXHelper::startDocument() * XDocumentHandler -- end an xml document */ void SAXHelper::endDocument() - throw( cssxs::SAXException , cssu::RuntimeException ) { m_pSaxHandler->endDocument( m_pParserCtxt ) ; } @@ -254,7 +252,6 @@ void SAXHelper::endDocument() void SAXHelper::startElement( const OUString& aName, const cssu::Sequence< cssxcsax::XMLAttribute >& aAttributes ) - throw( cssxs::SAXException , cssu::RuntimeException ) { const xmlChar* fullName = nullptr ; const xmlChar** attrs = nullptr ; @@ -290,7 +287,6 @@ void SAXHelper::startElement( * XDocumentHandler -- end an xml element */ void SAXHelper::endElement( const OUString& aName ) - throw( cssxs::SAXException , cssu::RuntimeException ) { xmlChar* fullname = nullptr ; @@ -308,7 +304,6 @@ void SAXHelper::endElement( const OUString& aName ) * XDocumentHandler -- an xml element or cdata characters */ void SAXHelper::characters( const OUString& aChars ) - throw( cssxs::SAXException , cssu::RuntimeException ) { const xmlChar* chars = nullptr ; int length = 0 ; @@ -326,7 +321,6 @@ void SAXHelper::characters( const OUString& aChars ) * XDocumentHandler -- ignorable xml white space */ void SAXHelper::ignorableWhitespace( const OUString& aWhitespaces ) - throw( cssxs::SAXException , cssu::RuntimeException ) { const xmlChar* chars = nullptr ; int length = 0 ; @@ -346,7 +340,6 @@ void SAXHelper::ignorableWhitespace( const OUString& aWhitespaces ) void SAXHelper::processingInstruction( const OUString& aTarget, const OUString& aData ) - throw( cssxs::SAXException , cssu::RuntimeException ) { xmlChar* target = nullptr ; xmlChar* data = nullptr ; diff --git a/xmlsecurity/source/xmlsec/serialnumberadapter.cxx b/xmlsecurity/source/xmlsec/serialnumberadapter.cxx index 0917f2717a4d..2377654b086d 100644 --- a/xmlsecurity/source/xmlsec/serialnumberadapter.cxx +++ b/xmlsecurity/source/xmlsec/serialnumberadapter.cxx @@ -49,26 +49,21 @@ public: private: virtual ~Service() override {} - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getImplementationName() override { return xml_security::serial_number_adapter::implementationName(); } - virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() 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) override + css::uno::Sequence< sal_Int8 > const & SerialNumber) override { return bigIntegerToNumericString(SerialNumber); } virtual css::uno::Sequence< sal_Int8 > SAL_CALL toSequence( - OUString const & SerialNumber) - throw (css::uno::RuntimeException, std::exception) override + OUString const & SerialNumber) override { return numericStringToBigInteger(SerialNumber); } }; @@ -82,14 +77,12 @@ xml_security::serial_number_adapter::create( } OUString xml_security::serial_number_adapter::implementationName() - throw (css::uno::RuntimeException) { return OUString("com.sun.star.comp.security.SerialNumberAdapter"); } css::uno::Sequence< OUString > xml_security::serial_number_adapter::serviceNames() - throw (css::uno::RuntimeException) { css::uno::Sequence< OUString > s { "com.sun.star.security.SerialNumberAdapter" }; return s; diff --git a/xmlsecurity/source/xmlsec/serialnumberadapter.hxx b/xmlsecurity/source/xmlsec/serialnumberadapter.hxx index 5fb4269b92fe..2eb976afdced 100644 --- a/xmlsecurity/source/xmlsec/serialnumberadapter.hxx +++ b/xmlsecurity/source/xmlsec/serialnumberadapter.hxx @@ -37,11 +37,10 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const &); /// @throws css::uno::RuntimeException -OUString implementationName() throw (css::uno::RuntimeException); +OUString implementationName(); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > serviceNames() - throw (css::uno::RuntimeException); +css::uno::Sequence< OUString > serviceNames(); } } diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx index 8945a421a3b6..fafa81d30e42 100644 --- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx +++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx @@ -168,7 +168,6 @@ void XMLDocumentWrapper_XmlSecImpl::sendStartElement( const cssu::Reference< cssxs::XDocumentHandler >& xHandler, const cssu::Reference< cssxs::XDocumentHandler >& xHandler2, const xmlNodePtr pNode) - throw (cssxs::SAXException) /****** XMLDocumentWrapper_XmlSecImpl/sendStartElement ************************ * * NAME @@ -257,7 +256,6 @@ void XMLDocumentWrapper_XmlSecImpl::sendEndElement( const cssu::Reference< cssxs::XDocumentHandler >& xHandler, const cssu::Reference< cssxs::XDocumentHandler >& xHandler2, const xmlNodePtr pNode) - throw (cssxs::SAXException) /****** XMLDocumentWrapper_XmlSecImpl/sendEndElement ************************** * * NAME @@ -291,7 +289,6 @@ void XMLDocumentWrapper_XmlSecImpl::sendNode( const cssu::Reference< cssxs::XDocumentHandler >& xHandler, const cssu::Reference< cssxs::XDocumentHandler >& xHandler2, const xmlNodePtr pNode) - throw (cssxs::SAXException) /****** XMLDocumentWrapper_XmlSecImpl/sendNode ******************************** * * NAME @@ -599,21 +596,18 @@ void XMLDocumentWrapper_XmlSecImpl::rebuildIDLink(xmlNodePtr pNode) const /* XXMLDocumentWrapper */ cssu::Reference< cssxw::XXMLElementWrapper > SAL_CALL XMLDocumentWrapper_XmlSecImpl::getCurrentElement( ) - throw (cssu::RuntimeException, std::exception) { XMLElementWrapper_XmlSecImpl* pElement = new XMLElementWrapper_XmlSecImpl(m_pCurrentElement); return cssu::Reference< cssxw::XXMLElementWrapper >(pElement); } void SAL_CALL XMLDocumentWrapper_XmlSecImpl::setCurrentElement( const cssu::Reference< cssxw::XXMLElementWrapper >& element ) - throw (cssu::RuntimeException, std::exception) { m_pCurrentElement = checkElement( element ); saxHelper.setCurrentNode( m_pCurrentElement ); } void SAL_CALL XMLDocumentWrapper_XmlSecImpl::removeCurrentElement( ) - throw (cssu::RuntimeException, std::exception) { OSL_ASSERT( m_pCurrentElement != nullptr ); @@ -635,14 +629,12 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::removeCurrentElement( ) } sal_Bool SAL_CALL XMLDocumentWrapper_XmlSecImpl::isCurrent( const cssu::Reference< cssxw::XXMLElementWrapper >& node ) - throw (cssu::RuntimeException, std::exception) { xmlNodePtr pNode = checkElement(node); return (pNode == m_pCurrentElement); } sal_Bool SAL_CALL XMLDocumentWrapper_XmlSecImpl::isCurrentElementEmpty( ) - throw (cssu::RuntimeException, std::exception) { bool rc = false; @@ -655,7 +647,6 @@ sal_Bool SAL_CALL XMLDocumentWrapper_XmlSecImpl::isCurrentElementEmpty( ) } OUString SAL_CALL XMLDocumentWrapper_XmlSecImpl::getNodeName( const cssu::Reference< cssxw::XXMLElementWrapper >& node ) - throw (cssu::RuntimeException, std::exception) { xmlNodePtr pNode = checkElement(node); return OUString::fromUtf8(reinterpret_cast<char const *>(pNode->name)); @@ -665,7 +656,6 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::clearUselessData( const cssu::Reference< cssxw::XXMLElementWrapper >& node, const cssu::Sequence< cssu::Reference< cssxw::XXMLElementWrapper > >& reservedDescendants, const cssu::Reference< cssxw::XXMLElementWrapper >& stopAtNode ) - throw (cssu::RuntimeException, std::exception) { xmlNodePtr pTargetNode = checkElement(node); @@ -679,7 +669,6 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::clearUselessData( } void SAL_CALL XMLDocumentWrapper_XmlSecImpl::collapse( const cssu::Reference< cssxw::XXMLElementWrapper >& node ) - throw (cssu::RuntimeException, std::exception) { xmlNodePtr pTargetNode = checkElement(node); xmlNodePtr pParent; @@ -698,7 +687,6 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::collapse( const cssu::Reference< cs } void SAL_CALL XMLDocumentWrapper_XmlSecImpl::getTree( const cssu::Reference< cssxs::XDocumentHandler >& handler ) - throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { if (m_pRootElement != nullptr) { @@ -742,7 +730,6 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::generateSAXEvents( const cssu::Reference< cssxs::XDocumentHandler >& xEventKeeperHandler, const cssu::Reference< cssxw::XXMLElementWrapper >& startNode, const cssu::Reference< cssxw::XXMLElementWrapper >& endNode ) - throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { /* * The first SAX event is the startElement of the startNode @@ -816,7 +803,6 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::generateSAXEvents( void SAL_CALL XMLDocumentWrapper_XmlSecImpl::rebuildIDLink( const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& node ) - throw (css::uno::RuntimeException, std::exception) { xmlNodePtr pNode = checkElement( node ); rebuildIDLink(pNode); @@ -825,17 +811,14 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::rebuildIDLink( /* cssxs::XDocumentHandler */ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::startDocument( ) - throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { } void SAL_CALL XMLDocumentWrapper_XmlSecImpl::endDocument( ) - throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { } void SAL_CALL XMLDocumentWrapper_XmlSecImpl::startElement( const OUString& aName, const cssu::Reference< cssxs::XAttributeList >& xAttribs ) - throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { sal_Int32 nLength = xAttribs->getLength(); cssu::Sequence< cssxcsax::XMLAttribute > aAttributes (nLength); @@ -850,48 +833,40 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::startElement( const OUString& aName } void SAL_CALL XMLDocumentWrapper_XmlSecImpl::endElement( const OUString& aName ) - throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { saxHelper.endElement(aName); m_pCurrentElement = saxHelper.getCurrentNode(); } void SAL_CALL XMLDocumentWrapper_XmlSecImpl::characters( const OUString& aChars ) - throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { saxHelper.characters(aChars); } void SAL_CALL XMLDocumentWrapper_XmlSecImpl::ignorableWhitespace( const OUString& aWhitespaces ) - throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { saxHelper.ignorableWhitespace(aWhitespaces); } void SAL_CALL XMLDocumentWrapper_XmlSecImpl::processingInstruction( const OUString& aTarget, const OUString& aData ) - throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { saxHelper.processingInstruction(aTarget, aData); } void SAL_CALL XMLDocumentWrapper_XmlSecImpl::setDocumentLocator( const cssu::Reference< cssxs::XLocator >& ) - throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { } /* XCompressedDocumentHandler */ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::compressedStartDocument( ) - throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { } void SAL_CALL XMLDocumentWrapper_XmlSecImpl::compressedEndDocument( ) - throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { } void SAL_CALL XMLDocumentWrapper_XmlSecImpl::compressedStartElement( const OUString& aName, const cssu::Sequence< cssxcsax::XMLAttribute >& aAttributes ) - throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { saxHelper.startElement(aName, aAttributes); m_pCurrentElement = saxHelper.getCurrentNode(); @@ -900,42 +875,35 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::compressedStartElement( const OUStr } void SAL_CALL XMLDocumentWrapper_XmlSecImpl::compressedEndElement( const OUString& aName ) - throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { endElement( aName ); } void SAL_CALL XMLDocumentWrapper_XmlSecImpl::compressedCharacters( const OUString& aChars ) - throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { characters( aChars ); } void SAL_CALL XMLDocumentWrapper_XmlSecImpl::compressedIgnorableWhitespace( const OUString& aWhitespaces ) - throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { ignorableWhitespace( aWhitespaces ); } void SAL_CALL XMLDocumentWrapper_XmlSecImpl::compressedProcessingInstruction( const OUString& aTarget, const OUString& aData ) - throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { processingInstruction( aTarget, aData ); } void SAL_CALL XMLDocumentWrapper_XmlSecImpl::compressedSetDocumentLocator( sal_Int32 /*columnNumber*/, sal_Int32 /*lineNumber*/, const OUString& /*publicId*/, const OUString& /*systemId*/ ) - throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { } OUString XMLDocumentWrapper_XmlSecImpl_getImplementationName () - throw (cssu::RuntimeException) { return OUString ( IMPLEMENTATION_NAME ); } cssu::Sequence< OUString > SAL_CALL XMLDocumentWrapper_XmlSecImpl_getSupportedServiceNames( ) - throw (cssu::RuntimeException) { cssu::Sequence<OUString> aRet { "com.sun.star.xml.wrapper.XMLDocumentWrapper" }; return aRet; @@ -943,24 +911,20 @@ cssu::Sequence< OUString > SAL_CALL XMLDocumentWrapper_XmlSecImpl_getSupportedSe cssu::Reference< cssu::XInterface > SAL_CALL XMLDocumentWrapper_XmlSecImpl_createInstance( const cssu::Reference< cssu::XComponentContext > &) - throw( cssu::Exception ) { return static_cast<cppu::OWeakObject*>(new XMLDocumentWrapper_XmlSecImpl( )); } /* XServiceInfo */ OUString SAL_CALL XMLDocumentWrapper_XmlSecImpl::getImplementationName( ) - throw (cssu::RuntimeException, std::exception) { return XMLDocumentWrapper_XmlSecImpl_getImplementationName(); } sal_Bool SAL_CALL XMLDocumentWrapper_XmlSecImpl::supportsService( const OUString& rServiceName ) - throw (cssu::RuntimeException, std::exception) { return cppu::supportsService( this, rServiceName ); } cssu::Sequence< OUString > SAL_CALL XMLDocumentWrapper_XmlSecImpl::getSupportedServiceNames( ) - throw (cssu::RuntimeException, std::exception) { return XMLDocumentWrapper_XmlSecImpl_getSupportedServiceNames(); } diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx index 409a68d86cc1..6c9efb970083 100644 --- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx +++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx @@ -38,7 +38,6 @@ XMLElementWrapper_XmlSecImpl::XMLElementWrapper_XmlSecImpl(const xmlNodePtr pNod /* XUnoTunnel */ cssu::Sequence< sal_Int8 > XMLElementWrapper_XmlSecImpl::getUnoTunnelImplementationId() - throw (cssu::RuntimeException) { static ::cppu::OImplementationId* pId = nullptr; if (! pId) @@ -54,7 +53,6 @@ cssu::Sequence< sal_Int8 > XMLElementWrapper_XmlSecImpl::getUnoTunnelImplementat } sal_Int64 SAL_CALL XMLElementWrapper_XmlSecImpl::getSomething( const cssu::Sequence< sal_Int8 >& aIdentifier ) - throw (cssu::RuntimeException, std::exception) { if (aIdentifier.getLength() == 16 && 0 == memcmp( @@ -72,13 +70,11 @@ sal_Int64 SAL_CALL XMLElementWrapper_XmlSecImpl::getSomething( const cssu::Seque OUString XMLElementWrapper_XmlSecImpl_getImplementationName () - throw (cssu::RuntimeException) { return OUString ( IMPLEMENTATION_NAME ); } cssu::Sequence< OUString > SAL_CALL XMLElementWrapper_XmlSecImpl_getSupportedServiceNames( ) - throw (cssu::RuntimeException) { cssu::Sequence<OUString> aRet { "com.sun.star.xml.wrapper.XMLElementWrapper" }; return aRet; @@ -87,24 +83,20 @@ cssu::Sequence< OUString > SAL_CALL XMLElementWrapper_XmlSecImpl_getSupportedSer cssu::Reference< cssu::XInterface > SAL_CALL XMLElementWrapper_XmlSecImpl_createInstance( const cssu::Reference< cssu::XComponentContext > &) - throw( cssu::Exception ) { return static_cast<cppu::OWeakObject*>(new XMLElementWrapper_XmlSecImpl(nullptr)); } /* XServiceInfo */ OUString SAL_CALL XMLElementWrapper_XmlSecImpl::getImplementationName( ) - throw (cssu::RuntimeException, std::exception) { return XMLElementWrapper_XmlSecImpl_getImplementationName(); } sal_Bool SAL_CALL XMLElementWrapper_XmlSecImpl::supportsService( const OUString& rServiceName ) - throw (cssu::RuntimeException, std::exception) { return cppu::supportsService( this, rServiceName ); } cssu::Sequence< OUString > SAL_CALL XMLElementWrapper_XmlSecImpl::getSupportedServiceNames( ) - throw (cssu::RuntimeException, std::exception) { return XMLElementWrapper_XmlSecImpl_getSupportedServiceNames(); } diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx index 469ab4eef5a5..67a47d17db31 100644 --- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx +++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx @@ -59,19 +59,14 @@ public: /* XXMLElementWrapper */ /* css::lang::XUnoTunnel */ - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override; /// @throws css::uno::RuntimeException - static css::uno::Sequence < sal_Int8 > getUnoTunnelImplementationId() - throw(css::uno::RuntimeException); + static css::uno::Sequence < sal_Int8 > getUnoTunnelImplementationId(); /* css::lang::XServiceInfo */ - 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) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; public: /* @@ -89,18 +84,15 @@ public: }; /// @throws css::uno::RuntimeException -OUString XMLElementWrapper_XmlSecImpl_getImplementationName() - throw ( css::uno::RuntimeException ); +OUString XMLElementWrapper_XmlSecImpl_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL XMLElementWrapper_XmlSecImpl_getSupportedServiceNames( ) - throw ( css::uno::RuntimeException ); +css::uno::Sequence< OUString > SAL_CALL XMLElementWrapper_XmlSecImpl_getSupportedServiceNames( ); /// @throws css::uno::Exception css::uno::Reference< css::uno::XInterface > SAL_CALL XMLElementWrapper_XmlSecImpl_createInstance( - const css::uno::Reference< css::uno::XComponentContext > &) - throw ( css::uno::Exception ); + const css::uno::Reference< css::uno::XComponentContext > &); #endif |