diff options
Diffstat (limited to 'xmlsecurity/inc/framework')
-rw-r--r-- | xmlsecurity/inc/framework/saxeventkeeperimpl.hxx | 93 | ||||
-rw-r--r-- | xmlsecurity/inc/framework/securityengine.hxx | 13 | ||||
-rw-r--r-- | xmlsecurity/inc/framework/signaturecreatorimpl.hxx | 36 | ||||
-rw-r--r-- | xmlsecurity/inc/framework/signatureengine.hxx | 16 | ||||
-rw-r--r-- | xmlsecurity/inc/framework/signatureverifierimpl.hxx | 33 |
5 files changed, 63 insertions, 128 deletions
diff --git a/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx b/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx index 012646c60c61..7b03800fbefb 100644 --- a/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx +++ b/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx @@ -215,109 +215,78 @@ public: virtual ~SAXEventKeeperImpl() override; /* XSAXEventKeeper */ - virtual sal_Int32 SAL_CALL addElementCollector( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeElementCollector( sal_Int32 id ) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL addBlocker( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeBlocker( sal_Int32 id ) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isBlocking( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL addElementCollector( ) override; + virtual void SAL_CALL removeElementCollector( sal_Int32 id ) override; + virtual sal_Int32 SAL_CALL addBlocker( ) override; + virtual void SAL_CALL removeBlocker( sal_Int32 id ) override; + virtual sal_Bool SAL_CALL isBlocking( ) override; virtual css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > SAL_CALL - getElement( sal_Int32 id ) - throw (css::uno::RuntimeException, std::exception) override; + getElement( sal_Int32 id ) override; virtual void SAL_CALL setElement( sal_Int32 id, - const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& aElement ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& aElement ) override; virtual css::uno::Reference< css::xml::sax::XDocumentHandler > SAL_CALL setNextHandler( const css::uno::Reference< - css::xml::sax::XDocumentHandler >& xNewHandler ) - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL printBufferNodeTree() - throw (css::uno::RuntimeException, std::exception) override; + css::xml::sax::XDocumentHandler >& xNewHandler ) override; + virtual OUString SAL_CALL printBufferNodeTree() override; virtual css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > SAL_CALL - getCurrentBlockingNode() - throw (css::uno::RuntimeException, std::exception) override; + getCurrentBlockingNode() override; /* XSecuritySAXEventKeeper */ virtual sal_Int32 SAL_CALL addSecurityElementCollector( css::xml::crypto::sax::ElementMarkPriority priority, - sal_Bool modifyElement ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSecurityId( sal_Int32 id, sal_Int32 securityId ) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool modifyElement ) override; + virtual void SAL_CALL setSecurityId( sal_Int32 id, sal_Int32 securityId ) override; /* XReferenceResolvedBroadcaster */ virtual void SAL_CALL addReferenceResolvedListener( sal_Int32 referenceId, - const css::uno::Reference< css::xml::crypto::sax::XReferenceResolvedListener >& listener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::xml::crypto::sax::XReferenceResolvedListener >& listener ) override; virtual void SAL_CALL removeReferenceResolvedListener( sal_Int32 referenceId, - const css::uno::Reference< css::xml::crypto::sax::XReferenceResolvedListener >& listener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::xml::crypto::sax::XReferenceResolvedListener >& listener ) override; /* XSAXEventKeeperStatusChangeBroadcaster */ virtual void SAL_CALL addSAXEventKeeperStatusChangeListener( - const css::uno::Reference< css::xml::crypto::sax::XSAXEventKeeperStatusChangeListener >& listener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::xml::crypto::sax::XSAXEventKeeperStatusChangeListener >& listener ) override; virtual void SAL_CALL removeSAXEventKeeperStatusChangeListener( - const css::uno::Reference< css::xml::crypto::sax::XSAXEventKeeperStatusChangeListener >& listener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::xml::crypto::sax::XSAXEventKeeperStatusChangeListener >& listener ) override; /* XDocumentHandler */ - virtual void SAL_CALL startDocument( ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL endDocument( ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL startDocument( ) override; + virtual void SAL_CALL endDocument( ) override; virtual void SAL_CALL startElement( const OUString& aName, const css::uno::Reference< css::xml::sax::XAttributeList >& - xAttribs ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL endElement( const OUString& aName ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL characters( const OUString& aChars ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + xAttribs ) override; + virtual void SAL_CALL endElement( const OUString& aName ) override; + virtual void SAL_CALL characters( const OUString& aChars ) override; + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) override; virtual void SAL_CALL processingInstruction( - const OUString& aTarget, const OUString& aData ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + const OUString& aTarget, const OUString& aData ) override; virtual void SAL_CALL setDocumentLocator( - const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) override; /* XInitialization */ virtual void SAL_CALL initialize( - const css::uno::Sequence< css::uno::Any >& aArguments ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Any >& aArguments ) override; /* XServiceInfo */ - virtual OUString SAL_CALL getImplementationName( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; /// @throws css::uno::RuntimeException -OUString SAXEventKeeperImpl_getImplementationName() - throw ( css::uno::RuntimeException ); +OUString SAXEventKeeperImpl_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL SAXEventKeeperImpl_getSupportedServiceNames( ) - throw ( css::uno::RuntimeException ); +css::uno::Sequence< OUString > SAL_CALL SAXEventKeeperImpl_getSupportedServiceNames( ); /// @throws css::uno::Exception css::uno::Reference< css::uno::XInterface > -SAL_CALL SAXEventKeeperImpl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) - throw ( css::uno::Exception ); +SAL_CALL SAXEventKeeperImpl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr); #endif diff --git a/xmlsecurity/inc/framework/securityengine.hxx b/xmlsecurity/inc/framework/securityengine.hxx index 1315aae84b92..b1cc565292da 100644 --- a/xmlsecurity/inc/framework/securityengine.hxx +++ b/xmlsecurity/inc/framework/securityengine.hxx @@ -106,8 +106,7 @@ protected: */ /// @throws css::uno::Exception /// @throws css::uno::RuntimeException - virtual void tryToPerform( ) - throw (css::uno::Exception, css::uno::RuntimeException){}; + virtual void tryToPerform( ){}; /* * clear up all resources used by this operation. @@ -126,7 +125,6 @@ protected: /// @throws css::uno::Exception /// @throws css::uno::RuntimeException virtual void notifyResultListener() const - throw (css::uno::Exception, css::uno::RuntimeException) {}; /* @@ -137,16 +135,13 @@ protected: public: /* XReferenceResolvedListener */ - virtual void SAL_CALL referenceResolved( sal_Int32 referenceId ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL referenceResolved( sal_Int32 referenceId ) override; /* XKeyCollector */ - virtual void SAL_CALL setKeyId( sal_Int32 id ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setKeyId( sal_Int32 id ) override; /* XMissionTaker */ - virtual sal_Bool SAL_CALL endMission( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL endMission( ) override; }; #endif diff --git a/xmlsecurity/inc/framework/signaturecreatorimpl.hxx b/xmlsecurity/inc/framework/signaturecreatorimpl.hxx index bd81d0efe976..683d2d2a676d 100644 --- a/xmlsecurity/inc/framework/signaturecreatorimpl.hxx +++ b/xmlsecurity/inc/framework/signaturecreatorimpl.hxx @@ -59,57 +59,45 @@ private: css::uno::Reference< css::xml::crypto::XSecurityEnvironment > m_xSecurityEnvironment; - virtual void notifyResultListener() const - throw (css::uno::Exception, css::uno::RuntimeException) override; + virtual void notifyResultListener() const override; virtual void clearUp( ) const override; virtual bool checkReady() const override; - virtual void startEngine( const css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate >& xSignatureTemplate) - throw (css::uno::Exception, css::uno::RuntimeException) override; + virtual void startEngine( const css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate >& xSignatureTemplate) override; public: explicit SignatureCreatorImpl(); virtual ~SignatureCreatorImpl() override; /* XBlockerMonitor */ - virtual void SAL_CALL setBlockerId( sal_Int32 id ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setBlockerId( sal_Int32 id ) override; /* XSignatureCreationResultBroadcaster */ void SAL_CALL addSignatureCreationResultListener( - const css::uno::Reference< css::xml::crypto::sax::XSignatureCreationResultListener >& listener ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::xml::crypto::sax::XSignatureCreationResultListener >& listener ) override; void SAL_CALL removeSignatureCreationResultListener( - const css::uno::Reference< css::xml::crypto::sax::XSignatureCreationResultListener >& listener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::xml::crypto::sax::XSignatureCreationResultListener >& listener ) override; /* XInitialization */ virtual void SAL_CALL initialize( - const css::uno::Sequence< css::uno::Any >& aArguments ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Any >& aArguments ) override; /* XServiceInfo */ - virtual OUString SAL_CALL getImplementationName( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; /// @throws css::uno::RuntimeException -OUString SignatureCreatorImpl_getImplementationName() - throw ( css::uno::RuntimeException ); +OUString SignatureCreatorImpl_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL SignatureCreatorImpl_getSupportedServiceNames( ) - throw ( css::uno::RuntimeException ); +css::uno::Sequence< OUString > SAL_CALL SignatureCreatorImpl_getSupportedServiceNames( ); /// @throws css::uno::Exception css::uno::Reference< css::uno::XInterface > SAL_CALL SignatureCreatorImpl_createInstance( - const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) - throw ( css::uno::Exception ); + const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr); #endif diff --git a/xmlsecurity/inc/framework/signatureengine.hxx b/xmlsecurity/inc/framework/signatureengine.hxx index 3a2231dc4f6c..a173fa52c7e4 100644 --- a/xmlsecurity/inc/framework/signatureengine.hxx +++ b/xmlsecurity/inc/framework/signatureengine.hxx @@ -86,8 +86,7 @@ protected: explicit SignatureEngine(); virtual ~SignatureEngine() override {}; - virtual void tryToPerform( ) - throw (css::uno::Exception, css::uno::RuntimeException) override; + virtual void tryToPerform( ) override; virtual void clearUp( ) const override; virtual bool checkReady() const override; @@ -100,25 +99,20 @@ protected: /// @throws css::uno::RuntimeException virtual void startEngine( const css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate >&) - throw (css::uno::Exception, css::uno::RuntimeException) {}; public: /* XReferenceCollector */ - virtual void SAL_CALL setReferenceCount( sal_Int32 count ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setReferenceCount( sal_Int32 count ) override; - virtual void SAL_CALL setReferenceId( sal_Int32 id ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setReferenceId( sal_Int32 id ) override; /* XUriBinding */ virtual void SAL_CALL setUriBinding( const OUString& uri, - const css::uno::Reference< css::io::XInputStream >& aInputStream ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::io::XInputStream >& aInputStream ) override; virtual css::uno::Reference< css::io::XInputStream > - SAL_CALL getUriBinding( const OUString& uri ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + SAL_CALL getUriBinding( const OUString& uri ) override; }; #endif diff --git a/xmlsecurity/inc/framework/signatureverifierimpl.hxx b/xmlsecurity/inc/framework/signatureverifierimpl.hxx index de394d1da8bc..8c20c8385de9 100644 --- a/xmlsecurity/inc/framework/signatureverifierimpl.hxx +++ b/xmlsecurity/inc/framework/signatureverifierimpl.hxx @@ -54,11 +54,9 @@ class XSECFW_DLLPUBLIC SignatureVerifierImpl : public SignatureVerifierImpl_Base private: css::uno::Reference< css::xml::crypto::XXMLSecurityContext > m_xXMLSecurityContext; - virtual void notifyResultListener() const - throw (css::uno::Exception, css::uno::RuntimeException) override; + virtual void notifyResultListener() const override; virtual bool checkReady() const override; - virtual void startEngine( const css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate >& xSignatureTemplate) - throw (css::uno::Exception, css::uno::RuntimeException) override; + virtual void startEngine( const css::uno::Reference< css::xml::crypto::XXMLSignatureTemplate >& xSignatureTemplate) override; public: explicit SignatureVerifierImpl(); @@ -66,39 +64,30 @@ public: /* XSignatureVerifyResultBroadcaster */ virtual void SAL_CALL addSignatureVerifyResultListener( - const css::uno::Reference< css::xml::crypto::sax::XSignatureVerifyResultListener >& listener ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::xml::crypto::sax::XSignatureVerifyResultListener >& listener ) override; virtual void SAL_CALL removeSignatureVerifyResultListener( - const css::uno::Reference< css::xml::crypto::sax::XSignatureVerifyResultListener >& listener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::xml::crypto::sax::XSignatureVerifyResultListener >& listener ) override; /* XInitialization */ virtual void SAL_CALL initialize( - const css::uno::Sequence< css::uno::Any >& aArguments ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Any >& aArguments ) override; /* XServiceInfo */ - virtual OUString SAL_CALL getImplementationName( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; /// @throws css::uno::RuntimeException -OUString SignatureVerifierImpl_getImplementationName() - throw ( css::uno::RuntimeException ); +OUString SignatureVerifierImpl_getImplementationName(); /// @throws css::uno::RuntimeException -css::uno::Sequence< OUString > SAL_CALL SignatureVerifierImpl_getSupportedServiceNames( ) - throw ( css::uno::RuntimeException ); +css::uno::Sequence< OUString > SAL_CALL SignatureVerifierImpl_getSupportedServiceNames( ); /// @throws css::uno::Exception css::uno::Reference< css::uno::XInterface > SAL_CALL SignatureVerifierImpl_createInstance( - const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) - throw ( css::uno::Exception ); + const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr); #endif |