diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-25 21:31:58 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-26 18:22:20 +0100 |
| commit | 5e21a413c788f839a66d9e4c14e745ed18058db8 (patch) | |
| tree | d4451246461346a425ad6f796e08bf1514cdd942 /xmlsecurity | |
| parent | 6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff) | |
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'xmlsecurity')
57 files changed, 483 insertions, 483 deletions
diff --git a/xmlsecurity/source/component/certificatecontainer.cxx b/xmlsecurity/source/component/certificatecontainer.cxx index 6753282335f7..c021e3060e10 100644 --- a/xmlsecurity/source/component/certificatecontainer.cxx +++ b/xmlsecurity/source/component/certificatecontainer.cxx @@ -59,7 +59,7 @@ CertificateContainer::isCertificateTrust ( const OUString & url, const OUString sal_Bool CertificateContainer::addCertificate( const OUString & url, const OUString & certificate_name, ::sal_Bool trust ) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { certMap.insert( Map::value_type( url, certificate_name ) ); @@ -71,7 +71,7 @@ CertificateContainer::addCertificate( const OUString & url, const OUString & cer } ::security::CertificateContainerStatus -CertificateContainer::hasCertificate( const OUString & url, const OUString & certificate_name ) throw(::com::sun::star::uno::RuntimeException) +CertificateContainer::hasCertificate( const OUString & url, const OUString & certificate_name ) throw(::com::sun::star::uno::RuntimeException, std::exception) { if ( isTemporaryCertificate( url, certificate_name ) ) { @@ -87,14 +87,14 @@ CertificateContainer::hasCertificate( const OUString & url, const OUString & cer OUString SAL_CALL CertificateContainer::getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { return impl_getStaticImplementationName(); } sal_Bool SAL_CALL CertificateContainer::supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { if ( ServiceName.equalsAscii("com.sun.star.security.CertificateContainer") ) return sal_True; @@ -104,7 +104,7 @@ CertificateContainer::supportsService( const OUString& ServiceName ) Sequence< OUString > SAL_CALL CertificateContainer::getSupportedServiceNames( ) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { return impl_getStaticSupportedServiceNames(); } diff --git a/xmlsecurity/source/component/certificatecontainer.hxx b/xmlsecurity/source/component/certificatecontainer.hxx index a3b2f6b2a1fd..3e1b4b3f2759 100644 --- a/xmlsecurity/source/component/certificatecontainer.hxx +++ b/xmlsecurity/source/component/certificatecontainer.hxx @@ -48,8 +48,8 @@ class CertificateContainer : public ::cppu::WeakImplHelper2< css::lang::XService CertificateContainer(const css::uno::Reference< css::lang::XMultiServiceFactory >& ) {}; virtual ~CertificateContainer(){}; - virtual ::sal_Bool SAL_CALL addCertificate( const OUString & url, const OUString & certificate_name, ::sal_Bool trust ) throw(css::uno::RuntimeException); - virtual css::security::CertificateContainerStatus SAL_CALL hasCertificate( const OUString & url, const OUString & certificate_name ) throw(css::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL addCertificate( const OUString & url, const OUString & certificate_name, ::sal_Bool trust ) throw(css::uno::RuntimeException, std::exception); + virtual css::security::CertificateContainerStatus SAL_CALL hasCertificate( const OUString & url, const OUString & certificate_name ) throw(css::uno::RuntimeException, std::exception); // provide factory static OUString SAL_CALL impl_getStaticImplementationName( ) throw(css::uno::RuntimeException); @@ -61,11 +61,11 @@ class CertificateContainer : public ::cppu::WeakImplHelper2< css::lang::XService impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::RuntimeException ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames( ) throw(css::uno::RuntimeException); + getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception); }; diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx index bf64632a6d9f..896ee9fbea82 100644 --- a/xmlsecurity/source/component/documentdigitalsignatures.cxx +++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx @@ -59,7 +59,7 @@ DocumentDigitalSignatures::DocumentDigitalSignatures( const Reference< XComponen } void DocumentDigitalSignatures::initialize( const Sequence< Any >& aArguments) - throw (css::uno::Exception, css::uno::RuntimeException) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { if (aArguments.getLength() > 2) throw css::lang::IllegalArgumentException( @@ -92,7 +92,7 @@ void DocumentDigitalSignatures::initialize( const Sequence< Any >& aArguments) sal_Bool DocumentDigitalSignatures::signDocumentContent( const Reference< css::embed::XStorage >& rxStorage, const Reference< css::io::XStream >& xSignStream) - throw (RuntimeException) + throw (RuntimeException, std::exception) { OSL_ENSURE(!m_sODFVersion.isEmpty(), "DocumentDigitalSignatures: ODF Version not set, assuming minimum 1.2"); return ImplViewSignatures( rxStorage, xSignStream, SignatureModeDocumentContent, false ); @@ -101,7 +101,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) + const Reference< css::io::XInputStream >& xSignInStream ) throw (RuntimeException, std::exception) { OSL_ENSURE(!m_sODFVersion.isEmpty(),"DocumentDigitalSignatures: ODF Version not set, assuming minimum 1.2"); return ImplVerifySignatures( rxStorage, xSignInStream, SignatureModeDocumentContent ); @@ -109,21 +109,21 @@ DocumentDigitalSignatures::verifyDocumentContentSignatures( void DocumentDigitalSignatures::showDocumentContentSignatures( const Reference< css::embed::XStorage >& rxStorage, - const Reference< css::io::XInputStream >& xSignInStream ) throw (RuntimeException) + const Reference< css::io::XInputStream >& xSignInStream ) throw (RuntimeException, std::exception) { OSL_ENSURE(!m_sODFVersion.isEmpty(),"DocumentDigitalSignatures: ODF Version not set, assuming minimum 1.2"); ImplViewSignatures( rxStorage, xSignInStream, SignatureModeDocumentContent, true ); } OUString DocumentDigitalSignatures::getDocumentContentSignatureDefaultStreamName() - throw (css::uno::RuntimeException) + 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) + const Reference< css::io::XStream >& xSignStream ) throw (RuntimeException, std::exception) { 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"); @@ -133,7 +133,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) + const Reference< css::io::XInputStream >& xSignInStream ) throw (RuntimeException, std::exception) { OSL_ENSURE(!m_sODFVersion.isEmpty(),"DocumentDigitalSignatures: ODF Version not set, assuming minimum 1.2"); return ImplVerifySignatures( rxStorage, xSignInStream, SignatureModeMacros ); @@ -141,14 +141,14 @@ DocumentDigitalSignatures::verifyScriptingContentSignatures( void DocumentDigitalSignatures::showScriptingContentSignatures( const Reference< css::embed::XStorage >& rxStorage, - const Reference< css::io::XInputStream >& xSignInStream ) throw (RuntimeException) + const Reference< css::io::XInputStream >& xSignInStream ) throw (RuntimeException, std::exception) { OSL_ENSURE(!m_sODFVersion.isEmpty(),"DocumentDigitalSignatures: ODF Version not set, assuming minimum 1.2"); ImplViewSignatures( rxStorage, xSignInStream, SignatureModeMacros, true ); } OUString DocumentDigitalSignatures::getScriptingContentSignatureDefaultStreamName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return DocumentSignatureHelper::GetScriptingContentSignatureDefaultStreamName(); } @@ -156,7 +156,7 @@ OUString DocumentDigitalSignatures::getScriptingContentSignatureDefaultStreamNam sal_Bool DocumentDigitalSignatures::signPackage( const Reference< css::embed::XStorage >& rxStorage, - const Reference< css::io::XStream >& xSignStream ) throw (RuntimeException) + 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, SignatureModePackage, false ); @@ -165,7 +165,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) + const Reference< css::io::XInputStream >& xSignInStream ) throw (RuntimeException, std::exception) { OSL_ENSURE(!m_sODFVersion.isEmpty(),"DocumentDigitalSignatures: ODF Version not set, assuming minimum 1.2"); return ImplVerifySignatures( rxStorage, xSignInStream, SignatureModePackage ); @@ -173,14 +173,14 @@ DocumentDigitalSignatures::verifyPackageSignatures( void DocumentDigitalSignatures::showPackageSignatures( const Reference< css::embed::XStorage >& rxStorage, - const Reference< css::io::XInputStream >& xSignInStream ) throw (RuntimeException) + const Reference< css::io::XInputStream >& xSignInStream ) throw (RuntimeException, std::exception) { OSL_ENSURE(!m_sODFVersion.isEmpty(),"DocumentDigitalSignatures: ODF Version not set, assuming minimum 1.2"); ImplViewSignatures( rxStorage, xSignInStream, SignatureModePackage, true ); } OUString DocumentDigitalSignatures::getPackageSignatureDefaultStreamName( ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return DocumentSignatureHelper::GetPackageSignatureDefaultStreamName(); } @@ -353,7 +353,7 @@ DocumentDigitalSignatures::ImplVerifySignatures( } -void DocumentDigitalSignatures::manageTrustedSources( ) throw (RuntimeException) +void DocumentDigitalSignatures::manageTrustedSources( ) throw (RuntimeException, std::exception) { // MT: i45295 // SecEnv is only needed to display certificate information from trusted sources. @@ -371,7 +371,7 @@ void DocumentDigitalSignatures::manageTrustedSources( ) throw (RuntimeException } void DocumentDigitalSignatures::showCertificate( - const Reference< css::security::XCertificate >& _Certificate ) throw (RuntimeException) + const Reference< css::security::XCertificate >& _Certificate ) throw (RuntimeException, std::exception) { XMLSignatureHelper aSignatureHelper( mxCtx ); @@ -388,7 +388,7 @@ void DocumentDigitalSignatures::showCertificate( } ::sal_Bool DocumentDigitalSignatures::isAuthorTrusted( - const Reference< css::security::XCertificate >& Author ) throw (RuntimeException) + const Reference< css::security::XCertificate >& Author ) throw (RuntimeException, std::exception) { sal_Bool bFound = sal_False; @@ -413,7 +413,7 @@ void DocumentDigitalSignatures::showCertificate( return bFound; } -Reference< css::security::XCertificate > DocumentDigitalSignatures::chooseCertificate() throw (RuntimeException) +Reference< css::security::XCertificate > DocumentDigitalSignatures::chooseCertificate() throw (RuntimeException, std::exception) { Reference< css::xml::crypto::XSecurityEnvironment > xSecEnv; @@ -435,13 +435,13 @@ Reference< css::security::XCertificate > DocumentDigitalSignatures::chooseCertif } -::sal_Bool DocumentDigitalSignatures::isLocationTrusted( const OUString& Location ) throw (RuntimeException) +::sal_Bool DocumentDigitalSignatures::isLocationTrusted( const OUString& Location ) throw (RuntimeException, std::exception) { return SvtSecurityOptions().isTrustedLocationUri(Location); } void DocumentDigitalSignatures::addAuthorToTrustedSources( - const Reference< css::security::XCertificate >& Author ) throw (RuntimeException) + const Reference< css::security::XCertificate >& Author ) throw (RuntimeException, std::exception) { SvtSecurityOptions aSecOpts; @@ -465,7 +465,7 @@ void DocumentDigitalSignatures::addAuthorToTrustedSources( aSecOpts.SetTrustedAuthors( aTrustedAuthors ); } -void DocumentDigitalSignatures::addLocationToTrustedSources( const OUString& Location ) throw (RuntimeException) +void DocumentDigitalSignatures::addLocationToTrustedSources( const OUString& Location ) throw (RuntimeException, std::exception) { SvtSecurityOptions aSecOpt; diff --git a/xmlsecurity/source/component/documentdigitalsignatures.hxx b/xmlsecurity/source/component/documentdigitalsignatures.hxx index a9f07d6f50b0..7d1ded76c02a 100644 --- a/xmlsecurity/source/component/documentdigitalsignatures.hxx +++ b/xmlsecurity/source/component/documentdigitalsignatures.hxx @@ -63,29 +63,29 @@ public: //XInitialization void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) - throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); // XDocumentDigitalSignatures - ::sal_Bool SAL_CALL signDocumentContent( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xSignStream ) throw (::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation > SAL_CALL verifyDocumentContentSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignInStream ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL showDocumentContentSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignInStream ) throw (::com::sun::star::uno::RuntimeException); - OUString SAL_CALL getDocumentContentSignatureDefaultStreamName( ) throw (::com::sun::star::uno::RuntimeException); - ::sal_Bool SAL_CALL signScriptingContent( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xSignStream ) throw (::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation > SAL_CALL verifyScriptingContentSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignInStream ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL showScriptingContentSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignInStream ) throw (::com::sun::star::uno::RuntimeException); - OUString SAL_CALL getScriptingContentSignatureDefaultStreamName( ) throw (::com::sun::star::uno::RuntimeException); - ::sal_Bool SAL_CALL signPackage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xSignStream ) throw (::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation > SAL_CALL verifyPackageSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignInStream ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL showPackageSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignInStream ) throw (::com::sun::star::uno::RuntimeException); - OUString SAL_CALL getPackageSignatureDefaultStreamName( ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL showCertificate( const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& Certificate ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL manageTrustedSources( ) throw (::com::sun::star::uno::RuntimeException); - ::sal_Bool SAL_CALL isAuthorTrusted( const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& Author ) throw (::com::sun::star::uno::RuntimeException); - ::sal_Bool SAL_CALL isLocationTrusted( const OUString& Location ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL addAuthorToTrustedSources( const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& Author ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL addLocationToTrustedSources( const OUString& Location ) throw (::com::sun::star::uno::RuntimeException); + ::sal_Bool SAL_CALL signDocumentContent( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xSignStream ) throw (::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation > SAL_CALL verifyDocumentContentSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignInStream ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL showDocumentContentSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignInStream ) throw (::com::sun::star::uno::RuntimeException, std::exception); + OUString SAL_CALL getDocumentContentSignatureDefaultStreamName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + ::sal_Bool SAL_CALL signScriptingContent( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xSignStream ) throw (::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation > SAL_CALL verifyScriptingContentSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignInStream ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL showScriptingContentSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignInStream ) throw (::com::sun::star::uno::RuntimeException, std::exception); + OUString SAL_CALL getScriptingContentSignatureDefaultStreamName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + ::sal_Bool SAL_CALL signPackage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xSignStream ) throw (::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation > SAL_CALL verifyPackageSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& Storage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignInStream ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL showPackageSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignInStream ) throw (::com::sun::star::uno::RuntimeException, std::exception); + OUString SAL_CALL getPackageSignatureDefaultStreamName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL showCertificate( const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& Certificate ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL manageTrustedSources( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + ::sal_Bool SAL_CALL isAuthorTrusted( const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& Author ) throw (::com::sun::star::uno::RuntimeException, std::exception); + ::sal_Bool SAL_CALL isLocationTrusted( const OUString& Location ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addAuthorToTrustedSources( const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& Author ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addLocationToTrustedSources( const OUString& Location ) throw (::com::sun::star::uno::RuntimeException, std::exception); - ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL chooseCertificate( ) throw (::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL chooseCertificate( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL DocumentDigitalSignatures_CreateInstance( diff --git a/xmlsecurity/source/framework/decryptorimpl.cxx b/xmlsecurity/source/framework/decryptorimpl.cxx index 6a482681bc7f..3bef50911ab7 100644 --- a/xmlsecurity/source/framework/decryptorimpl.cxx +++ b/xmlsecurity/source/framework/decryptorimpl.cxx @@ -150,20 +150,20 @@ void DecryptorImpl::startEngine( const cssu::Reference< /* XDecryptionResultBroadcaster */ void SAL_CALL DecryptorImpl::addDecryptionResultListener( const cssu::Reference< cssxc::sax::XDecryptionResultListener >& listener ) - throw (cssu::Exception, cssu::RuntimeException) + 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) + throw (cssu::RuntimeException, std::exception) { } /* XInitialization */ void SAL_CALL DecryptorImpl::initialize( const cssu::Sequence< cssu::Any >& aArguments ) - throw (cssu::Exception, cssu::RuntimeException) + throw (cssu::Exception, cssu::RuntimeException, std::exception) { OSL_ASSERT(aArguments.getLength() == 5); @@ -202,19 +202,19 @@ cssu::Reference< cssu::XInterface > SAL_CALL DecryptorImpl_createInstance( const /* XServiceInfo */ OUString SAL_CALL DecryptorImpl::getImplementationName( ) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { return DecryptorImpl_getImplementationName(); } sal_Bool SAL_CALL DecryptorImpl::supportsService( const OUString& rServiceName ) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } cssu::Sequence< OUString > SAL_CALL DecryptorImpl::getSupportedServiceNames( ) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { return DecryptorImpl_getSupportedServiceNames(); } diff --git a/xmlsecurity/source/framework/decryptorimpl.hxx b/xmlsecurity/source/framework/decryptorimpl.hxx index d9502fb15c31..8be7230241fd 100644 --- a/xmlsecurity/source/framework/decryptorimpl.hxx +++ b/xmlsecurity/source/framework/decryptorimpl.hxx @@ -72,25 +72,25 @@ public: const com::sun::star::uno::Reference< com::sun::star::xml::crypto::sax::XDecryptionResultListener >& listener ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeDecryptionResultListener( const com::sun::star::uno::Reference< com::sun::star::xml::crypto::sax::XDecryptionResultListener >& listener ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); /* XInitialization */ virtual void SAL_CALL initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception); /* XServiceInfo */ virtual OUString SAL_CALL getImplementationName( ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); }; OUString DecryptorImpl_getImplementationName() diff --git a/xmlsecurity/source/framework/encryptionengine.cxx b/xmlsecurity/source/framework/encryptionengine.cxx index 47078acbcbf6..589176ed2dfa 100644 --- a/xmlsecurity/source/framework/encryptionengine.cxx +++ b/xmlsecurity/source/framework/encryptionengine.cxx @@ -179,7 +179,7 @@ void EncryptionEngine::clearUp( ) const /* XBlockerMonitor */ void SAL_CALL EncryptionEngine::setBlockerId( sal_Int32 id ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException) + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) { m_nIdOfBlocker = id; tryToPerform(); diff --git a/xmlsecurity/source/framework/encryptionengine.hxx b/xmlsecurity/source/framework/encryptionengine.hxx index d7d9a2b40c4b..2400140b8b29 100644 --- a/xmlsecurity/source/framework/encryptionengine.hxx +++ b/xmlsecurity/source/framework/encryptionengine.hxx @@ -93,7 +93,7 @@ protected: public: /* XBlockerMonitor */ virtual void SAL_CALL setBlockerId( sal_Int32 id ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception); }; #endif diff --git a/xmlsecurity/source/framework/encryptorimpl.cxx b/xmlsecurity/source/framework/encryptorimpl.cxx index 263577a247d0..bdeb9eb8c165 100644 --- a/xmlsecurity/source/framework/encryptorimpl.cxx +++ b/xmlsecurity/source/framework/encryptorimpl.cxx @@ -166,7 +166,7 @@ void EncryptorImpl::startEngine( const Reference< /* XReferenceCollector */ void SAL_CALL EncryptorImpl::setReferenceCount(sal_Int32) - throw (Exception, RuntimeException) + throw (Exception, RuntimeException, std::exception) { /* * dummp method, because there is only one reference in @@ -176,27 +176,27 @@ void SAL_CALL EncryptorImpl::setReferenceCount(sal_Int32) } void SAL_CALL EncryptorImpl::setReferenceId( sal_Int32 id ) - throw (Exception, RuntimeException) + throw (Exception, RuntimeException, std::exception) { m_nReferenceId = id; } /* XEncryptionResultBroadcaster */ void SAL_CALL EncryptorImpl::addEncryptionResultListener( const Reference< cssxc::sax::XEncryptionResultListener >& listener ) - throw (Exception, RuntimeException) + throw (Exception, RuntimeException, std::exception) { m_xResultListener = listener; tryToPerform(); } void SAL_CALL EncryptorImpl::removeEncryptionResultListener( const Reference< cssxc::sax::XEncryptionResultListener >&) - throw (RuntimeException) + throw (RuntimeException, std::exception) { } /* XInitialization */ void SAL_CALL EncryptorImpl::initialize( const Sequence< Any >& aArguments ) - throw (Exception, RuntimeException) + throw (Exception, RuntimeException, std::exception) { OSL_ASSERT(aArguments.getLength() == 5); @@ -237,19 +237,19 @@ Reference< XInterface > SAL_CALL EncryptorImpl_createInstance( /* XServiceInfo */ OUString SAL_CALL EncryptorImpl::getImplementationName( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return EncryptorImpl_getImplementationName(); } sal_Bool SAL_CALL EncryptorImpl::supportsService( const OUString& rServiceName ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL EncryptorImpl::getSupportedServiceNames( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return EncryptorImpl_getSupportedServiceNames(); } diff --git a/xmlsecurity/source/framework/encryptorimpl.hxx b/xmlsecurity/source/framework/encryptorimpl.hxx index b4f42381225b..ee6a67c5c173 100644 --- a/xmlsecurity/source/framework/encryptorimpl.hxx +++ b/xmlsecurity/source/framework/encryptorimpl.hxx @@ -80,32 +80,32 @@ public: const com::sun::star::uno::Reference< com::sun::star::xml::crypto::sax::XEncryptionResultListener >& listener ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeEncryptionResultListener( const com::sun::star::uno::Reference< com::sun::star::xml::crypto::sax::XEncryptionResultListener >& listener ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); /* XReferenceCollector */ virtual void SAL_CALL setReferenceCount( sal_Int32 count ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setReferenceId( sal_Int32 id ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception); /* XInitialization */ virtual void SAL_CALL initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception); /* XServiceInfo */ virtual OUString SAL_CALL getImplementationName( ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); }; OUString EncryptorImpl_getImplementationName() diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx index 4eefb9b044c7..1c7b5ca5a9b9 100644 --- a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx +++ b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx @@ -955,7 +955,7 @@ sal_Int32 SAXEventKeeperImpl::createBlocker(sal_Int32 nSecurityId) /* XSAXEventKeeper */ sal_Int32 SAL_CALL SAXEventKeeperImpl::addElementCollector( ) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { return createElementCollector( cssxc::sax::ConstOfSecurityId::UNDEFINEDSECURITYID, @@ -965,32 +965,32 @@ sal_Int32 SAL_CALL SAXEventKeeperImpl::addElementCollector( ) } void SAL_CALL SAXEventKeeperImpl::removeElementCollector( sal_Int32 id ) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { markElementMarkBuffer(id); } sal_Int32 SAL_CALL SAXEventKeeperImpl::addBlocker( ) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { return createBlocker(cssxc::sax::ConstOfSecurityId::UNDEFINEDSECURITYID); } void SAL_CALL SAXEventKeeperImpl::removeBlocker( sal_Int32 id ) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { markElementMarkBuffer(id); } sal_Bool SAL_CALL SAXEventKeeperImpl::isBlocking( ) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { return (m_pCurrentBlockingBufferNode != NULL); } cssu::Reference< cssxw::XXMLElementWrapper > SAL_CALL SAXEventKeeperImpl::getElement( sal_Int32 id ) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { cssu::Reference< cssxw::XXMLElementWrapper > rc; @@ -1006,7 +1006,7 @@ cssu::Reference< cssxw::XXMLElementWrapper > SAL_CALL void SAL_CALL SAXEventKeeperImpl::setElement( sal_Int32 id, const cssu::Reference< cssxw::XXMLElementWrapper >& aElement ) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { if (aElement.is()) { @@ -1037,7 +1037,7 @@ void SAL_CALL SAXEventKeeperImpl::setElement( cssu::Reference< cssxs::XDocumentHandler > SAL_CALL SAXEventKeeperImpl::setNextHandler( const cssu::Reference< cssxs::XDocumentHandler >& xNewHandler ) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { cssu::Reference< cssxs::XDocumentHandler > xOldHandler = m_xNextHandler; @@ -1046,7 +1046,7 @@ cssu::Reference< cssxs::XDocumentHandler > SAL_CALL SAXEventKeeperImpl::setNextH } OUString SAL_CALL SAXEventKeeperImpl::printBufferNodeTree() - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { OUString rc; @@ -1061,7 +1061,7 @@ OUString SAL_CALL SAXEventKeeperImpl::printBufferNodeTree() } cssu::Reference< cssxw::XXMLElementWrapper > SAL_CALL SAXEventKeeperImpl::getCurrentBlockingNode() - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { cssu::Reference< cssxw::XXMLElementWrapper > rc; @@ -1077,7 +1077,7 @@ cssu::Reference< cssxw::XXMLElementWrapper > SAL_CALL SAXEventKeeperImpl::getCur sal_Int32 SAL_CALL SAXEventKeeperImpl::addSecurityElementCollector( cssxc::sax::ElementMarkPriority priority, sal_Bool modifyElement ) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { return createElementCollector( cssxc::sax::ConstOfSecurityId::UNDEFINEDSECURITYID, @@ -1089,7 +1089,7 @@ sal_Int32 SAL_CALL SAXEventKeeperImpl::addSecurityElementCollector( sal_Int32 SAL_CALL SAXEventKeeperImpl::cloneElementCollector( sal_Int32 referenceId, cssxc::sax::ElementMarkPriority priority ) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { sal_Int32 nId = -1; @@ -1121,7 +1121,7 @@ sal_Int32 SAL_CALL SAXEventKeeperImpl::cloneElementCollector( } void SAL_CALL SAXEventKeeperImpl::setSecurityId( sal_Int32 id, sal_Int32 securityId ) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { ElementMark* pElementMark = findElementMarkBuffer(id); if (pElementMark != NULL) @@ -1135,7 +1135,7 @@ 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) + throw (cssu::RuntimeException, std::exception) { ElementCollector* pElementCollector = (ElementCollector*)findElementMarkBuffer(referenceId); if (pElementCollector != NULL) @@ -1147,27 +1147,27 @@ void SAL_CALL SAXEventKeeperImpl::addReferenceResolvedListener( void SAL_CALL SAXEventKeeperImpl::removeReferenceResolvedListener( sal_Int32 /*referenceId*/, const cssu::Reference< cssxc::sax::XReferenceResolvedListener >&) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { } /* XSAXEventKeeperStatusChangeBroadcaster */ void SAL_CALL SAXEventKeeperImpl::addSAXEventKeeperStatusChangeListener( const cssu::Reference< cssxc::sax::XSAXEventKeeperStatusChangeListener >& listener ) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { m_xSAXEventKeeperStatusChangeListener = listener; } void SAL_CALL SAXEventKeeperImpl::removeSAXEventKeeperStatusChangeListener( const cssu::Reference< cssxc::sax::XSAXEventKeeperStatusChangeListener >&) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { } /* XDocumentHandler */ void SAL_CALL SAXEventKeeperImpl::startDocument( ) - throw (cssxs::SAXException, cssu::RuntimeException) + throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { if ( m_xNextHandler.is()) { @@ -1176,7 +1176,7 @@ void SAL_CALL SAXEventKeeperImpl::startDocument( ) } void SAL_CALL SAXEventKeeperImpl::endDocument( ) - throw (cssxs::SAXException, cssu::RuntimeException) + throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { if ( m_xNextHandler.is()) { @@ -1187,7 +1187,7 @@ void SAL_CALL SAXEventKeeperImpl::endDocument( ) void SAL_CALL SAXEventKeeperImpl::startElement( const OUString& aName, const cssu::Reference< cssxs::XAttributeList >& xAttribs ) - throw (cssxs::SAXException, cssu::RuntimeException) + throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { /* * If there is a following handler and no blocking now, then @@ -1231,7 +1231,7 @@ void SAL_CALL SAXEventKeeperImpl::startElement( } void SAL_CALL SAXEventKeeperImpl::endElement( const OUString& aName ) - throw (cssxs::SAXException, cssu::RuntimeException) + throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { sal_Bool bIsCurrent = m_xXMLDocument->isCurrent(m_pCurrentBufferNode->getXMLElement()); @@ -1288,7 +1288,7 @@ void SAL_CALL SAXEventKeeperImpl::endElement( const OUString& aName ) } void SAL_CALL SAXEventKeeperImpl::characters( const OUString& aChars ) - throw (cssxs::SAXException, cssu::RuntimeException) + throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { if (!m_bIsForwarding) { @@ -1310,14 +1310,14 @@ void SAL_CALL SAXEventKeeperImpl::characters( const OUString& aChars ) } void SAL_CALL SAXEventKeeperImpl::ignorableWhitespace( const OUString& aWhitespaces ) - throw (cssxs::SAXException, cssu::RuntimeException) + 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) + throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { if (!m_bIsForwarding) { @@ -1339,13 +1339,13 @@ void SAL_CALL SAXEventKeeperImpl::processingInstruction( } void SAL_CALL SAXEventKeeperImpl::setDocumentLocator( const cssu::Reference< cssxs::XLocator >&) - throw (cssxs::SAXException, cssu::RuntimeException) + throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { } /* XInitialization */ void SAL_CALL SAXEventKeeperImpl::initialize( const cssu::Sequence< cssu::Any >& aArguments ) - throw (cssu::Exception, cssu::RuntimeException) + throw (cssu::Exception, cssu::RuntimeException, std::exception) { OSL_ASSERT(aArguments.getLength() == 1); @@ -1384,19 +1384,19 @@ cssu::Reference< cssu::XInterface > SAL_CALL SAXEventKeeperImpl_createInstance( /* XServiceInfo */ OUString SAL_CALL SAXEventKeeperImpl::getImplementationName( ) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { return SAXEventKeeperImpl_getImplementationName(); } sal_Bool SAL_CALL SAXEventKeeperImpl::supportsService( const OUString& rServiceName ) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } cssu::Sequence< OUString > SAL_CALL SAXEventKeeperImpl::getSupportedServiceNames( ) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { return SAXEventKeeperImpl_getSupportedServiceNames(); } diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.hxx b/xmlsecurity/source/framework/saxeventkeeperimpl.hxx index deb5e062dc14..0d5625770fb9 100644 --- a/xmlsecurity/source/framework/saxeventkeeperimpl.hxx +++ b/xmlsecurity/source/framework/saxeventkeeperimpl.hxx @@ -227,48 +227,48 @@ public: /* XSAXEventKeeper */ virtual sal_Int32 SAL_CALL addElementCollector( ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeElementCollector( sal_Int32 id ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL addBlocker( ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeBlocker( sal_Int32 id ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isBlocking( ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Reference< com::sun::star::xml::wrapper::XXMLElementWrapper > SAL_CALL getElement( sal_Int32 id ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setElement( sal_Int32 id, const com::sun::star::uno::Reference< com::sun::star::xml::wrapper::XXMLElementWrapper >& aElement ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler > SAL_CALL setNextHandler( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& xNewHandler ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL printBufferNodeTree() - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Reference< com::sun::star::xml::wrapper::XXMLElementWrapper > SAL_CALL getCurrentBlockingNode() - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); /* XSecuritySAXEventKeeper */ virtual sal_Int32 SAL_CALL addSecurityElementCollector( com::sun::star::xml::crypto::sax::ElementMarkPriority priority, sal_Bool modifyElement ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL cloneElementCollector( sal_Int32 referenceId, com::sun::star::xml::crypto::sax::ElementMarkPriority priority ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setSecurityId( sal_Int32 id, sal_Int32 securityId ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); /* XReferenceResolvedBroadcaster */ virtual void SAL_CALL addReferenceResolvedListener( @@ -276,61 +276,61 @@ public: const com::sun::star::uno::Reference< com::sun::star::xml::crypto::sax::XReferenceResolvedListener >& listener ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeReferenceResolvedListener( sal_Int32 referenceId, const com::sun::star::uno::Reference< com::sun::star::xml::crypto::sax::XReferenceResolvedListener >& listener ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); /* XSAXEventKeeperStatusChangeBroadcaster */ virtual void SAL_CALL addSAXEventKeeperStatusChangeListener( const com::sun::star::uno::Reference< com::sun::star::xml::crypto::sax::XSAXEventKeeperStatusChangeListener >& listener ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeSAXEventKeeperStatusChangeListener( const com::sun::star::uno::Reference< com::sun::star::xml::crypto::sax::XSAXEventKeeperStatusChangeListener >& listener ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); /* XDocumentHandler */ virtual void SAL_CALL startDocument( ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL endDocument( ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL startElement( const OUString& aName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL endElement( const OUString& aName ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL characters( const OUString& aChars ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setDocumentLocator( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XLocator >& xLocator ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); /* XInitialization */ virtual void SAL_CALL initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception); /* XServiceInfo */ virtual OUString SAL_CALL getImplementationName( ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); }; OUString SAXEventKeeperImpl_getImplementationName() diff --git a/xmlsecurity/source/framework/securityengine.cxx b/xmlsecurity/source/framework/securityengine.cxx index cefefbfbc6a7..1139ac9f0406 100644 --- a/xmlsecurity/source/framework/securityengine.cxx +++ b/xmlsecurity/source/framework/securityengine.cxx @@ -36,7 +36,7 @@ SecurityEngine::SecurityEngine() /* XReferenceResolvedListener */ void SAL_CALL SecurityEngine::referenceResolved( sal_Int32 /*referenceId*/) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException) + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) { m_nNumOfResolvedReferences++; tryToPerform(); @@ -44,7 +44,7 @@ void SAL_CALL SecurityEngine::referenceResolved( sal_Int32 /*referenceId*/) /* XKeyCollector */ void SAL_CALL SecurityEngine::setKeyId( sal_Int32 id ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException) + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception) { m_nIdOfKeyEC = id; tryToPerform(); @@ -52,7 +52,7 @@ void SAL_CALL SecurityEngine::setKeyId( sal_Int32 id ) /* XMissionTaker */ sal_Bool SAL_CALL SecurityEngine::endMission( ) - throw (com::sun::star::uno::RuntimeException) + throw (com::sun::star::uno::RuntimeException, std::exception) { sal_Bool rc = m_bMissionDone; diff --git a/xmlsecurity/source/framework/securityengine.hxx b/xmlsecurity/source/framework/securityengine.hxx index 3aaac7b94ea3..b44623d9630a 100644 --- a/xmlsecurity/source/framework/securityengine.hxx +++ b/xmlsecurity/source/framework/securityengine.hxx @@ -141,15 +141,15 @@ protected: public: /* XReferenceResolvedListener */ virtual void SAL_CALL referenceResolved( sal_Int32 referenceId ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception); /* XKeyCollector */ virtual void SAL_CALL setKeyId( sal_Int32 id ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception); /* XMissionTaker */ virtual sal_Bool SAL_CALL endMission( ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); }; #endif diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.cxx b/xmlsecurity/source/framework/signaturecreatorimpl.cxx index 7c5519020d0f..d2b0e35690a3 100644 --- a/xmlsecurity/source/framework/signaturecreatorimpl.cxx +++ b/xmlsecurity/source/framework/signaturecreatorimpl.cxx @@ -187,7 +187,7 @@ void SignatureCreatorImpl::clearUp() const /* XBlockerMonitor */ void SAL_CALL SignatureCreatorImpl::setBlockerId( sal_Int32 id ) - throw (cssu::Exception, cssu::RuntimeException) + throw (cssu::Exception, cssu::RuntimeException, std::exception) { m_nIdOfBlocker = id; tryToPerform(); @@ -196,7 +196,7 @@ 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) + throw (cssu::Exception, cssu::RuntimeException, std::exception) { m_xResultListener = listener; tryToPerform(); @@ -204,13 +204,13 @@ void SAL_CALL SignatureCreatorImpl::addSignatureCreationResultListener( void SAL_CALL SignatureCreatorImpl::removeSignatureCreationResultListener( const cssu::Reference< cssxc::sax::XSignatureCreationResultListener >&) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { } /* XInitialization */ void SAL_CALL SignatureCreatorImpl::initialize( const cssu::Sequence< cssu::Any >& aArguments ) - throw (cssu::Exception, cssu::RuntimeException) + throw (cssu::Exception, cssu::RuntimeException, std::exception) { OSL_ASSERT(aArguments.getLength() == 5); @@ -251,19 +251,19 @@ cssu::Reference< cssu::XInterface > SAL_CALL SignatureCreatorImpl_createInstance /* XServiceInfo */ OUString SAL_CALL SignatureCreatorImpl::getImplementationName( ) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { return SignatureCreatorImpl_getImplementationName(); } sal_Bool SAL_CALL SignatureCreatorImpl::supportsService( const OUString& rServiceName ) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } cssu::Sequence< OUString > SAL_CALL SignatureCreatorImpl::getSupportedServiceNames( ) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { return SignatureCreatorImpl_getSupportedServiceNames(); } diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.hxx b/xmlsecurity/source/framework/signaturecreatorimpl.hxx index d2123062e54e..968ac501a67b 100644 --- a/xmlsecurity/source/framework/signaturecreatorimpl.hxx +++ b/xmlsecurity/source/framework/signaturecreatorimpl.hxx @@ -78,31 +78,31 @@ public: /* XBlockerMonitor */ virtual void SAL_CALL setBlockerId( sal_Int32 id ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception); /* XSignatureCreationResultBroadcaster */ void SAL_CALL addSignatureCreationResultListener( const com::sun::star::uno::Reference< com::sun::star::xml::crypto::sax::XSignatureCreationResultListener >& listener ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception); void SAL_CALL removeSignatureCreationResultListener( const com::sun::star::uno::Reference< com::sun::star::xml::crypto::sax::XSignatureCreationResultListener >& listener ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); /* XInitialization */ virtual void SAL_CALL initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception); /* XServiceInfo */ virtual OUString SAL_CALL getImplementationName( ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); }; OUString SignatureCreatorImpl_getImplementationName() diff --git a/xmlsecurity/source/framework/signatureengine.cxx b/xmlsecurity/source/framework/signatureengine.cxx index e289b24a44cc..708e536fdadb 100644 --- a/xmlsecurity/source/framework/signatureengine.cxx +++ b/xmlsecurity/source/framework/signatureengine.cxx @@ -198,14 +198,14 @@ void SignatureEngine::clearUp( ) const /* XReferenceCollector */ void SAL_CALL SignatureEngine::setReferenceCount( sal_Int32 count ) - throw (cssu::Exception, cssu::RuntimeException) + throw (cssu::Exception, cssu::RuntimeException, std::exception) { m_nTotalReferenceNumber = count; tryToPerform(); } void SAL_CALL SignatureEngine::setReferenceId( sal_Int32 id ) - throw (cssu::Exception, cssu::RuntimeException) + throw (cssu::Exception, cssu::RuntimeException, std::exception) { m_vReferenceIds.push_back( id ); } @@ -214,14 +214,14 @@ void SAL_CALL SignatureEngine::setReferenceId( sal_Int32 id ) void SAL_CALL SignatureEngine::setUriBinding( const OUString& uri, const cssu::Reference< com::sun::star::io::XInputStream >& aInputStream ) - throw (cssu::Exception, cssu::RuntimeException) + throw (cssu::Exception, cssu::RuntimeException, std::exception) { m_vUris.push_back(uri); m_vXInputStreams.push_back(aInputStream); } cssu::Reference< com::sun::star::io::XInputStream > SAL_CALL SignatureEngine::getUriBinding( const OUString& uri ) - throw (cssu::Exception, cssu::RuntimeException) + throw (cssu::Exception, cssu::RuntimeException, std::exception) { cssu::Reference< com::sun::star::io::XInputStream > xInputStream; diff --git a/xmlsecurity/source/framework/signatureengine.hxx b/xmlsecurity/source/framework/signatureengine.hxx index ce3d1376d423..2b99bc7a1cfe 100644 --- a/xmlsecurity/source/framework/signatureengine.hxx +++ b/xmlsecurity/source/framework/signatureengine.hxx @@ -112,20 +112,20 @@ protected: public: /* XReferenceCollector */ virtual void SAL_CALL setReferenceCount( sal_Int32 count ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setReferenceId( sal_Int32 id ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception); /* XUriBinding */ virtual void SAL_CALL setUriBinding( const OUString& uri, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& aInputStream ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL getUriBinding( const OUString& uri ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception); }; #endif diff --git a/xmlsecurity/source/framework/signatureverifierimpl.cxx b/xmlsecurity/source/framework/signatureverifierimpl.cxx index c3f26db74c72..054203becb4b 100644 --- a/xmlsecurity/source/framework/signatureverifierimpl.cxx +++ b/xmlsecurity/source/framework/signatureverifierimpl.cxx @@ -141,7 +141,7 @@ void SignatureVerifierImpl::startEngine( const cssu::Reference< /* XSignatureVerifyResultBroadcaster */ void SAL_CALL SignatureVerifierImpl::addSignatureVerifyResultListener( const cssu::Reference< cssxc::sax::XSignatureVerifyResultListener >& listener ) - throw (cssu::Exception, cssu::RuntimeException) + throw (cssu::Exception, cssu::RuntimeException, std::exception) { m_xResultListener = listener; tryToPerform(); @@ -149,14 +149,14 @@ void SAL_CALL SignatureVerifierImpl::addSignatureVerifyResultListener( void SAL_CALL SignatureVerifierImpl::removeSignatureVerifyResultListener( const cssu::Reference< cssxc::sax::XSignatureVerifyResultListener >&) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { } /* XInitialization */ void SAL_CALL SignatureVerifierImpl::initialize( const cssu::Sequence< cssu::Any >& aArguments ) - throw (cssu::Exception, cssu::RuntimeException) + throw (cssu::Exception, cssu::RuntimeException, std::exception) { OSL_ASSERT(aArguments.getLength() == 5); @@ -197,19 +197,19 @@ cssu::Reference< cssu::XInterface > SAL_CALL SignatureVerifierImpl_createInstanc /* XServiceInfo */ OUString SAL_CALL SignatureVerifierImpl::getImplementationName( ) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { return SignatureVerifierImpl_getImplementationName(); } sal_Bool SAL_CALL SignatureVerifierImpl::supportsService( const OUString& rServiceName ) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } cssu::Sequence< OUString > SAL_CALL SignatureVerifierImpl::getSupportedServiceNames( ) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { return SignatureVerifierImpl_getSupportedServiceNames(); } diff --git a/xmlsecurity/source/framework/signatureverifierimpl.hxx b/xmlsecurity/source/framework/signatureverifierimpl.hxx index fce78335f499..f85d2b664d6d 100644 --- a/xmlsecurity/source/framework/signatureverifierimpl.hxx +++ b/xmlsecurity/source/framework/signatureverifierimpl.hxx @@ -75,25 +75,25 @@ public: const com::sun::star::uno::Reference< com::sun::star::xml::crypto::sax::XSignatureVerifyResultListener >& listener ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeSignatureVerifyResultListener( const com::sun::star::uno::Reference< com::sun::star::xml::crypto::sax::XSignatureVerifyResultListener >& listener ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); /* XInitialization */ virtual void SAL_CALL initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments ) - throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception); /* XServiceInfo */ virtual OUString SAL_CALL getImplementationName( ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); }; OUString SignatureVerifierImpl_getImplementationName() diff --git a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx index 5686ae7d278c..9dace2f479a8 100644 --- a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx +++ b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx @@ -40,51 +40,51 @@ XMLEncryptionTemplateImpl :: ~XMLEncryptionTemplateImpl() { /* XXMLEncryptionTemplate */ void SAL_CALL XMLEncryptionTemplateImpl :: setTemplate( const Reference< XXMLElementWrapper >& aTemplate ) - throw (com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException) + throw (com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, std::exception) { m_xTemplate = aTemplate ; } /* XXMLEncryptionTemplate */ Reference< XXMLElementWrapper > SAL_CALL XMLEncryptionTemplateImpl :: getTemplate() -throw (com::sun::star::uno::RuntimeException) +throw (com::sun::star::uno::RuntimeException, std::exception) { return m_xTemplate ; } /* XXMLEncryptionTemplate */ void SAL_CALL XMLEncryptionTemplateImpl :: setTarget( const Reference< XXMLElementWrapper >& aTarget ) - throw( com::sun::star::lang::IllegalArgumentException ) { + throw( com::sun::star::lang::IllegalArgumentException, std::exception ) { m_xTarget = aTarget ; } /* XXMLEncryptionTemplate */ Reference< XXMLElementWrapper > SAL_CALL XMLEncryptionTemplateImpl :: getTarget() -throw (com::sun::star::uno::RuntimeException) +throw (com::sun::star::uno::RuntimeException, std::exception) { return m_xTarget ; } void SAL_CALL XMLEncryptionTemplateImpl::setStatus( ::com::sun::star::xml::crypto::SecurityOperationStatus status ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { m_nStatus = status; } ::com::sun::star::xml::crypto::SecurityOperationStatus SAL_CALL XMLEncryptionTemplateImpl::getStatus( ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return m_nStatus; } /* XServiceInfo */ -OUString SAL_CALL XMLEncryptionTemplateImpl :: getImplementationName() throw( RuntimeException ) { +OUString SAL_CALL XMLEncryptionTemplateImpl :: getImplementationName() throw( RuntimeException, std::exception ) { return impl_getImplementationName() ; } /* XServiceInfo */ -sal_Bool SAL_CALL XMLEncryptionTemplateImpl :: supportsService( const OUString& serviceName) throw( RuntimeException ) { +sal_Bool SAL_CALL XMLEncryptionTemplateImpl :: supportsService( const OUString& serviceName) throw( RuntimeException, std::exception ) { Sequence< OUString > seqServiceNames = getSupportedServiceNames() ; const OUString* pArray = seqServiceNames.getConstArray() ; for( sal_Int32 i = 0 ; i < seqServiceNames.getLength() ; i ++ ) { @@ -95,7 +95,7 @@ sal_Bool SAL_CALL XMLEncryptionTemplateImpl :: supportsService( const OUString& } /* XServiceInfo */ -Sequence< OUString > SAL_CALL XMLEncryptionTemplateImpl :: getSupportedServiceNames() throw( RuntimeException ) { +Sequence< OUString > SAL_CALL XMLEncryptionTemplateImpl :: getSupportedServiceNames() throw( RuntimeException, std::exception ) { return impl_getSupportedServiceNames() ; } diff --git a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx index fb3f6cb3331c..7d09a3406934 100644 --- a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx +++ b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx @@ -52,33 +52,33 @@ class XMLEncryptionTemplateImpl : public ::cppu::WeakImplHelper2< virtual void SAL_CALL setTemplate( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper >& aXmlElement ) - throw (com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException); + throw (com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper > SAL_CALL getTemplate( - ) throw (com::sun::star::uno::RuntimeException); + ) throw (com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setTarget( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper >& aXmlElement - ) throw( com::sun::star::lang::IllegalArgumentException); + ) throw( com::sun::star::lang::IllegalArgumentException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper > SAL_CALL getTarget( - ) throw (com::sun::star::uno::RuntimeException) ; + ) throw (com::sun::star::uno::RuntimeException, std::exception) ; virtual void SAL_CALL setStatus( ::com::sun::star::xml::crypto::SecurityOperationStatus status ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::xml::crypto::SecurityOperationStatus SAL_CALL getStatus( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //Methods from XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName - ) throw( ::com::sun::star::uno::RuntimeException ) ; + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) ; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; //Helper for XServiceInfo static ::com::sun::star::uno::Sequence< OUString > impl_getSupportedServiceNames() ; diff --git a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx index a0d1a81da978..9ec4259d758c 100644 --- a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx +++ b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx @@ -41,26 +41,26 @@ XMLSignatureTemplateImpl :: ~XMLSignatureTemplateImpl() { /* XXMLSignatureTemplate */ void SAL_CALL XMLSignatureTemplateImpl :: setTemplate( const Reference< XXMLElementWrapper >& aTemplate ) - throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException) + throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, std::exception) { m_xTemplate = aTemplate ; } /* XXMLSignatureTemplate */ Reference< XXMLElementWrapper > SAL_CALL XMLSignatureTemplateImpl :: getTemplate() - throw (com::sun::star::uno::RuntimeException) + throw (com::sun::star::uno::RuntimeException, std::exception) { return m_xTemplate ; } void SAL_CALL XMLSignatureTemplateImpl :: setTarget( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper >& aXmlElement ) - throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException) + throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, std::exception) { targets.push_back( aXmlElement ); } ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper > > SAL_CALL XMLSignatureTemplateImpl :: getTargets() - throw (com::sun::star::uno::RuntimeException) + throw (com::sun::star::uno::RuntimeException, std::exception) { sal_Int32 length = targets.size(); ::com::sun::star::uno::Sequence< @@ -80,37 +80,37 @@ void SAL_CALL XMLSignatureTemplateImpl :: setTarget( const ::com::sun::star::uno void SAL_CALL XMLSignatureTemplateImpl::setBinding( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XUriBinding >& aUriBinding ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { m_xUriBinding = aUriBinding; } ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XUriBinding > SAL_CALL XMLSignatureTemplateImpl::getBinding() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return m_xUriBinding; } void SAL_CALL XMLSignatureTemplateImpl::setStatus( ::com::sun::star::xml::crypto::SecurityOperationStatus status ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { m_nStatus = status; } ::com::sun::star::xml::crypto::SecurityOperationStatus SAL_CALL XMLSignatureTemplateImpl::getStatus( ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return m_nStatus; } /* XServiceInfo */ -OUString SAL_CALL XMLSignatureTemplateImpl :: getImplementationName() throw( RuntimeException ) { +OUString SAL_CALL XMLSignatureTemplateImpl :: getImplementationName() throw( RuntimeException, std::exception ) { return impl_getImplementationName() ; } /* XServiceInfo */ -sal_Bool SAL_CALL XMLSignatureTemplateImpl :: supportsService( const OUString& serviceName) throw( RuntimeException ) { +sal_Bool SAL_CALL XMLSignatureTemplateImpl :: supportsService( const OUString& serviceName) throw( RuntimeException, std::exception ) { Sequence< OUString > seqServiceNames = getSupportedServiceNames() ; const OUString* pArray = seqServiceNames.getConstArray() ; for( sal_Int32 i = 0 ; i < seqServiceNames.getLength() ; i ++ ) { @@ -121,7 +121,7 @@ sal_Bool SAL_CALL XMLSignatureTemplateImpl :: supportsService( const OUString& s } /* XServiceInfo */ -Sequence< OUString > SAL_CALL XMLSignatureTemplateImpl :: getSupportedServiceNames() throw( RuntimeException ) { +Sequence< OUString > SAL_CALL XMLSignatureTemplateImpl :: getSupportedServiceNames() throw( RuntimeException, std::exception ) { return impl_getSupportedServiceNames() ; } diff --git a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx index e471e9700007..84523b067266 100644 --- a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx +++ b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx @@ -53,42 +53,42 @@ class XMLSignatureTemplateImpl : public ::cppu::WeakImplHelper2< //Methods from XXMLSignatureTemplate virtual void SAL_CALL setTemplate( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper >& aXmlElement - ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException); + ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper > SAL_CALL getTemplate( - ) throw (com::sun::star::uno::RuntimeException); + ) throw (com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setTarget( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper >& aXmlElement - ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException); + ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper > > SAL_CALL getTargets( - ) throw (com::sun::star::uno::RuntimeException); + ) throw (com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setBinding( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XUriBinding >& aUriBinding ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XUriBinding > SAL_CALL getBinding( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setStatus( ::com::sun::star::xml::crypto::SecurityOperationStatus status ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::xml::crypto::SecurityOperationStatus SAL_CALL getStatus( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //Methods from XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName - ) throw( ::com::sun::star::uno::RuntimeException ) ; + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) ; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; //Helper for XServiceInfo static ::com::sun::star::uno::Sequence< OUString > impl_getSupportedServiceNames() ; diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx index 19ae5c0763eb..6dd1bfac9ce9 100644 --- a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx +++ b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx @@ -49,14 +49,14 @@ void ImplXMLSignatureListener::setNextHandler( } void SAL_CALL ImplXMLSignatureListener::signatureCreated( sal_Int32 securityId, com::sun::star::xml::crypto::SecurityOperationStatus nResult ) - throw (com::sun::star::uno::RuntimeException) + throw (com::sun::star::uno::RuntimeException, std::exception) { XMLSignatureCreationResult aResult( securityId, nResult ); maCreationResultListenerListener.Call( &aResult ); } void SAL_CALL ImplXMLSignatureListener::signatureVerified( sal_Int32 securityId, com::sun::star::xml::crypto::SecurityOperationStatus nResult ) - throw (com::sun::star::uno::RuntimeException) + throw (com::sun::star::uno::RuntimeException, std::exception) { XMLSignatureVerifyResult aResult( securityId, nResult ); maVerifyResultListenerListener.Call( &aResult ); @@ -64,7 +64,7 @@ void SAL_CALL ImplXMLSignatureListener::signatureVerified( sal_Int32 securityId, // XDocumentHandler void SAL_CALL ImplXMLSignatureListener::startDocument( ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException) + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) { if (m_xNextHandler.is()) { @@ -73,7 +73,7 @@ void SAL_CALL ImplXMLSignatureListener::startDocument( ) } void SAL_CALL ImplXMLSignatureListener::endDocument( ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException) + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) { if (m_xNextHandler.is()) { @@ -82,7 +82,7 @@ void SAL_CALL ImplXMLSignatureListener::endDocument( ) } void SAL_CALL ImplXMLSignatureListener::startElement( const OUString& aName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException) + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) { if ( aName == "Signature" ) { @@ -96,7 +96,7 @@ void SAL_CALL ImplXMLSignatureListener::startElement( const OUString& aName, con } void SAL_CALL ImplXMLSignatureListener::endElement( const OUString& aName ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException) + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) { if (m_xNextHandler.is()) { @@ -105,7 +105,7 @@ void SAL_CALL ImplXMLSignatureListener::endElement( const OUString& aName ) } void SAL_CALL ImplXMLSignatureListener::characters( const OUString& aChars ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException) + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) { if (m_xNextHandler.is()) { @@ -114,7 +114,7 @@ void SAL_CALL ImplXMLSignatureListener::characters( const OUString& aChars ) } void SAL_CALL ImplXMLSignatureListener::ignorableWhitespace( const OUString& aWhitespaces ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException) + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) { if (m_xNextHandler.is()) { @@ -123,7 +123,7 @@ void SAL_CALL ImplXMLSignatureListener::ignorableWhitespace( const OUString& aWh } void SAL_CALL ImplXMLSignatureListener::processingInstruction( const OUString& aTarget, const OUString& aData ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException) + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) { if (m_xNextHandler.is()) { @@ -132,7 +132,7 @@ void SAL_CALL ImplXMLSignatureListener::processingInstruction( const OUString& a } void SAL_CALL ImplXMLSignatureListener::setDocumentLocator( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XLocator >& xLocator ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException) + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) { if (m_xNextHandler.is()) { @@ -152,12 +152,12 @@ UriBindingHelper::UriBindingHelper( const com::sun::star::uno::Reference < com:: } void SAL_CALL UriBindingHelper::setUriBinding( const OUString& /*uri*/, const uno::Reference< io::XInputStream >&) - throw (uno::Exception, uno::RuntimeException) + throw (uno::Exception, uno::RuntimeException, std::exception) { } uno::Reference< io::XInputStream > SAL_CALL UriBindingHelper::getUriBinding( const OUString& uri ) - throw (uno::Exception, uno::RuntimeException) + 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 00571e98da52..4735d6f05760 100644 --- a/xmlsecurity/source/helper/xmlsignaturehelper2.hxx +++ b/xmlsecurity/source/helper/xmlsignaturehelper2.hxx @@ -62,36 +62,36 @@ public: // com::sun::star::xml::crypto::sax::XSignatureCreationResultListener virtual void SAL_CALL signatureCreated( sal_Int32 securityId, com::sun::star::xml::crypto::SecurityOperationStatus creationResult ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); // com::sun::star::xml::crypto::sax::XSignatureVerifyResultListener virtual void SAL_CALL signatureVerified( sal_Int32 securityId, com::sun::star::xml::crypto::SecurityOperationStatus verifyResult ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); // com::sun::star::xml::sax::XDocumentHandler virtual void SAL_CALL startElement( const OUString& aName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL startDocument( ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL endDocument( ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL endElement( const OUString& aName ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL characters( const OUString& aChars ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setDocumentLocator( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XLocator >& xLocator ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); }; // XUriBinding @@ -109,10 +109,10 @@ public: UriBindingHelper( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rxStorage ); void SAL_CALL setUriBinding( const OUString& uri, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& aInputStream ) - throw (com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL getUriBinding( const OUString& uri ) - throw (com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); static com::sun::star::uno::Reference < com::sun::star::io::XInputStream > OpenInputStream( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rxStore, const OUString& rURI ); }; diff --git a/xmlsecurity/source/helper/xsecctl.cxx b/xmlsecurity/source/helper/xsecctl.cxx index 15f0f96f6928..8cc87f9c1dec 100644 --- a/xmlsecurity/source/helper/xsecctl.cxx +++ b/xmlsecurity/source/helper/xsecctl.cxx @@ -993,7 +993,7 @@ SignatureInformations XSecController::getSignatureInformations() const */ void SAL_CALL XSecController::blockingStatusChanged( sal_Bool isBlocking ) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { this->m_bIsBlocking = isBlocking; checkChainingStatus(); @@ -1001,14 +1001,14 @@ void SAL_CALL XSecController::blockingStatusChanged( sal_Bool isBlocking ) void SAL_CALL XSecController::collectionStatusChanged( sal_Bool isInsideCollectedElement ) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { this->m_bIsCollectingElement = isInsideCollectedElement; checkChainingStatus(); } void SAL_CALL XSecController::bufferStatusChanged( sal_Bool /*isBufferEmpty*/) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { } @@ -1017,7 +1017,7 @@ void SAL_CALL XSecController::bufferStatusChanged( sal_Bool /*isBufferEmpty*/) * XSignatureCreationResultListener */ void SAL_CALL XSecController::signatureCreated( sal_Int32 securityId, com::sun::star::xml::crypto::SecurityOperationStatus nResult ) - throw (com::sun::star::uno::RuntimeException) + throw (com::sun::star::uno::RuntimeException, std::exception) { int index = findSignatureInfor(securityId); DBG_ASSERT( index != -1, "Signature Not Found!" ); @@ -1031,7 +1031,7 @@ void SAL_CALL XSecController::signatureCreated( sal_Int32 securityId, com::sun:: * XSignatureVerifyResultListener */ void SAL_CALL XSecController::signatureVerified( sal_Int32 securityId, com::sun::star::xml::crypto::SecurityOperationStatus nResult ) - throw (com::sun::star::uno::RuntimeException) + throw (com::sun::star::uno::RuntimeException, std::exception) { int index = findSignatureInfor(securityId); DBG_ASSERT( index != -1, "Signature Not Found!" ); diff --git a/xmlsecurity/source/helper/xsecctl.hxx b/xmlsecurity/source/helper/xsecctl.hxx index 48f0a7822247..0b5469b57541 100644 --- a/xmlsecurity/source/helper/xsecctl.hxx +++ b/xmlsecurity/source/helper/xsecctl.hxx @@ -490,24 +490,24 @@ public: * XSAXEventKeeperStatusChangeListener */ virtual void SAL_CALL blockingStatusChanged( sal_Bool isBlocking ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL collectionStatusChanged( sal_Bool isInsideCollectedElement ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL bufferStatusChanged( sal_Bool isBufferEmpty ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); /* * XSignatureCreationResultListener */ virtual void SAL_CALL signatureCreated( sal_Int32 securityId, com::sun::star::xml::crypto::SecurityOperationStatus nResult ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); /* * XSignatureVerifyResultListener */ virtual void SAL_CALL signatureVerified( sal_Int32 securityId, com::sun::star::xml::crypto::SecurityOperationStatus nResult ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); }; #endif diff --git a/xmlsecurity/source/helper/xsecparser.cxx b/xmlsecurity/source/helper/xsecparser.cxx index afb57e1415f9..1d807ac3f6d3 100644 --- a/xmlsecurity/source/helper/xsecparser.cxx +++ b/xmlsecurity/source/helper/xsecparser.cxx @@ -52,7 +52,7 @@ OUString XSecParser::getIdAttr(const cssu::Reference< cssxs::XAttributeList >& x * XDocumentHandler */ void SAL_CALL XSecParser::startDocument( ) - throw (cssxs::SAXException, cssu::RuntimeException) + throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { m_bInX509IssuerName = false; m_bInX509SerialNumber = false; @@ -68,7 +68,7 @@ void SAL_CALL XSecParser::startDocument( ) } void SAL_CALL XSecParser::endDocument( ) - throw (cssxs::SAXException, cssu::RuntimeException) + throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { if (m_xNextHandler.is()) { @@ -79,7 +79,7 @@ void SAL_CALL XSecParser::endDocument( ) void SAL_CALL XSecParser::startElement( const OUString& aName, const cssu::Reference< cssxs::XAttributeList >& xAttribs ) - throw (cssxs::SAXException, cssu::RuntimeException) + throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { try { @@ -193,7 +193,7 @@ void SAL_CALL XSecParser::startElement( } void SAL_CALL XSecParser::endElement( const OUString& aName ) - throw (cssxs::SAXException, cssu::RuntimeException) + throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { try { @@ -265,7 +265,7 @@ void SAL_CALL XSecParser::endElement( const OUString& aName ) } void SAL_CALL XSecParser::characters( const OUString& aChars ) - throw (cssxs::SAXException, cssu::RuntimeException) + throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { if (m_bInX509IssuerName) { @@ -299,7 +299,7 @@ void SAL_CALL XSecParser::characters( const OUString& aChars ) } void SAL_CALL XSecParser::ignorableWhitespace( const OUString& aWhitespaces ) - throw (cssxs::SAXException, cssu::RuntimeException) + throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { if (m_xNextHandler.is()) { @@ -308,7 +308,7 @@ void SAL_CALL XSecParser::ignorableWhitespace( const OUString& aWhitespaces ) } void SAL_CALL XSecParser::processingInstruction( const OUString& aTarget, const OUString& aData ) - throw (cssxs::SAXException, cssu::RuntimeException) + throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { if (m_xNextHandler.is()) { @@ -317,7 +317,7 @@ 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) + throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { if (m_xNextHandler.is()) { @@ -330,7 +330,7 @@ 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) + 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 f37df23a8a60..03eb1765c151 100644 --- a/xmlsecurity/source/helper/xsecparser.hxx +++ b/xmlsecurity/source/helper/xsecparser.hxx @@ -110,42 +110,42 @@ public: * XDocumentHandler */ virtual void SAL_CALL startDocument( ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL endDocument( ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL startElement( const OUString& aName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL endElement( const OUString& aName ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL characters( const OUString& aChars ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setDocumentLocator( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XLocator >& xLocator ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); /* * XInitialization */ virtual void SAL_CALL initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments ) - throw(com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception); }; #endif diff --git a/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.cxx index 04736cbc5787..551fbe3b90e4 100644 --- a/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.cxx +++ b/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.cxx @@ -40,15 +40,15 @@ CertificateExtension_XmlSecImpl :: ~CertificateExtension_XmlSecImpl() { //Methods from XCertificateExtension -sal_Bool SAL_CALL CertificateExtension_XmlSecImpl :: isCritical() throw( ::com::sun::star::uno::RuntimeException ) { +sal_Bool SAL_CALL CertificateExtension_XmlSecImpl :: isCritical() throw( ::com::sun::star::uno::RuntimeException, std::exception ) { return m_critical ; } -::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL CertificateExtension_XmlSecImpl :: getExtensionId() throw( ::com::sun::star::uno::RuntimeException ) { +::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL CertificateExtension_XmlSecImpl :: getExtensionId() throw( ::com::sun::star::uno::RuntimeException, std::exception ) { return m_xExtnId ; } -::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL CertificateExtension_XmlSecImpl :: getExtensionValue() throw( ::com::sun::star::uno::RuntimeException ) { +::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL CertificateExtension_XmlSecImpl :: getExtensionValue() throw( ::com::sun::star::uno::RuntimeException, std::exception ) { return m_xExtnValue ; } diff --git a/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx index e88149868dbc..6d154f4df516 100644 --- a/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx +++ b/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx @@ -41,11 +41,11 @@ class CertificateExtension_XmlSecImpl : public ::cppu::WeakImplHelper1< virtual ~CertificateExtension_XmlSecImpl() ; //Methods from XCertificateExtension - virtual sal_Bool SAL_CALL isCritical() throw( ::com::sun::star::uno::RuntimeException ) ; + virtual sal_Bool SAL_CALL isCritical() throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getExtensionId() throw( ::com::sun::star::uno::RuntimeException ) ; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getExtensionId() throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getExtensionValue() throw( ::com::sun::star::uno::RuntimeException ) ; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getExtensionValue() throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; void setCertExtn( unsigned char* value, unsigned int vlen, unsigned char* id, unsigned int idlen, sal_Bool critical ) ; } ; diff --git a/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx b/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx index a1b1f08bf72f..ea461c7a8bb1 100644 --- a/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx +++ b/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx @@ -90,7 +90,7 @@ void OCipherContext::Dispose() } uno::Sequence< ::sal_Int8 > SAL_CALL OCipherContext::convertWithCipherContext( const uno::Sequence< ::sal_Int8 >& aData ) - throw ( lang::IllegalArgumentException, lang::DisposedException, uno::RuntimeException) + throw ( lang::IllegalArgumentException, lang::DisposedException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -171,7 +171,7 @@ uno::Sequence< ::sal_Int8 > SAL_CALL OCipherContext::convertWithCipherContext( c } uno::Sequence< ::sal_Int8 > SAL_CALL OCipherContext::finalizeCipherContextAndDispose() - throw (lang::DisposedException, uno::RuntimeException) + 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 04f047debdd6..c1d195ef5510 100644 --- a/xmlsecurity/source/xmlsec/nss/ciphercontext.hxx +++ b/xmlsecurity/source/xmlsec/nss/ciphercontext.hxx @@ -73,8 +73,8 @@ public: static ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XCipherContext > Create( CK_MECHANISM_TYPE nNSSCipherID, const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aKey, const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aInitializationVector, bool bEncryption, bool bW3CPadding ); // XCipherContext - virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL convertWithCipherContext( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aData ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::DisposedException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL finalizeCipherContextAndDispose( ) throw (::com::sun::star::lang::DisposedException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL convertWithCipherContext( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aData ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::DisposedException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL finalizeCipherContextAndDispose( ) throw (::com::sun::star::lang::DisposedException, ::com::sun::star::uno::RuntimeException, std::exception); }; #endif diff --git a/xmlsecurity/source/xmlsec/nss/digestcontext.cxx b/xmlsecurity/source/xmlsec/nss/digestcontext.cxx index 0e4903f7fdc4..0dec799a0380 100644 --- a/xmlsecurity/source/xmlsec/nss/digestcontext.cxx +++ b/xmlsecurity/source/xmlsec/nss/digestcontext.cxx @@ -33,7 +33,7 @@ ODigestContext::~ODigestContext() } void SAL_CALL ODigestContext::updateDigest( const uno::Sequence< ::sal_Int8 >& aData ) - throw (lang::DisposedException, uno::RuntimeException) + throw (lang::DisposedException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -62,7 +62,7 @@ void SAL_CALL ODigestContext::updateDigest( const uno::Sequence< ::sal_Int8 >& a } uno::Sequence< ::sal_Int8 > SAL_CALL ODigestContext::finalizeDigestAndDispose() - throw (lang::DisposedException, uno::RuntimeException) + 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 763c83c58d78..76c8508f286d 100644 --- a/xmlsecurity/source/xmlsec/nss/digestcontext.hxx +++ b/xmlsecurity/source/xmlsec/nss/digestcontext.hxx @@ -52,8 +52,8 @@ public: // XDigestContext - virtual void SAL_CALL updateDigest( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aData ) throw (::com::sun::star::lang::DisposedException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL finalizeDigestAndDispose() throw (::com::sun::star::lang::DisposedException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL updateDigest( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aData ) throw (::com::sun::star::lang::DisposedException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL finalizeDigestAndDispose() throw (::com::sun::star::lang::DisposedException, ::com::sun::star::uno::RuntimeException, std::exception); }; #endif diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx index 5423d2edd48a..530a6dd2575d 100644 --- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx +++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx @@ -404,7 +404,7 @@ 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) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { SECOidTag nNSSDigestID = SEC_OID_UNKNOWN; sal_Int32 nDigestLength = 0; @@ -441,7 +441,7 @@ 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) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { CK_MECHANISM_TYPE nNSSCipherID = 0; bool bW3CPadding = false; @@ -495,19 +495,19 @@ cssu::Reference< cssu::XInterface > SAL_CALL ONSSInitializer_createInstance( con /* XServiceInfo */ OUString SAL_CALL ONSSInitializer::getImplementationName() - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { return ONSSInitializer_getImplementationName(); } sal_Bool SAL_CALL ONSSInitializer::supportsService( const OUString& rServiceName ) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } cssu::Sequence< OUString > SAL_CALL ONSSInitializer::getSupportedServiceNames( ) - throw (cssu::RuntimeException) + 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 5e4fa780e61e..fb2d7f8aef4a 100644 --- a/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx +++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.hxx @@ -47,20 +47,20 @@ public: bool initNSS( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext ); /* XDigestContextSupplier */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XDigestContext > SAL_CALL getDigestContext( ::sal_Int32 nDigestID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aParams ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XDigestContext > SAL_CALL getDigestContext( ::sal_Int32 nDigestID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aParams ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); /* XCipherContextSupplier */ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XCipherContext > SAL_CALL getCipherContext( ::sal_Int32 nCipherID, const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aKey, const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aInitializationVector, ::sal_Bool bEncryption, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aParams ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XCipherContext > SAL_CALL getCipherContext( ::sal_Int32 nCipherID, const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aKey, const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aInitializationVector, ::sal_Bool bEncryption, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aParams ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); /* XServiceInfo */ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; OUString ONSSInitializer_getImplementationName() diff --git a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx index f0782d0d780a..513f4893852e 100644 --- a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx @@ -50,15 +50,15 @@ SanExtensionImpl :: ~SanExtensionImpl() { //Methods from XCertificateExtension -sal_Bool SAL_CALL SanExtensionImpl :: isCritical() throw( ::com::sun::star::uno::RuntimeException ) { +sal_Bool SAL_CALL SanExtensionImpl :: isCritical() throw( ::com::sun::star::uno::RuntimeException, std::exception ) { return m_critical ; } -::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL SanExtensionImpl :: getExtensionId() throw( ::com::sun::star::uno::RuntimeException ) { +::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL SanExtensionImpl :: getExtensionId() throw( ::com::sun::star::uno::RuntimeException, std::exception ) { return m_xExtnId ; } -::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL SanExtensionImpl :: getExtensionValue() throw( ::com::sun::star::uno::RuntimeException ) { +::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL SanExtensionImpl :: getExtensionValue() throw( ::com::sun::star::uno::RuntimeException, std::exception ) { return m_xExtnValue ; } @@ -82,7 +82,7 @@ namespace { } //Methods from XSanExtension -::com::sun::star::uno::Sequence< com::sun::star::security::CertAltNameEntry > SAL_CALL SanExtensionImpl :: getAlternativeNames() throw( ::com::sun::star::uno::RuntimeException ){ +::com::sun::star::uno::Sequence< com::sun::star::security::CertAltNameEntry > SAL_CALL SanExtensionImpl :: getAlternativeNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ){ if (!m_Entries.hasElements()) { diff --git a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx index ec9588da59d7..6a40072f0cac 100644 --- a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx @@ -46,15 +46,15 @@ class SanExtensionImpl : public ::cppu::WeakImplHelper1< virtual ~SanExtensionImpl() ; //Methods from XCertificateExtension - virtual sal_Bool SAL_CALL isCritical() throw( ::com::sun::star::uno::RuntimeException ) ; + virtual sal_Bool SAL_CALL isCritical() throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getExtensionId() throw( ::com::sun::star::uno::RuntimeException ) ; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getExtensionId() throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getExtensionValue() throw( ::com::sun::star::uno::RuntimeException ) ; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getExtensionValue() throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; //Methods from XSanExtension - virtual ::com::sun::star::uno::Sequence< com::sun::star::security::CertAltNameEntry > SAL_CALL getAlternativeNames() throw( ::com::sun::star::uno::RuntimeException ) ; + virtual ::com::sun::star::uno::Sequence< com::sun::star::security::CertAltNameEntry > SAL_CALL getAlternativeNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; //Helper method void setCertExtn( unsigned char* value, unsigned int vlen, unsigned char* id, unsigned int idlen, sal_Bool critical ) ; diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx index 3403d151e547..85844e4c8488 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx @@ -156,12 +156,12 @@ SecurityEnvironment_NssImpl :: ~SecurityEnvironment_NssImpl() { } /* XServiceInfo */ -OUString SAL_CALL SecurityEnvironment_NssImpl :: getImplementationName() throw( RuntimeException ) { +OUString SAL_CALL SecurityEnvironment_NssImpl :: getImplementationName() throw( RuntimeException, std::exception ) { return impl_getImplementationName() ; } /* XServiceInfo */ -sal_Bool SAL_CALL SecurityEnvironment_NssImpl :: supportsService( const OUString& serviceName) throw( RuntimeException ) { +sal_Bool SAL_CALL SecurityEnvironment_NssImpl :: supportsService( const OUString& serviceName) throw( RuntimeException, std::exception ) { Sequence< OUString > seqServiceNames = getSupportedServiceNames() ; const OUString* pArray = seqServiceNames.getConstArray() ; for( sal_Int32 i = 0 ; i < seqServiceNames.getLength() ; i ++ ) { @@ -172,7 +172,7 @@ sal_Bool SAL_CALL SecurityEnvironment_NssImpl :: supportsService( const OUString } /* XServiceInfo */ -Sequence< OUString > SAL_CALL SecurityEnvironment_NssImpl :: getSupportedServiceNames() throw( RuntimeException ) { +Sequence< OUString > SAL_CALL SecurityEnvironment_NssImpl :: getSupportedServiceNames() throw( RuntimeException, std::exception ) { return impl_getSupportedServiceNames() ; } @@ -199,7 +199,7 @@ Reference< XSingleServiceFactory > SecurityEnvironment_NssImpl :: impl_createFac /* XUnoTunnel */ sal_Int64 SAL_CALL SecurityEnvironment_NssImpl :: getSomething( const Sequence< sal_Int8 >& aIdentifier ) - throw( RuntimeException ) + 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)); @@ -218,7 +218,7 @@ const Sequence< sal_Int8>& SecurityEnvironment_NssImpl :: getUnoTunnelId() { return theSecurityEnvironment_NssImplUnoTunnelId::get().getSeq(); } -OUString SecurityEnvironment_NssImpl::getSecurityEnvironmentInformation() throw( ::com::sun::star::uno::RuntimeException ) +OUString SecurityEnvironment_NssImpl::getSecurityEnvironmentInformation() throw( ::com::sun::star::uno::RuntimeException, std::exception ) { OUStringBuffer buff; for (CIT_SLOTS is = m_Slots.begin(); is != m_Slots.end(); is++) @@ -469,7 +469,7 @@ void SecurityEnvironment_NssImpl::updateSlots() Sequence< Reference < XCertificate > > -SecurityEnvironment_NssImpl::getPersonalCertificates() throw( SecurityException , RuntimeException ) +SecurityEnvironment_NssImpl::getPersonalCertificates() throw( SecurityException , RuntimeException, std::exception ) { sal_Int32 length ; X509Certificate_NssImpl* xcert ; @@ -537,7 +537,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 ) +Reference< XCertificate > SecurityEnvironment_NssImpl :: getCertificate( const OUString& issuerName, const Sequence< sal_Int8 >& serialNumber ) throw( SecurityException , RuntimeException, std::exception ) { X509Certificate_NssImpl* xcert = NULL; @@ -603,7 +603,7 @@ Reference< XCertificate > SecurityEnvironment_NssImpl :: getCertificate( const O return getCertificate( issuerName, serial ) ; } -Sequence< Reference < XCertificate > > SecurityEnvironment_NssImpl :: buildCertificatePath( const Reference< XCertificate >& begin ) throw( SecurityException , RuntimeException ) { +Sequence< Reference < XCertificate > > SecurityEnvironment_NssImpl :: buildCertificatePath( const Reference< XCertificate >& begin ) throw( SecurityException , RuntimeException, std::exception ) { const X509Certificate_NssImpl* xcert ; const CERTCertificate* cert ; CERTCertList* certChain ; @@ -659,7 +659,7 @@ Sequence< Reference < XCertificate > > SecurityEnvironment_NssImpl :: buildCerti return Sequence< Reference < XCertificate > >(); } -Reference< XCertificate > SecurityEnvironment_NssImpl :: createCertificateFromRaw( const Sequence< sal_Int8 >& rawCertificate ) throw( SecurityException , RuntimeException ) { +Reference< XCertificate > SecurityEnvironment_NssImpl :: createCertificateFromRaw( const Sequence< sal_Int8 >& rawCertificate ) throw( SecurityException , RuntimeException, std::exception ) { X509Certificate_NssImpl* xcert ; if( rawCertificate.getLength() > 0 ) { @@ -675,7 +675,7 @@ Reference< XCertificate > SecurityEnvironment_NssImpl :: createCertificateFromRa return xcert ; } -Reference< XCertificate > SecurityEnvironment_NssImpl :: createCertificateFromAscii( const OUString& asciiCertificate ) throw( SecurityException , RuntimeException ) +Reference< XCertificate > SecurityEnvironment_NssImpl :: createCertificateFromAscii( const OUString& asciiCertificate ) throw( SecurityException , RuntimeException, std::exception ) { xmlChar* chCert ; xmlSecSize certSize ; @@ -705,7 +705,7 @@ Reference< XCertificate > SecurityEnvironment_NssImpl :: createCertificateFromAs sal_Int32 SecurityEnvironment_NssImpl :: verifyCertificate( const Reference< csss::XCertificate >& aCert, const Sequence< Reference< csss::XCertificate > >& intermediateCerts ) - throw( ::com::sun::star::uno::SecurityException, ::com::sun::star::uno::RuntimeException ) + throw( ::com::sun::star::uno::SecurityException, ::com::sun::star::uno::RuntimeException, std::exception ) { sal_Int32 validity = csss::CertificateValidity::INVALID; const X509Certificate_NssImpl* xcert ; @@ -932,7 +932,7 @@ verifyCertificate( const Reference< csss::XCertificate >& aCert, } sal_Int32 SecurityEnvironment_NssImpl::getCertificateCharacters( - const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& aCert ) throw( ::com::sun::star::uno::SecurityException, ::com::sun::star::uno::RuntimeException ) { + const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& aCert ) throw( ::com::sun::star::uno::SecurityException, ::com::sun::star::uno::RuntimeException, std::exception ) { sal_Int32 characters ; const X509Certificate_NssImpl* xcert ; const CERTCertificate* cert ; diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx index cefc23f2f21c..4646ef9e4e8d 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx @@ -70,13 +70,13 @@ private : //Methods from XSecurityEnvironment //Methods from XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName - ) throw( ::com::sun::star::uno::RuntimeException ) ; + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) ; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; //Helper for XServiceInfo static ::com::sun::star::uno::Sequence< OUString > impl_getSupportedServiceNames() ; @@ -94,15 +94,15 @@ private : const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > > & intermediateCerts) - throw (::com::sun::star::uno::SecurityException, ::com::sun::star::uno::RuntimeException) ; + throw (::com::sun::star::uno::SecurityException, ::com::sun::star::uno::RuntimeException, std::exception) ; - virtual ::sal_Int32 SAL_CALL getCertificateCharacters( const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& xCert ) throw (::com::sun::star::uno::SecurityException, ::com::sun::star::uno::RuntimeException) ; + virtual ::sal_Int32 SAL_CALL getCertificateCharacters( const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& xCert ) throw (::com::sun::star::uno::SecurityException, ::com::sun::star::uno::RuntimeException, std::exception) ; - virtual OUString SAL_CALL getSecurityEnvironmentInformation( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSecurityEnvironmentInformation( ) throw (::com::sun::star::uno::RuntimeException, std::exception); //Methods from XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId() ; @@ -123,15 +123,15 @@ private : virtual void rejectPriKey( SECKEYPrivateKey* aPriKey ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; virtual SECKEYPrivateKey* getPriKey( unsigned int position ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > > SAL_CALL getPersonalCertificates() throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException ) ; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > > SAL_CALL getPersonalCertificates() throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException, std::exception ) ; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL getCertificate( const OUString& issuerName, const ::com::sun::star::uno::Sequence< sal_Int8 >& serialNumber ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException ) ; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL getCertificate( const OUString& issuerName, const ::com::sun::star::uno::Sequence< sal_Int8 >& serialNumber ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException, std::exception ) ; virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL getCertificate( const OUString& issuerName, const OUString& serialNumber ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException ) ; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > > SAL_CALL buildCertificatePath( const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& beginCert ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException ) ; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > > SAL_CALL buildCertificatePath( const ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate >& beginCert ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException, std::exception ) ; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL createCertificateFromRaw( const ::com::sun::star::uno::Sequence< sal_Int8 >& rawCertificate ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException ) ; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL createCertificateFromAscii( const OUString& asciiCertificate ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException ) ; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL createCertificateFromRaw( const ::com::sun::star::uno::Sequence< sal_Int8 >& rawCertificate ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException, std::exception ) ; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificate > SAL_CALL createCertificateFromAscii( const OUString& asciiCertificate ) throw( ::com::sun::star::uno::SecurityException , ::com::sun::star::uno::RuntimeException, std::exception ) ; //Native methods diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx index 813d07d2a38f..6e5ead471df7 100644 --- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx @@ -65,7 +65,7 @@ SEInitializer_NssImpl::~SEInitializer_NssImpl() /* XSEInitializer */ uno::Reference< cssxc::XXMLSecurityContext > SAL_CALL SEInitializer_NssImpl::createSecurityContext( const OUString& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { CERTCertDBHandle *pCertHandle = NULL ; @@ -100,7 +100,7 @@ uno::Reference< cssxc::XXMLSecurityContext > SAL_CALL } void SAL_CALL SEInitializer_NssImpl::freeSecurityContext( const uno::Reference< cssxc::XXMLSecurityContext >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { /* * because the security context will free all its content when it @@ -141,17 +141,17 @@ uno::Reference< uno::XInterface > SAL_CALL SEInitializer_NssImpl_createInstance( /* XServiceInfo */ OUString SAL_CALL SEInitializer_NssImpl::getImplementationName( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return SEInitializer_NssImpl_getImplementationName(); } sal_Bool SAL_CALL SEInitializer_NssImpl::supportsService( const OUString& rServiceName ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return SEInitializer_NssImpl_supportsService( rServiceName ); } uno::Sequence< OUString > SAL_CALL SEInitializer_NssImpl::getSupportedServiceNames( ) - throw (uno::RuntimeException) + 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 f379edc7772a..1125736396b9 100644 --- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx @@ -43,21 +43,21 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSecurityContext > SAL_CALL createSecurityContext( const OUString& ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL freeSecurityContext( const com::sun::star::uno::Reference< com::sun::star::xml::crypto::XXMLSecurityContext >& securityContext ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); /* XServiceInfo */ virtual OUString SAL_CALL getImplementationName( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; OUString SEInitializer_NssImpl_getImplementationName() diff --git a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx index 02836e315e40..452d1a130637 100644 --- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx @@ -53,7 +53,7 @@ X509Certificate_NssImpl :: ~X509Certificate_NssImpl() { } //Methods from XCertificate -sal_Int16 SAL_CALL X509Certificate_NssImpl :: getVersion() throw ( ::com::sun::star::uno::RuntimeException) { +sal_Int16 SAL_CALL X509Certificate_NssImpl :: getVersion() throw ( ::com::sun::star::uno::RuntimeException, std::exception) { if( m_pCert != NULL ) { if( m_pCert->version.len > 0 ) { return ( char )*( m_pCert->version.data ) ; @@ -64,7 +64,7 @@ sal_Int16 SAL_CALL X509Certificate_NssImpl :: getVersion() throw ( ::com::sun::s } } -::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl :: getSerialNumber() throw ( ::com::sun::star::uno::RuntimeException) { +::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl :: getSerialNumber() throw ( ::com::sun::star::uno::RuntimeException, std::exception) { if( m_pCert != NULL && m_pCert->serialNumber.len > 0 ) { Sequence< sal_Int8 > serial( m_pCert->serialNumber.len ) ; for( unsigned int i = 0 ; i < m_pCert->serialNumber.len ; i ++ ) @@ -76,7 +76,7 @@ sal_Int16 SAL_CALL X509Certificate_NssImpl :: getVersion() throw ( ::com::sun::s } } -OUString SAL_CALL X509Certificate_NssImpl :: getIssuerName() throw ( ::com::sun::star::uno::RuntimeException) { +OUString SAL_CALL X509Certificate_NssImpl :: getIssuerName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) { if( m_pCert != NULL ) { return OUString(m_pCert->issuerName , PL_strlen(m_pCert->issuerName) , RTL_TEXTENCODING_UTF8) ; } else { @@ -84,7 +84,7 @@ OUString SAL_CALL X509Certificate_NssImpl :: getIssuerName() throw ( ::com::sun: } } -OUString SAL_CALL X509Certificate_NssImpl :: getSubjectName() throw ( ::com::sun::star::uno::RuntimeException) { +OUString SAL_CALL X509Certificate_NssImpl :: getSubjectName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) { if( m_pCert != NULL ) { return OUString(m_pCert->subjectName , PL_strlen(m_pCert->subjectName) , RTL_TEXTENCODING_UTF8); } else { @@ -92,7 +92,7 @@ OUString SAL_CALL X509Certificate_NssImpl :: getSubjectName() throw ( ::com::sun } } -::com::sun::star::util::DateTime SAL_CALL X509Certificate_NssImpl :: getNotValidBefore() throw ( ::com::sun::star::uno::RuntimeException) { +::com::sun::star::util::DateTime SAL_CALL X509Certificate_NssImpl :: getNotValidBefore() throw ( ::com::sun::star::uno::RuntimeException, std::exception) { if( m_pCert != NULL ) { SECStatus rv ; PRTime notBefore ; @@ -121,7 +121,7 @@ OUString SAL_CALL X509Certificate_NssImpl :: getSubjectName() throw ( ::com::sun } } -::com::sun::star::util::DateTime SAL_CALL X509Certificate_NssImpl :: getNotValidAfter() throw ( ::com::sun::star::uno::RuntimeException) { +::com::sun::star::util::DateTime SAL_CALL X509Certificate_NssImpl :: getNotValidAfter() throw ( ::com::sun::star::uno::RuntimeException, std::exception) { if( m_pCert != NULL ) { SECStatus rv ; PRTime notAfter ; @@ -150,7 +150,7 @@ OUString SAL_CALL X509Certificate_NssImpl :: getSubjectName() throw ( ::com::sun } } -::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl :: getIssuerUniqueID() throw ( ::com::sun::star::uno::RuntimeException) { +::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl :: getIssuerUniqueID() throw ( ::com::sun::star::uno::RuntimeException, std::exception) { if( m_pCert != NULL && m_pCert->issuerID.len > 0 ) { Sequence< sal_Int8 > issuerUid( m_pCert->issuerID.len ) ; for( unsigned int i = 0 ; i < m_pCert->issuerID.len ; i ++ ) @@ -162,7 +162,7 @@ OUString SAL_CALL X509Certificate_NssImpl :: getSubjectName() throw ( ::com::sun } } -::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl :: getSubjectUniqueID() throw ( ::com::sun::star::uno::RuntimeException) { +::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl :: getSubjectUniqueID() throw ( ::com::sun::star::uno::RuntimeException, std::exception) { if( m_pCert != NULL && m_pCert->subjectID.len > 0 ) { Sequence< sal_Int8 > subjectUid( m_pCert->subjectID.len ) ; for( unsigned int i = 0 ; i < m_pCert->subjectID.len ; i ++ ) @@ -174,7 +174,7 @@ OUString SAL_CALL X509Certificate_NssImpl :: getSubjectName() throw ( ::com::sun } } -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificateExtension > > SAL_CALL X509Certificate_NssImpl :: getExtensions() throw ( ::com::sun::star::uno::RuntimeException) { +::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificateExtension > > SAL_CALL X509Certificate_NssImpl :: getExtensions() throw ( ::com::sun::star::uno::RuntimeException, std::exception) { if( m_pCert != NULL && m_pCert->extensions != NULL ) { CERTCertExtension** extns ; CertificateExtension_XmlSecImpl* pExtn ; @@ -216,7 +216,7 @@ OUString SAL_CALL X509Certificate_NssImpl :: getSubjectName() throw ( ::com::sun } } -::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificateExtension > SAL_CALL X509Certificate_NssImpl :: findCertificateExtension( const ::com::sun::star::uno::Sequence< sal_Int8 >& oid ) throw (::com::sun::star::uno::RuntimeException) { +::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificateExtension > SAL_CALL X509Certificate_NssImpl :: findCertificateExtension( const ::com::sun::star::uno::Sequence< sal_Int8 >& oid ) throw (::com::sun::star::uno::RuntimeException, std::exception) { if( m_pCert != NULL && m_pCert->extensions != NULL ) { CertificateExtension_XmlSecImpl* pExtn ; CERTCertExtension** extns ; @@ -251,7 +251,7 @@ OUString SAL_CALL X509Certificate_NssImpl :: getSubjectName() throw ( ::com::sun } -::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl :: getEncoded() throw ( ::com::sun::star::uno::RuntimeException) { +::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl :: getEncoded() throw ( ::com::sun::star::uno::RuntimeException, std::exception) { if( m_pCert != NULL && m_pCert->derCert.len > 0 ) { Sequence< sal_Int8 > rawCert( m_pCert->derCert.len ) ; @@ -304,7 +304,7 @@ void X509Certificate_NssImpl :: setRawCert( Sequence< sal_Int8 > rawCert ) throw } /* XUnoTunnel */ -sal_Int64 SAL_CALL X509Certificate_NssImpl :: getSomething( const Sequence< sal_Int8 >& aIdentifier ) throw( RuntimeException ) { +sal_Int64 SAL_CALL X509Certificate_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)); } @@ -355,7 +355,7 @@ OUString getAlgorithmDescription(SECAlgorithmID *aid) } OUString SAL_CALL X509Certificate_NssImpl::getSubjectPublicKeyAlgorithm() - throw ( ::com::sun::star::uno::RuntimeException) + throw ( ::com::sun::star::uno::RuntimeException, std::exception) { if( m_pCert != NULL ) { @@ -368,7 +368,7 @@ OUString SAL_CALL X509Certificate_NssImpl::getSubjectPublicKeyAlgorithm() } ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getSubjectPublicKeyValue() - throw ( ::com::sun::star::uno::RuntimeException) + throw ( ::com::sun::star::uno::RuntimeException, std::exception) { if( m_pCert != NULL ) { @@ -391,7 +391,7 @@ OUString SAL_CALL X509Certificate_NssImpl::getSubjectPublicKeyAlgorithm() } OUString SAL_CALL X509Certificate_NssImpl::getSignatureAlgorithm() - throw ( ::com::sun::star::uno::RuntimeException) + throw ( ::com::sun::star::uno::RuntimeException, std::exception) { if( m_pCert != NULL ) { @@ -404,19 +404,19 @@ OUString SAL_CALL X509Certificate_NssImpl::getSignatureAlgorithm() } ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getSHA1Thumbprint() - throw ( ::com::sun::star::uno::RuntimeException) + throw ( ::com::sun::star::uno::RuntimeException, std::exception) { return getThumbprint(m_pCert, SEC_OID_SHA1); } ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL X509Certificate_NssImpl::getMD5Thumbprint() - throw ( ::com::sun::star::uno::RuntimeException) + throw ( ::com::sun::star::uno::RuntimeException, std::exception) { return getThumbprint(m_pCert, SEC_OID_MD5); } sal_Int32 SAL_CALL X509Certificate_NssImpl::getCertificateUsage( ) - throw ( ::com::sun::star::uno::RuntimeException) + throw ( ::com::sun::star::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 ccc721151519..e3e2600fbb30 100644 --- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx @@ -43,44 +43,44 @@ class X509Certificate_NssImpl : public ::cppu::WeakImplHelper2< virtual ~X509Certificate_NssImpl() ; //Methods from XCertificate - virtual sal_Int16 SAL_CALL getVersion( ) throw ( ::com::sun::star::uno::RuntimeException) ; + virtual sal_Int16 SAL_CALL getVersion( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) ; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getSerialNumber( ) throw ( ::com::sun::star::uno::RuntimeException) ; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getSerialNumber( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) ; - virtual OUString SAL_CALL getIssuerName( ) throw ( ::com::sun::star::uno::RuntimeException) ; - virtual OUString SAL_CALL getSubjectName( ) throw ( ::com::sun::star::uno::RuntimeException) ; + virtual OUString SAL_CALL getIssuerName( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) ; + virtual OUString SAL_CALL getSubjectName( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) ; - virtual ::com::sun::star::util::DateTime SAL_CALL getNotValidBefore( ) throw ( ::com::sun::star::uno::RuntimeException) ; - virtual ::com::sun::star::util::DateTime SAL_CALL getNotValidAfter( ) throw ( ::com::sun::star::uno::RuntimeException) ; + virtual ::com::sun::star::util::DateTime SAL_CALL getNotValidBefore( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) ; + virtual ::com::sun::star::util::DateTime SAL_CALL getNotValidAfter( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) ; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getIssuerUniqueID( ) throw ( ::com::sun::star::uno::RuntimeException) ; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getSubjectUniqueID( ) throw ( ::com::sun::star::uno::RuntimeException) ; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getIssuerUniqueID( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) ; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getSubjectUniqueID( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) ; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificateExtension > > SAL_CALL getExtensions( ) throw ( ::com::sun::star::uno::RuntimeException) ; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificateExtension > > SAL_CALL getExtensions( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) ; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificateExtension > SAL_CALL findCertificateExtension( const ::com::sun::star::uno::Sequence< sal_Int8 >& oid ) throw (::com::sun::star::uno::RuntimeException) ; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::security::XCertificateExtension > SAL_CALL findCertificateExtension( const ::com::sun::star::uno::Sequence< sal_Int8 >& oid ) throw (::com::sun::star::uno::RuntimeException, std::exception) ; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getEncoded( ) throw ( ::com::sun::star::uno::RuntimeException) ; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getEncoded( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) ; virtual OUString SAL_CALL getSubjectPublicKeyAlgorithm() - throw ( ::com::sun::star::uno::RuntimeException) ; + throw ( ::com::sun::star::uno::RuntimeException, std::exception) ; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getSubjectPublicKeyValue() - throw ( ::com::sun::star::uno::RuntimeException) ; + throw ( ::com::sun::star::uno::RuntimeException, std::exception) ; virtual OUString SAL_CALL getSignatureAlgorithm() - throw ( ::com::sun::star::uno::RuntimeException) ; + throw ( ::com::sun::star::uno::RuntimeException, std::exception) ; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getSHA1Thumbprint() - throw ( ::com::sun::star::uno::RuntimeException) ; + throw ( ::com::sun::star::uno::RuntimeException, std::exception) ; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getMD5Thumbprint() - throw ( ::com::sun::star::uno::RuntimeException) ; + throw ( ::com::sun::star::uno::RuntimeException, std::exception) ; - virtual sal_Int32 SAL_CALL getCertificateUsage( ) throw ( ::com::sun::star::uno::RuntimeException) ; + virtual sal_Int32 SAL_CALL getCertificateUsage( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception) ; //Methods from XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw (com::sun::star::uno::RuntimeException); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw (com::sun::star::uno::RuntimeException, std::exception); static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId() ; diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx index 7519362e4b0e..4c47f8a15c8f 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx @@ -55,7 +55,7 @@ SAL_CALL XMLEncryption_NssImpl :: encrypt( const Reference< XXMLEncryptionTemplate >& aTemplate , const Reference< XSecurityEnvironment >& aEnvironment ) throw( com::sun::star::xml::crypto::XMLEncryptionException, - com::sun::star::uno::SecurityException ) + com::sun::star::uno::SecurityException, std::exception ) { xmlSecKeysMngrPtr pMngr = NULL ; xmlSecEncCtxPtr pEncCtx = NULL ; @@ -193,7 +193,7 @@ SAL_CALL XMLEncryption_NssImpl :: decrypt( const Reference< XXMLEncryptionTemplate >& aTemplate , const Reference< XXMLSecurityContext >& aSecurityCtx ) throw( com::sun::star::xml::crypto::XMLEncryptionException , - com::sun::star::uno::SecurityException) { + com::sun::star::uno::SecurityException, std::exception) { xmlSecKeysMngrPtr pMngr = NULL ; xmlSecEncCtxPtr pEncCtx = NULL ; xmlNodePtr pEncryptedData = NULL ; @@ -307,12 +307,12 @@ SAL_CALL XMLEncryption_NssImpl :: decrypt( } /* XServiceInfo */ -OUString SAL_CALL XMLEncryption_NssImpl :: getImplementationName() throw( RuntimeException ) { +OUString SAL_CALL XMLEncryption_NssImpl :: getImplementationName() throw( RuntimeException, std::exception ) { return impl_getImplementationName() ; } /* XServiceInfo */ -sal_Bool SAL_CALL XMLEncryption_NssImpl :: supportsService( const OUString& serviceName) throw( RuntimeException ) { +sal_Bool SAL_CALL XMLEncryption_NssImpl :: supportsService( const OUString& serviceName) throw( RuntimeException, std::exception ) { Sequence< OUString > seqServiceNames = getSupportedServiceNames() ; const OUString* pArray = seqServiceNames.getConstArray() ; for( sal_Int32 i = 0 ; i < seqServiceNames.getLength() ; i ++ ) { @@ -323,7 +323,7 @@ sal_Bool SAL_CALL XMLEncryption_NssImpl :: supportsService( const OUString& serv } /* XServiceInfo */ -Sequence< OUString > SAL_CALL XMLEncryption_NssImpl :: getSupportedServiceNames() throw( RuntimeException ) { +Sequence< OUString > SAL_CALL XMLEncryption_NssImpl :: getSupportedServiceNames() throw( RuntimeException, std::exception ) { return impl_getSupportedServiceNames() ; } diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx index 433a6d8a78df..c2679c26ff11 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx @@ -51,22 +51,22 @@ class XMLEncryption_NssImpl : public ::cppu::WeakImplHelper2< const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment >& aEnvironment) // ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ; throw ( com::sun::star::xml::crypto::XMLEncryptionException , - com::sun::star::uno::SecurityException); + com::sun::star::uno::SecurityException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLEncryptionTemplate > SAL_CALL decrypt( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLEncryptionTemplate >& aTemplate , const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSecurityContext >& aContext ) throw( com::sun::star::xml::crypto::XMLEncryptionException , - com::sun::star::uno::SecurityException) ; + com::sun::star::uno::SecurityException, std::exception) ; //Methods from XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName - ) throw( ::com::sun::star::uno::RuntimeException ) ; + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) ; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; //Helper for XServiceInfo static ::com::sun::star::uno::Sequence< OUString > impl_getSupportedServiceNames() ; diff --git a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx index 7d1e669ed89d..6e6dd2f57178 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx @@ -69,7 +69,7 @@ XMLSecurityContext_NssImpl :: ~XMLSecurityContext_NssImpl() { //i39448 : new methods sal_Int32 SAL_CALL XMLSecurityContext_NssImpl::addSecurityEnvironment( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment >& aSecurityEnvironment) - throw (::com::sun::star::security::SecurityInfrastructureException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::security::SecurityInfrastructureException, ::com::sun::star::uno::RuntimeException, std::exception) { if( !aSecurityEnvironment.is() ) { @@ -83,14 +83,14 @@ sal_Int32 SAL_CALL XMLSecurityContext_NssImpl::addSecurityEnvironment( sal_Int32 SAL_CALL XMLSecurityContext_NssImpl::getSecurityEnvironmentNumber( ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return m_vSecurityEnvironments.size(); } ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > SAL_CALL XMLSecurityContext_NssImpl::getSecurityEnvironmentByIndex( sal_Int32 index ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > xSecurityEnvironment; @@ -106,7 +106,7 @@ sal_Int32 SAL_CALL XMLSecurityContext_NssImpl::getSecurityEnvironmentNumber( ) ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > SAL_CALL XMLSecurityContext_NssImpl::getSecurityEnvironment( ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { if (m_nDefaultEnvIndex >= 0 && m_nDefaultEnvIndex < ( sal_Int32 )m_vSecurityEnvironments.size()) return getSecurityEnvironmentByIndex(m_nDefaultEnvIndex); @@ -115,13 +115,13 @@ sal_Int32 SAL_CALL XMLSecurityContext_NssImpl::getSecurityEnvironmentNumber( ) } sal_Int32 SAL_CALL XMLSecurityContext_NssImpl::getDefaultSecurityEnvironmentIndex( ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return m_nDefaultEnvIndex ; } void SAL_CALL XMLSecurityContext_NssImpl::setDefaultSecurityEnvironmentIndex( sal_Int32 nDefaultEnvIndex ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { m_nDefaultEnvIndex = nDefaultEnvIndex; } @@ -130,12 +130,12 @@ void SAL_CALL XMLSecurityContext_NssImpl::setDefaultSecurityEnvironmentIndex( sa /* XServiceInfo */ -OUString SAL_CALL XMLSecurityContext_NssImpl :: getImplementationName() throw( RuntimeException ) { +OUString SAL_CALL XMLSecurityContext_NssImpl :: getImplementationName() throw( RuntimeException, std::exception ) { return impl_getImplementationName() ; } /* XServiceInfo */ -sal_Bool SAL_CALL XMLSecurityContext_NssImpl :: supportsService( const OUString& serviceName) throw( RuntimeException ) { +sal_Bool SAL_CALL XMLSecurityContext_NssImpl :: supportsService( const OUString& serviceName) throw( RuntimeException, std::exception ) { Sequence< OUString > seqServiceNames = getSupportedServiceNames() ; const OUString* pArray = seqServiceNames.getConstArray() ; for( sal_Int32 i = 0 ; i < seqServiceNames.getLength() ; i ++ ) { @@ -146,7 +146,7 @@ sal_Bool SAL_CALL XMLSecurityContext_NssImpl :: supportsService( const OUString& } /* XServiceInfo */ -Sequence< OUString > SAL_CALL XMLSecurityContext_NssImpl :: getSupportedServiceNames() throw( RuntimeException ) { +Sequence< OUString > SAL_CALL XMLSecurityContext_NssImpl :: getSupportedServiceNames() throw( RuntimeException, std::exception ) { return impl_getSupportedServiceNames() ; } diff --git a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx index e48cb234f6bb..69c80e2868d4 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx @@ -54,35 +54,35 @@ class XMLSecurityContext_NssImpl : public ::cppu::WeakImplHelper2< //Methods from XXMLSecurityContext virtual sal_Int32 SAL_CALL addSecurityEnvironment( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment >& aSecurityEnvironment - ) throw (::com::sun::star::security::SecurityInfrastructureException, ::com::sun::star::uno::RuntimeException); + ) throw (::com::sun::star::security::SecurityInfrastructureException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::sal_Int32 SAL_CALL getSecurityEnvironmentNumber( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > SAL_CALL getSecurityEnvironmentByIndex( ::sal_Int32 index ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > SAL_CALL getSecurityEnvironment( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::sal_Int32 SAL_CALL getDefaultSecurityEnvironmentIndex( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setDefaultSecurityEnvironmentIndex( sal_Int32 nDefaultEnvIndex ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //Methods from XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName - ) throw( ::com::sun::star::uno::RuntimeException ) ; + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) ; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; //Helper for XServiceInfo static ::com::sun::star::uno::Sequence< OUString > impl_getSupportedServiceNames() ; diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx index 3362952ae7c8..afb09f3c92f5 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx @@ -59,7 +59,7 @@ SAL_CALL XMLSignature_NssImpl :: generate( const Reference< XXMLSignatureTemplate >& aTemplate , const Reference< XSecurityEnvironment >& aEnvironment ) throw( com::sun::star::xml::crypto::XMLSignatureException, - com::sun::star::uno::SecurityException ) + com::sun::star::uno::SecurityException, std::exception ) { xmlSecKeysMngrPtr pMngr = NULL ; xmlSecDSigCtxPtr pDsigCtx = NULL ; @@ -164,7 +164,7 @@ SAL_CALL XMLSignature_NssImpl :: validate( const Reference< XXMLSecurityContext >& aSecurityCtx ) throw( com::sun::star::uno::RuntimeException, com::sun::star::uno::SecurityException, - com::sun::star::xml::crypto::XMLSignatureException ) { + com::sun::star::xml::crypto::XMLSignatureException, std::exception ) { xmlSecKeysMngrPtr pMngr = NULL ; xmlSecDSigCtxPtr pDsigCtx = NULL ; xmlNodePtr pNode = NULL ; @@ -272,12 +272,12 @@ SAL_CALL XMLSignature_NssImpl :: validate( } /* XServiceInfo */ -OUString SAL_CALL XMLSignature_NssImpl :: getImplementationName() throw( RuntimeException ) { +OUString SAL_CALL XMLSignature_NssImpl :: getImplementationName() throw( RuntimeException, std::exception ) { return impl_getImplementationName() ; } /* XServiceInfo */ -sal_Bool SAL_CALL XMLSignature_NssImpl :: supportsService( const OUString& serviceName) throw( RuntimeException ) { +sal_Bool SAL_CALL XMLSignature_NssImpl :: supportsService( const OUString& serviceName) throw( RuntimeException, std::exception ) { Sequence< OUString > seqServiceNames = getSupportedServiceNames() ; const OUString* pArray = seqServiceNames.getConstArray() ; for( sal_Int32 i = 0 ; i < seqServiceNames.getLength() ; i ++ ) { @@ -288,7 +288,7 @@ sal_Bool SAL_CALL XMLSignature_NssImpl :: supportsService( const OUString& servi } /* XServiceInfo */ -Sequence< OUString > SAL_CALL XMLSignature_NssImpl :: getSupportedServiceNames() throw( RuntimeException ) { +Sequence< OUString > SAL_CALL XMLSignature_NssImpl :: getSupportedServiceNames() throw( RuntimeException, std::exception ) { return impl_getSupportedServiceNames() ; } diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx index 6c27b53d26ef..593eff0c7757 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx @@ -50,23 +50,23 @@ class XMLSignature_NssImpl : public ::cppu::WeakImplHelper2< const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSignatureTemplate >& aTemplate , const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment >& aEnvironment ) throw( com::sun::star::xml::crypto::XMLSignatureException, - com::sun::star::uno::SecurityException) ; + com::sun::star::uno::SecurityException, std::exception) ; virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSignatureTemplate > SAL_CALL validate( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSignatureTemplate >& aTemplate , const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSecurityContext >& aContext ) throw( com::sun::star::uno::RuntimeException, com::sun::star::uno::SecurityException, - com::sun::star::xml::crypto::XMLSignatureException); + com::sun::star::xml::crypto::XMLSignatureException, std::exception); //Methods from XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName - ) throw( ::com::sun::star::uno::RuntimeException ) ; + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) ; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; //Helper for XServiceInfo static ::com::sun::star::uno::Sequence< OUString > impl_getSupportedServiceNames() ; diff --git a/xmlsecurity/source/xmlsec/serialnumberadapter.cxx b/xmlsecurity/source/xmlsec/serialnumberadapter.cxx index c441c48b44c6..b41e343376d5 100644 --- a/xmlsecurity/source/xmlsec/serialnumberadapter.cxx +++ b/xmlsecurity/source/xmlsec/serialnumberadapter.cxx @@ -50,25 +50,25 @@ private: virtual ~Service() {} virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return xml_security::serial_number_adapter::implementationName(); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return xml_security::serial_number_adapter::serviceNames(); } virtual OUString SAL_CALL toString( css::uno::Sequence< sal_Int8 > const & SerialNumber) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return bigIntegerToNumericString(SerialNumber); } virtual css::uno::Sequence< sal_Int8 > SAL_CALL toSequence( OUString const & SerialNumber) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return numericStringToBigInteger(SerialNumber); } }; diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx index 082a5aa3b434..1e6e8cbc365e 100644 --- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx +++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx @@ -720,21 +720,21 @@ void XMLDocumentWrapper_XmlSecImpl::rebuildIDLink(xmlNodePtr pNode) const /* XXMLDocumentWrapper */ cssu::Reference< cssxw::XXMLElementWrapper > SAL_CALL XMLDocumentWrapper_XmlSecImpl::getCurrentElement( ) - throw (cssu::RuntimeException) + 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) + throw (cssu::RuntimeException, std::exception) { m_pCurrentElement = checkElement( element ); saxHelper.setCurrentNode( m_pCurrentElement ); } void SAL_CALL XMLDocumentWrapper_XmlSecImpl::removeCurrentElement( ) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { OSL_ASSERT( m_pCurrentElement != NULL ); @@ -760,14 +760,14 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::removeCurrentElement( ) } sal_Bool SAL_CALL XMLDocumentWrapper_XmlSecImpl::isCurrent( const cssu::Reference< cssxw::XXMLElementWrapper >& node ) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { xmlNodePtr pNode = checkElement(node); return (pNode == m_pCurrentElement); } sal_Bool SAL_CALL XMLDocumentWrapper_XmlSecImpl::isCurrentElementEmpty( ) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { sal_Bool rc = sal_False; @@ -780,7 +780,7 @@ sal_Bool SAL_CALL XMLDocumentWrapper_XmlSecImpl::isCurrentElementEmpty( ) } OUString SAL_CALL XMLDocumentWrapper_XmlSecImpl::getNodeName( const cssu::Reference< cssxw::XXMLElementWrapper >& node ) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { xmlNodePtr pNode = checkElement(node); return OUString(C2U ( (sal_Char*)pNode->name )); @@ -790,7 +790,7 @@ 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) + throw (cssu::RuntimeException, std::exception) { xmlNodePtr pTargetNode = checkElement(node); @@ -804,7 +804,7 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::clearUselessData( } void SAL_CALL XMLDocumentWrapper_XmlSecImpl::collapse( const cssu::Reference< cssxw::XXMLElementWrapper >& node ) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { xmlNodePtr pTargetNode = checkElement(node); xmlNodePtr pParent; @@ -823,7 +823,7 @@ 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) + throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { if (m_pRootElement != NULL) { @@ -868,7 +868,7 @@ 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) + throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { /* * The first SAX event is the startElement of the startNode @@ -942,7 +942,7 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::generateSAXEvents( void SAL_CALL XMLDocumentWrapper_XmlSecImpl::rebuildIDLink( const com::sun::star::uno::Reference< com::sun::star::xml::wrapper::XXMLElementWrapper >& node ) - throw (com::sun::star::uno::RuntimeException) + throw (com::sun::star::uno::RuntimeException, std::exception) { xmlNodePtr pNode = checkElement( node ); rebuildIDLink(pNode); @@ -951,17 +951,17 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::rebuildIDLink( /* cssxs::XDocumentHandler */ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::startDocument( ) - throw (cssxs::SAXException, cssu::RuntimeException) + throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { } void SAL_CALL XMLDocumentWrapper_XmlSecImpl::endDocument( ) - throw (cssxs::SAXException, cssu::RuntimeException) + 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) + throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { sal_Int32 nLength = xAttribs->getLength(); cssu::Sequence< cssxcsax::XMLAttribute > aAttributes (nLength); @@ -976,49 +976,49 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::startElement( const OUString& aName } void SAL_CALL XMLDocumentWrapper_XmlSecImpl::endElement( const OUString& aName ) - throw (cssxs::SAXException, cssu::RuntimeException) + 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) + throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { saxHelper.characters(aChars); } void SAL_CALL XMLDocumentWrapper_XmlSecImpl::ignorableWhitespace( const OUString& aWhitespaces ) - throw (cssxs::SAXException, cssu::RuntimeException) + 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) + throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { saxHelper.processingInstruction(aTarget, aData); } void SAL_CALL XMLDocumentWrapper_XmlSecImpl::setDocumentLocator( const cssu::Reference< cssxs::XLocator >& xLocator ) - throw (cssxs::SAXException, cssu::RuntimeException) + throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { saxHelper.setDocumentLocator(xLocator); } /* XCompressedDocumentHandler */ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_startDocument( ) - throw (cssxs::SAXException, cssu::RuntimeException) + throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { } void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_endDocument( ) - throw (cssxs::SAXException, cssu::RuntimeException) + throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { } void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_startElement( const OUString& aName, const cssu::Sequence< cssxcsax::XMLAttribute >& aAttributes ) - throw (cssxs::SAXException, cssu::RuntimeException) + throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { saxHelper.startElement(aName, aAttributes); m_pCurrentElement = saxHelper.getCurrentNode(); @@ -1027,31 +1027,31 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_startElement( const OUString& aNam } void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_endElement( const OUString& aName ) - throw (cssxs::SAXException, cssu::RuntimeException) + throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { endElement( aName ); } void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_characters( const OUString& aChars ) - throw (cssxs::SAXException, cssu::RuntimeException) + throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { characters( aChars ); } void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_ignorableWhitespace( const OUString& aWhitespaces ) - throw (cssxs::SAXException, cssu::RuntimeException) + throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { ignorableWhitespace( aWhitespaces ); } void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_processingInstruction( const OUString& aTarget, const OUString& aData ) - throw (cssxs::SAXException, cssu::RuntimeException) + throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { processingInstruction( aTarget, aData ); } void SAL_CALL XMLDocumentWrapper_XmlSecImpl::_setDocumentLocator( sal_Int32 /*columnNumber*/, sal_Int32 /*lineNumber*/, const OUString& /*publicId*/, const OUString& /*systemId*/ ) - throw (cssxs::SAXException, cssu::RuntimeException) + throw (cssxs::SAXException, cssu::RuntimeException, std::exception) { } @@ -1086,17 +1086,17 @@ cssu::Reference< cssu::XInterface > SAL_CALL XMLDocumentWrapper_XmlSecImpl_creat /* XServiceInfo */ OUString SAL_CALL XMLDocumentWrapper_XmlSecImpl::getImplementationName( ) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { return XMLDocumentWrapper_XmlSecImpl_getImplementationName(); } sal_Bool SAL_CALL XMLDocumentWrapper_XmlSecImpl::supportsService( const OUString& rServiceName ) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { return XMLDocumentWrapper_XmlSecImpl_supportsService( rServiceName ); } cssu::Sequence< OUString > SAL_CALL XMLDocumentWrapper_XmlSecImpl::getSupportedServiceNames( ) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { return XMLDocumentWrapper_XmlSecImpl_getSupportedServiceNames(); } diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx index 3536a3b5054e..f889a7113d50 100644 --- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx +++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx @@ -134,25 +134,25 @@ public: /* com::sun::star::xml::wrapper::XXMLDocumentWrapper */ virtual com::sun::star::uno::Reference< com::sun::star::xml::wrapper::XXMLElementWrapper > SAL_CALL getCurrentElement( ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setCurrentElement( const com::sun::star::uno::Reference< com::sun::star::xml::wrapper::XXMLElementWrapper >& element ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeCurrentElement( ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isCurrent( const com::sun::star::uno::Reference< com::sun::star::xml::wrapper::XXMLElementWrapper >& node ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isCurrentElementEmpty( ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getNodeName( const com::sun::star::uno::Reference< com::sun::star::xml::wrapper::XXMLElementWrapper >& node ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL clearUselessData( const com::sun::star::uno::Reference< @@ -161,11 +161,11 @@ public: com::sun::star::xml::wrapper::XXMLElementWrapper > >& reservedDescendants, const com::sun::star::uno::Reference< com::sun::star::xml::wrapper::XXMLElementWrapper >& stopAtNode ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL collapse( const com::sun::star::uno::Reference< com::sun::star::xml::wrapper::XXMLElementWrapper >& node ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL generateSAXEvents( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& handler, @@ -174,84 +174,84 @@ public: com::sun::star::xml::wrapper::XXMLElementWrapper >& startNode, const com::sun::star::uno::Reference< com::sun::star::xml::wrapper::XXMLElementWrapper >& endNode ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL getTree( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& handler ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL rebuildIDLink( const com::sun::star::uno::Reference< com::sun::star::xml::wrapper::XXMLElementWrapper >& node ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); /* com::sun::star::xml::sax::XDocumentHandler */ virtual void SAL_CALL startDocument( ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL endDocument( ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL startElement( const OUString& aName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL endElement( const OUString& aName ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL characters( const OUString& aChars ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setDocumentLocator( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XLocator >& xLocator ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); /* com::sun::star::xml::csax::XCompressedDocumentHandler */ virtual void SAL_CALL _startDocument( ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL _endDocument( ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL _startElement( const OUString& aName, const com::sun::star::uno::Sequence< com::sun::star::xml::csax::XMLAttribute >& aAttributes ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL _endElement( const OUString& aName ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL _characters( const OUString& aChars ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL _ignorableWhitespace( const OUString& aWhitespaces ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL _processingInstruction( const OUString& aTarget, const OUString& aData ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL _setDocumentLocator( sal_Int32 columnNumber, sal_Int32 lineNumber, const OUString& publicId, const OUString& systemId ) - throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception); /* com::sun::star::lang::XServiceInfo */ virtual OUString SAL_CALL getImplementationName( ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); }; OUString XMLDocumentWrapper_XmlSecImpl_getImplementationName() diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx index 6dd1853486f8..afaf1efde62d 100644 --- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx +++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx @@ -53,7 +53,7 @@ cssu::Sequence< sal_Int8 > XMLElementWrapper_XmlSecImpl::getUnoTunnelImplementat } sal_Int64 SAL_CALL XMLElementWrapper_XmlSecImpl::getSomething( const cssu::Sequence< sal_Int8 >& aIdentifier ) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { if (aIdentifier.getLength() == 16 && 0 == memcmp( @@ -102,17 +102,17 @@ cssu::Reference< cssu::XInterface > SAL_CALL /* XServiceInfo */ OUString SAL_CALL XMLElementWrapper_XmlSecImpl::getImplementationName( ) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { return XMLElementWrapper_XmlSecImpl_getImplementationName(); } sal_Bool SAL_CALL XMLElementWrapper_XmlSecImpl::supportsService( const OUString& rServiceName ) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { return XMLElementWrapper_XmlSecImpl_supportsService( rServiceName ); } cssu::Sequence< OUString > SAL_CALL XMLElementWrapper_XmlSecImpl::getSupportedServiceNames( ) - throw (cssu::RuntimeException) + 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 8bc32f95b595..63a64ed29de9 100644 --- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx +++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx @@ -64,17 +64,17 @@ public: /* com::sun::star::lang::XUnoTunnel */ virtual sal_Int64 SAL_CALL getSomething( const com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); static com::sun::star::uno::Sequence < sal_Int8 > getUnoTunnelImplementationId( void ) throw(com::sun::star::uno::RuntimeException); /* com::sun::star::lang::XServiceInfo */ virtual OUString SAL_CALL getImplementationName( ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); public: xmlNodePtr getNativeElement( ) const; |