diff options
Diffstat (limited to 'xmlsecurity/inc')
| -rw-r--r-- | xmlsecurity/inc/certificate.hxx | 2 | ||||
| -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 | ||||
| -rw-r--r-- | xmlsecurity/inc/xmlsec/saxhelper.hxx | 21 | ||||
| -rw-r--r-- | xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx | 108 | ||||
| -rw-r--r-- | xmlsecurity/inc/xsecctl.hxx | 15 |
9 files changed, 112 insertions, 225 deletions
diff --git a/xmlsecurity/inc/certificate.hxx b/xmlsecurity/inc/certificate.hxx index f09ffb7a978f..88af1e5b4dc1 100644 --- a/xmlsecurity/inc/certificate.hxx +++ b/xmlsecurity/inc/certificate.hxx @@ -23,7 +23,7 @@ public: /// Returns the SHA-256 thumbprint. /// /// @throws css::uno::RuntimeException - virtual css::uno::Sequence<sal_Int8> getSHA256Thumbprint() throw (css::uno::RuntimeException, std::exception) = 0; + virtual css::uno::Sequence<sal_Int8> getSHA256Thumbprint() = 0; protected: ~Certificate() throw () {} 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 diff --git a/xmlsecurity/inc/xmlsec/saxhelper.hxx b/xmlsecurity/inc/xmlsec/saxhelper.hxx index 6814ede6d826..44e61de8e0ef 100644 --- a/xmlsecurity/inc/xmlsec/saxhelper.hxx +++ b/xmlsecurity/inc/xmlsec/saxhelper.hxx @@ -47,43 +47,36 @@ class SAXHelper final /// @throws css::xml::sax::SAXException /// @throws css::uno::RuntimeException - void startDocument() - throw( css::xml::sax::SAXException , css::uno::RuntimeException ) ; + void startDocument() ; /// @throws css::xml::sax::SAXException /// @throws css::uno::RuntimeException - void endDocument() - throw( css::xml::sax::SAXException , css::uno::RuntimeException ) ; + void endDocument() ; /// @throws css::xml::sax::SAXException /// @throws css::uno::RuntimeException void startElement( const OUString& aName , const css::uno::Sequence< - css::xml::csax::XMLAttribute >& aAttributes ) - throw( css::xml::sax::SAXException , css::uno::RuntimeException ) ; + css::xml::csax::XMLAttribute >& aAttributes ) ; /// @throws css::xml::sax::SAXException /// @throws css::uno::RuntimeException - void endElement( const OUString& aName ) - throw( css::xml::sax::SAXException , css::uno::RuntimeException ) ; + void endElement( const OUString& aName ) ; /// @throws css::xml::sax::SAXException /// @throws css::uno::RuntimeException - void characters( const OUString& aChars ) - throw( css::xml::sax::SAXException , css::uno::RuntimeException ) ; + void characters( const OUString& aChars ) ; /// @throws css::xml::sax::SAXException /// @throws css::uno::RuntimeException - void ignorableWhitespace( const OUString& aWhitespaces ) - throw( css::xml::sax::SAXException , css::uno::RuntimeException ) ; + void ignorableWhitespace( const OUString& aWhitespaces ) ; /// @throws css::xml::sax::SAXException /// @throws css::uno::RuntimeException void processingInstruction( const OUString& aTarget , - const OUString& aData ) - throw( css::xml::sax::SAXException , css::uno::RuntimeException ) ; + const OUString& aData ) ; } ; diff --git a/xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx b/xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx index dfeb0042adf0..94d237997702 100644 --- a/xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx +++ b/xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx @@ -93,22 +93,19 @@ private: static void sendStartElement( const css::uno::Reference< css::xml::sax::XDocumentHandler >& xHandler, const css::uno::Reference< css::xml::sax::XDocumentHandler >& xHandler2, - const xmlNodePtr pNode) - throw (css::xml::sax::SAXException); + const xmlNodePtr pNode); /// @throws css::xml::sax::SAXException static void sendEndElement( const css::uno::Reference< css::xml::sax::XDocumentHandler >& xHandler, const css::uno::Reference< css::xml::sax::XDocumentHandler >& xHandler2, - const xmlNodePtr pNode) - throw (css::xml::sax::SAXException); + const xmlNodePtr pNode); /// @throws css::xml::sax::SAXException static void sendNode( const css::uno::Reference< css::xml::sax::XDocumentHandler >& xHandler, const css::uno::Reference< css::xml::sax::XDocumentHandler >& xHandler2, - const xmlNodePtr pNode) - throw (css::xml::sax::SAXException); + const xmlNodePtr pNode); static OString getNodeQName(const xmlNodePtr pNode); @@ -129,135 +126,102 @@ public: virtual ~XMLDocumentWrapper_XmlSecImpl() override; /* css::xml::wrapper::XXMLDocumentWrapper */ - virtual css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > SAL_CALL getCurrentElement( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > SAL_CALL getCurrentElement( ) override; virtual void SAL_CALL setCurrentElement( const css::uno::Reference< - css::xml::wrapper::XXMLElementWrapper >& element ) - throw (css::uno::RuntimeException, std::exception) override; + css::xml::wrapper::XXMLElementWrapper >& element ) override; - virtual void SAL_CALL removeCurrentElement( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeCurrentElement( ) override; virtual sal_Bool SAL_CALL isCurrent( const css::uno::Reference< - css::xml::wrapper::XXMLElementWrapper >& node ) - throw (css::uno::RuntimeException, std::exception) override; + css::xml::wrapper::XXMLElementWrapper >& node ) override; - virtual sal_Bool SAL_CALL isCurrentElementEmpty( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isCurrentElementEmpty( ) override; virtual OUString SAL_CALL getNodeName( const css::uno::Reference< - css::xml::wrapper::XXMLElementWrapper >& node ) - throw (css::uno::RuntimeException, std::exception) override; + css::xml::wrapper::XXMLElementWrapper >& node ) override; virtual void SAL_CALL clearUselessData( const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& node, const css::uno::Sequence< css::uno::Reference< css::xml::wrapper::XXMLElementWrapper > >& reservedDescendants, - const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& stopAtNode ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& stopAtNode ) override; virtual void SAL_CALL collapse( const css::uno::Reference< - css::xml::wrapper::XXMLElementWrapper >& node ) - throw (css::uno::RuntimeException, std::exception) override; + css::xml::wrapper::XXMLElementWrapper >& node ) override; virtual void SAL_CALL generateSAXEvents( const css::uno::Reference< css::xml::sax::XDocumentHandler >& handler, const css::uno::Reference< css::xml::sax::XDocumentHandler >& xEventKeeperHandler, const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& startNode, - const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& endNode ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& endNode ) override; virtual void SAL_CALL getTree( - const css::uno::Reference< css::xml::sax::XDocumentHandler >& handler ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::xml::sax::XDocumentHandler >& handler ) override; virtual void SAL_CALL rebuildIDLink( - const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& node ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::xml::wrapper::XXMLElementWrapper >& node ) override; /* css::xml::sax::XDocumentHandler */ - virtual void SAL_CALL startDocument( ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL startDocument( ) override; - virtual void SAL_CALL endDocument( ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL endDocument( ) override; virtual void SAL_CALL startElement( const OUString& aName, - const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs ) override; - virtual void SAL_CALL endElement( const OUString& aName ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL endElement( const OUString& aName ) override; - virtual void SAL_CALL characters( const OUString& aChars ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL characters( const OUString& aChars ) override; - virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) override; - virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) override; - virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) override; /* css::xml::csax::XCompressedDocumentHandler */ - virtual void SAL_CALL compressedStartDocument( ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL compressedStartDocument( ) override; - virtual void SAL_CALL compressedEndDocument( ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL compressedEndDocument( ) override; virtual void SAL_CALL compressedStartElement( const OUString& aName, - const css::uno::Sequence< css::xml::csax::XMLAttribute >& aAttributes ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::xml::csax::XMLAttribute >& aAttributes ) override; - virtual void SAL_CALL compressedEndElement( const OUString& aName ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL compressedEndElement( const OUString& aName ) override; - virtual void SAL_CALL compressedCharacters( const OUString& aChars ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL compressedCharacters( const OUString& aChars ) override; - virtual void SAL_CALL compressedIgnorableWhitespace( const OUString& aWhitespaces ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL compressedIgnorableWhitespace( const OUString& aWhitespaces ) override; - virtual void SAL_CALL compressedProcessingInstruction( const OUString& aTarget, const OUString& aData ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL compressedProcessingInstruction( const OUString& aTarget, const OUString& aData ) override; virtual void SAL_CALL compressedSetDocumentLocator( sal_Int32 columnNumber, sal_Int32 lineNumber, const OUString& publicId, - const OUString& systemId ) - throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + const OUString& systemId ) override; /* css::lang::XServiceInfo */ - virtual OUString SAL_CALL getImplementationName( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; /// @throws css::uno::RuntimeException -OUString XMLDocumentWrapper_XmlSecImpl_getImplementationName() - throw ( css::uno::RuntimeException ); +OUString XMLDocumentWrapper_XmlSecImpl_getImplementationName(); /// @throws css::uno::RuntimeException css::uno::Sequence< OUString > SAL_CALL - XMLDocumentWrapper_XmlSecImpl_getSupportedServiceNames( ) - throw ( css::uno::RuntimeException ); + XMLDocumentWrapper_XmlSecImpl_getSupportedServiceNames( ); /// @throws css::uno::Exception css::uno::Reference< css::uno::XInterface > SAL_CALL XMLDocumentWrapper_XmlSecImpl_createInstance( - const css::uno::Reference< css::uno::XComponentContext > &) - throw ( css::uno::Exception ); + const css::uno::Reference< css::uno::XComponentContext > &); #endif diff --git a/xmlsecurity/inc/xsecctl.hxx b/xmlsecurity/inc/xsecctl.hxx index 686d23dca4c4..322b1ddb801e 100644 --- a/xmlsecurity/inc/xsecctl.hxx +++ b/xmlsecurity/inc/xsecctl.hxx @@ -403,25 +403,20 @@ public: /* * XSAXEventKeeperStatusChangeListener */ - virtual void SAL_CALL blockingStatusChanged( sal_Bool isBlocking ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL blockingStatusChanged( sal_Bool isBlocking ) override; virtual void SAL_CALL collectionStatusChanged( - sal_Bool isInsideCollectedElement ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL bufferStatusChanged( sal_Bool isBufferEmpty ) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool isInsideCollectedElement ) override; + virtual void SAL_CALL bufferStatusChanged( sal_Bool isBufferEmpty ) override; /* * XSignatureCreationResultListener */ - virtual void SAL_CALL signatureCreated( sal_Int32 securityId, css::xml::crypto::SecurityOperationStatus nResult ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL signatureCreated( sal_Int32 securityId, css::xml::crypto::SecurityOperationStatus nResult ) override; /* * XSignatureVerifyResultListener */ - virtual void SAL_CALL signatureVerified( sal_Int32 securityId, css::xml::crypto::SecurityOperationStatus nResult ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL signatureVerified( sal_Int32 securityId, css::xml::crypto::SecurityOperationStatus nResult ) override; /// Writes XML elements inside a single OOXML signature's <Signature> element. bool WriteOOXMLSignature(const css::uno::Reference<css::embed::XStorage>& xRootStorage, const css::uno::Reference<css::xml::sax::XDocumentHandler>& xDocumentHandler); |