From 5e21a413c788f839a66d9e4c14e745ed18058db8 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 25 Feb 2014 21:31:58 +0100 Subject: cppuhelper: retrofit std::exception into overriding exception specs Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3 --- xmlsecurity/source/framework/decryptorimpl.cxx | 12 ++--- xmlsecurity/source/framework/decryptorimpl.hxx | 12 ++--- xmlsecurity/source/framework/encryptionengine.cxx | 2 +- xmlsecurity/source/framework/encryptionengine.hxx | 2 +- xmlsecurity/source/framework/encryptorimpl.cxx | 16 +++--- xmlsecurity/source/framework/encryptorimpl.hxx | 16 +++--- .../source/framework/saxeventkeeperimpl.cxx | 58 +++++++++++----------- .../source/framework/saxeventkeeperimpl.hxx | 58 +++++++++++----------- xmlsecurity/source/framework/securityengine.cxx | 6 +-- xmlsecurity/source/framework/securityengine.hxx | 6 +-- .../source/framework/signaturecreatorimpl.cxx | 14 +++--- .../source/framework/signaturecreatorimpl.hxx | 14 +++--- xmlsecurity/source/framework/signatureengine.cxx | 8 +-- xmlsecurity/source/framework/signatureengine.hxx | 8 +-- .../source/framework/signatureverifierimpl.cxx | 12 ++--- .../source/framework/signatureverifierimpl.hxx | 12 ++--- .../source/framework/xmlencryptiontemplateimpl.cxx | 18 +++---- .../source/framework/xmlencryptiontemplateimpl.hxx | 18 +++---- .../source/framework/xmlsignaturetemplateimpl.cxx | 22 ++++---- .../source/framework/xmlsignaturetemplateimpl.hxx | 22 ++++---- 20 files changed, 168 insertions(+), 168 deletions(-) (limited to 'xmlsecurity/source/framework') 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() ; -- cgit