From 579d1f61b0300434801e9b37012254a506fc0230 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 5 Jun 2014 08:15:56 +0200 Subject: uui: remove SAL_THROW macro Change-Id: I72583c9d6c22621a30771ef8422370911d35000b --- uui/source/iahndl-authentication.cxx | 9 ---- uui/source/iahndl-errorhandler.cxx | 2 - uui/source/iahndl-filter.cxx | 7 --- uui/source/iahndl-ioexceptions.cxx | 4 -- uui/source/iahndl-locking.cxx | 6 --- uui/source/iahndl-ssl.cxx | 4 -- uui/source/iahndl.cxx | 24 ++------- uui/source/iahndl.hxx | 96 +++++++++++++----------------------- uui/source/interactionhandler.cxx | 6 +-- uui/source/passwordcontainer.cxx | 2 - uui/source/passwordcontainer.hxx | 6 +-- uui/source/requeststringresolver.cxx | 2 - uui/source/requeststringresolver.hxx | 8 ++- 13 files changed, 43 insertions(+), 133 deletions(-) (limited to 'uui') diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx index b39eee4798f0..fbb1dba24c3d 100644 --- a/uui/source/iahndl-authentication.cxx +++ b/uui/source/iahndl-authentication.cxx @@ -61,7 +61,6 @@ executeLoginDialog( Window * pParent, LoginErrorInfo & rInfo, OUString const & rRealm) - SAL_THROW((uno::RuntimeException)) { try { @@ -190,7 +189,6 @@ handleAuthenticationRequest_( uno::Sequence< uno::Reference< task::XInteractionContinuation > > const & rContinuations, const OUString & rURL) - SAL_THROW((uno::RuntimeException)) { uno::Reference< task::XInteractionRetry > xRetry; uno::Reference< task::XInteractionAbort > xAbort; @@ -408,7 +406,6 @@ executeMasterPasswordDialog( Window * pParent, LoginErrorInfo & rInfo, task::PasswordRequestMode nMode) - SAL_THROW((uno::RuntimeException)) { OString aMaster; try @@ -465,7 +462,6 @@ handleMasterPasswordRequest_( task::PasswordRequestMode nMode, uno::Sequence< uno::Reference< task::XInteractionContinuation > > const & rContinuations) - SAL_THROW((uno::RuntimeException)) { uno::Reference< task::XInteractionRetry > xRetry; uno::Reference< task::XInteractionAbort > xAbort; @@ -509,7 +505,6 @@ executePasswordDialog( bool bMSCryptoMode, bool bIsPasswordToModify, bool bIsSimplePasswordRequest ) - SAL_THROW((uno::RuntimeException)) { try { @@ -571,7 +566,6 @@ handlePasswordRequest_( bool bMSCryptoMode, bool bIsPasswordToModify, bool bIsSimplePasswordRequest = false ) - SAL_THROW((uno::RuntimeException)) { uno::Reference< task::XInteractionRetry > xRetry; uno::Reference< task::XInteractionAbort > xAbort; @@ -621,7 +615,6 @@ handlePasswordRequest_( bool UUIInteractionHelper::handleAuthenticationRequest( uno::Reference< task::XInteractionRequest > const & rRequest) - SAL_THROW((uno::RuntimeException)) { uno::Any aAnyRequest(rRequest->getRequest()); @@ -654,7 +647,6 @@ UUIInteractionHelper::handleAuthenticationRequest( bool UUIInteractionHelper::handleMasterPasswordRequest( uno::Reference< task::XInteractionRequest > const & rRequest) - SAL_THROW((uno::RuntimeException)) { uno::Any aAnyRequest(rRequest->getRequest()); @@ -672,7 +664,6 @@ UUIInteractionHelper::handleMasterPasswordRequest( bool UUIInteractionHelper::handlePasswordRequest( uno::Reference< task::XInteractionRequest > const & rRequest) - SAL_THROW((uno::RuntimeException)) { // parameters to be filled for the call to handlePasswordRequest_ Window * pParent = getParentProperty(); diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx index 85f552b4b239..b70ae0ec2bf9 100644 --- a/uui/source/iahndl-errorhandler.cxx +++ b/uui/source/iahndl-errorhandler.cxx @@ -46,7 +46,6 @@ executeErrorDialog( OUString const & rContext, OUString const & rMessage, WinBits nButtonMask) - SAL_THROW((uno::RuntimeException)) { SolarMutexGuard aGuard; @@ -136,7 +135,6 @@ UUIInteractionHelper::handleErrorHandlerRequest( bool bObtainErrorStringOnly, bool & bHasErrorString, OUString & rErrorString) - SAL_THROW((uno::RuntimeException)) { if (bObtainErrorStringOnly) { diff --git a/uui/source/iahndl-filter.cxx b/uui/source/iahndl-filter.cxx index cfa692135538..d8f574e46a7b 100644 --- a/uui/source/iahndl-filter.cxx +++ b/uui/source/iahndl-filter.cxx @@ -51,7 +51,6 @@ executeFilterDialog( OUString const & rURL , uui::FilterNameList const & rFilters, OUString & rFilter ) - SAL_THROW((uno::RuntimeException)) { try { @@ -84,7 +83,6 @@ handleNoSuchFilterRequest_( document::NoSuchFilterRequest const & rRequest, uno::Sequence< uno::Reference< task::XInteractionContinuation > > const & rContinuations ) - SAL_THROW((uno::RuntimeException)) { uno::Reference< task::XInteractionAbort > xAbort; uno::Reference< document::XInteractionFilterSelect > xFilterTransport; @@ -199,7 +197,6 @@ handleAmbigousFilterRequest_( uno::Sequence< uno::Reference< task::XInteractionContinuation > > const & rContinuations) - SAL_THROW((uno::RuntimeException)) { uno::Reference< task::XInteractionAbort > xAbort; uno::Reference< document::XInteractionFilterSelect > xFilterTransport; @@ -301,7 +298,6 @@ handleFilterOptionsRequest_( document::FilterOptionsRequest const & rRequest, uno::Sequence< uno::Reference< task::XInteractionContinuation > > const & rContinuations) - SAL_THROW((uno::RuntimeException)) { uno::Reference< task::XInteractionAbort > xAbort; uno::Reference< document::XInteractionFilterOptions > xFilterOptions; @@ -400,7 +396,6 @@ handleFilterOptionsRequest_( bool UUIInteractionHelper::handleNoSuchFilterRequest( uno::Reference< task::XInteractionRequest > const & rRequest) - SAL_THROW((uno::RuntimeException)) { uno::Any aAnyRequest(rRequest->getRequest()); @@ -419,7 +414,6 @@ UUIInteractionHelper::handleNoSuchFilterRequest( bool UUIInteractionHelper::handleAmbigousFilterRequest( uno::Reference< task::XInteractionRequest > const & rRequest) - SAL_THROW((uno::RuntimeException)) { uno::Any aAnyRequest(rRequest->getRequest()); @@ -438,7 +432,6 @@ UUIInteractionHelper::handleAmbigousFilterRequest( bool UUIInteractionHelper::handleFilterOptionsRequest( uno::Reference< task::XInteractionRequest > const & rRequest) - SAL_THROW((uno::RuntimeException)) { uno::Any aAnyRequest(rRequest->getRequest()); diff --git a/uui/source/iahndl-ioexceptions.cxx b/uui/source/iahndl-ioexceptions.cxx index 62b165a436f0..029ba1dd8895 100644 --- a/uui/source/iahndl-ioexceptions.cxx +++ b/uui/source/iahndl-ioexceptions.cxx @@ -33,7 +33,6 @@ bool getStringRequestArgument(uno::Sequence< uno::Any > const & rArguments, OUString const & rKey, OUString * pValue) - SAL_THROW(()) { for (sal_Int32 i = 0; i < rArguments.getLength(); ++i) { @@ -56,7 +55,6 @@ bool getBoolRequestArgument(uno::Sequence< uno::Any > const & rArguments, OUString const & rKey, bool * pValue) - SAL_THROW(()) { for (sal_Int32 i = 0; i < rArguments.getLength(); ++i) { @@ -78,7 +76,6 @@ getBoolRequestArgument(uno::Sequence< uno::Any > const & rArguments, bool getResourceNameRequestArgument(uno::Sequence< uno::Any > const & rArguments, OUString * pValue) - SAL_THROW(()) { if (!getStringRequestArgument(rArguments, "Uri", pValue)) return false; @@ -98,7 +95,6 @@ UUIInteractionHelper::handleInteractiveIOException( bool bObtainErrorStringOnly, bool & bHasErrorString, OUString & rErrorString) - SAL_THROW((uno::RuntimeException)) { uno::Any aAnyRequest(rRequest->getRequest()); bHasErrorString = false; diff --git a/uui/source/iahndl-locking.cxx b/uui/source/iahndl-locking.cxx index 9a877f95fa5f..a6b32b5459df 100644 --- a/uui/source/iahndl-locking.cxx +++ b/uui/source/iahndl-locking.cxx @@ -62,7 +62,6 @@ handleLockedDocumentRequest_( uno::Sequence< uno::Reference< task::XInteractionContinuation > > const & rContinuations, sal_uInt16 nMode ) - SAL_THROW((uno::RuntimeException)) { uno::Reference< task::XInteractionApprove > xApprove; uno::Reference< task::XInteractionDisapprove > xDisapprove; @@ -149,7 +148,6 @@ handleChangedByOthersRequest_( Window * pParent, uno::Sequence< uno::Reference< task::XInteractionContinuation > > const & rContinuations ) - SAL_THROW((uno::RuntimeException)) { uno::Reference< task::XInteractionApprove > xApprove; uno::Reference< task::XInteractionAbort > xAbort; @@ -185,7 +183,6 @@ handleLockFileIgnoreRequest_( Window * pParent, uno::Sequence< uno::Reference< task::XInteractionContinuation > > const & rContinuations ) - SAL_THROW((uno::RuntimeException)) { uno::Reference< task::XInteractionApprove > xApprove; uno::Reference< task::XInteractionAbort > xAbort; @@ -221,7 +218,6 @@ handleLockFileIgnoreRequest_( bool UUIInteractionHelper::handleLockedDocumentRequest( uno::Reference< task::XInteractionRequest > const & rRequest) - SAL_THROW((::com::sun::star::uno::RuntimeException)) { uno::Any aAnyRequest(rRequest->getRequest()); @@ -265,7 +261,6 @@ UUIInteractionHelper::handleLockedDocumentRequest( bool UUIInteractionHelper::handleChangedByOthersRequest( uno::Reference< task::XInteractionRequest > const & rRequest) - SAL_THROW((uno::RuntimeException)) { uno::Any aAnyRequest(rRequest->getRequest()); @@ -282,7 +277,6 @@ UUIInteractionHelper::handleChangedByOthersRequest( bool UUIInteractionHelper::handleLockFileIgnoreRequest( uno::Reference< task::XInteractionRequest > const & rRequest) - SAL_THROW((uno::RuntimeException)) { uno::Any aAnyRequest(rRequest->getRequest()); diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx index e8403813b554..e415091e1e4a 100644 --- a/uui/source/iahndl-ssl.cxx +++ b/uui/source/iahndl-ssl.cxx @@ -140,7 +140,6 @@ executeUnknownAuthDialog( Window * pParent, uno::Reference< uno::XComponentContext > const & xContext, const uno::Reference< security::XCertificate >& rXCert) - SAL_THROW((uno::RuntimeException)) { try { @@ -183,7 +182,6 @@ executeSSLWarnDialog( const uno::Reference< security::XCertificate >& rXCert, sal_Int32 const & failure, const OUString & hostName ) - SAL_THROW((uno::RuntimeException)) { try { @@ -253,7 +251,6 @@ handleCertificateValidationRequest_( ucb::CertificateValidationRequest const & rRequest, uno::Sequence< uno::Reference< task::XInteractionContinuation > > const & rContinuations) - SAL_THROW((uno::RuntimeException)) { uno::Reference< task::XInteractionApprove > xApprove; uno::Reference< task::XInteractionAbort > xAbort; @@ -359,7 +356,6 @@ handleCertificateValidationRequest_( bool UUIInteractionHelper::handleCertificateValidationRequest( uno::Reference< task::XInteractionRequest > const & rRequest) - SAL_THROW((uno::RuntimeException)) { uno::Any aAnyRequest(rRequest->getRequest()); diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index 24225fad37e9..cb6470ba1d18 100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -132,8 +132,7 @@ UUIInteractionHelper::UUIInteractionHelper( uno::Reference< uno::XComponentContext > const & rxContext, uno::Reference< awt::XWindow > const & rxWindowParam, const OUString & rContextParam) - SAL_THROW(()): - m_xContext(rxContext), + : m_xContext(rxContext), m_xWindowParam(rxWindowParam), m_aContextParam(rContextParam) { @@ -141,8 +140,7 @@ UUIInteractionHelper::UUIInteractionHelper( UUIInteractionHelper::UUIInteractionHelper( uno::Reference< uno::XComponentContext > const & rxContext) - SAL_THROW(()): - m_xContext(rxContext) + : m_xContext(rxContext) { } @@ -169,7 +167,6 @@ UUIInteractionHelper::handlerequest( bool UUIInteractionHelper::handleRequest( uno::Reference< task::XInteractionRequest > const & rRequest) - SAL_THROW((uno::RuntimeException)) { Application* pApp = 0; if( @@ -212,7 +209,6 @@ UUIInteractionHelper::getstringfromrequest( beans::Optional< OUString > UUIInteractionHelper::getStringFromRequest_impl( uno::Reference< task::XInteractionRequest > const & rRequest) - SAL_THROW((uno::RuntimeException)) { bool bSuccess = false; OUString aMessage; @@ -230,7 +226,6 @@ UUIInteractionHelper::getStringFromRequest_impl( beans::Optional< OUString > UUIInteractionHelper::getStringFromRequest( uno::Reference< task::XInteractionRequest > const & rRequest) - SAL_THROW((uno::RuntimeException)) { Application* pApp = 0; if( @@ -320,7 +315,6 @@ UUIInteractionHelper::isInformationalErrorMessageRequest( bool UUIInteractionHelper::tryOtherInteractionHandler( uno::Reference< task::XInteractionRequest > const & rRequest) - SAL_THROW((uno::RuntimeException)) { InteractionHandlerDataList dataList; getInteractionHandlerList(dataList); @@ -449,7 +443,6 @@ UUIInteractionHelper::handleRequest_impl( bool bObtainErrorStringOnly, bool & bHasErrorString, OUString & rErrorString) - SAL_THROW((uno::RuntimeException)) { try { @@ -934,7 +927,6 @@ UUIInteractionHelper::handleRequest_impl( void UUIInteractionHelper::getInteractionHandlerList( InteractionHandlerDataList &rdataList) - SAL_THROW((uno::RuntimeException)) { try { @@ -1028,7 +1020,6 @@ UUIInteractionHelper::getInteractionHandlerList( Window * UUIInteractionHelper::getParentProperty() - SAL_THROW(()) { uno::Reference< awt::XWindow > xWindow = getParentXWindow(); if ( xWindow.is() ) @@ -1039,21 +1030,18 @@ UUIInteractionHelper::getParentProperty() uno::Reference< awt::XWindow> UUIInteractionHelper::getParentXWindow() const - SAL_THROW(()) { return m_xWindowParam; } OUString UUIInteractionHelper::getContextProperty() - SAL_THROW(()) { return m_aContextParam; } uno::Reference< task::XInteractionHandler2 > UUIInteractionHelper::getInteractionHandler() - SAL_THROW((uno::RuntimeException)) { return InteractionHandler::createWithParentAndContext( m_xContext, m_xWindowParam, @@ -1068,7 +1056,6 @@ executeMessageBox( OUString const & rTitle, OUString const & rMessage, WinBits nButtonMask ) - SAL_THROW((uno::RuntimeException)) { SolarMutexGuard aGuard; @@ -1122,7 +1109,6 @@ UUIInteractionHelper::handleNameClashResolveRequest( ucb::NameClashResolveRequest const & rRequest, uno::Sequence< uno::Reference< task::XInteractionContinuation > > const & rContinuations) - SAL_THROW((uno::RuntimeException)) { OSL_ENSURE(!rRequest.TargetFolderURL.isEmpty(), "NameClashResolveRequest must not contain empty TargetFolderURL" ); @@ -1180,7 +1166,6 @@ UUIInteractionHelper::handleGenericErrorRequest( bool bObtainErrorStringOnly, bool & bHasErrorString, OUString & rErrorString) - SAL_THROW((uno::RuntimeException)) { if (bObtainErrorStringOnly) { @@ -1246,7 +1231,6 @@ UUIInteractionHelper::handleMacroConfirmRequest( const uno::Sequence< security::DocumentSignatureInformation >& aSignInfo, uno::Sequence< uno::Reference< task::XInteractionContinuation > > const & rContinuations ) - SAL_THROW((uno::RuntimeException)) { uno::Reference< task::XInteractionAbort > xAbort; uno::Reference< task::XInteractionApprove > xApprove; @@ -1285,7 +1269,6 @@ UUIInteractionHelper::handleFutureDocumentVersionUpdateRequest( const task::FutureDocumentVersionProductUpdateRequest& _rRequest, uno::Sequence< uno::Reference< task::XInteractionContinuation > > const & rContinuations ) - SAL_THROW((uno::RuntimeException)) { uno::Reference< task::XInteractionAbort > xAbort; uno::Reference< task::XInteractionApprove > xApprove; @@ -1358,7 +1341,6 @@ UUIInteractionHelper::handleBrokenPackageRequest( bool bObtainErrorStringOnly, bool & bHasErrorString, OUString & rErrorString) - SAL_THROW((uno::RuntimeException)) { if (bObtainErrorStringOnly) { @@ -1450,7 +1432,7 @@ UUIInteractionHelper::handleBrokenPackageRequest( bool ErrorResource::getString(ErrCode nErrorCode, OUString &rString) - const SAL_THROW(()) + const { ResId aResId(static_cast< sal_uInt16 >(nErrorCode & ERRCODE_RES_MASK), *m_pResMgr); diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx index f163f3f3343e..3333e87a7b07 100644 --- a/uui/source/iahndl.hxx +++ b/uui/source/iahndl.hxx @@ -98,26 +98,22 @@ public: com::sun::star::uno::XComponentContext > const & rxContext, com::sun::star::uno::Reference< com::sun::star::awt::XWindow > const & rxWindow, - const OUString & rContextParam) - SAL_THROW(()); + const OUString & rContextParam); UUIInteractionHelper( com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > const & rxContext) - SAL_THROW(()); + com::sun::star::uno::XComponentContext > const & rxContext); - ~UUIInteractionHelper() SAL_THROW(()); + ~UUIInteractionHelper(); bool handleRequest( com::sun::star::uno::Reference< - com::sun::star::task::XInteractionRequest > const & rRequest) - SAL_THROW((com::sun::star::uno::RuntimeException)); + com::sun::star::task::XInteractionRequest > const & rRequest); com::sun::star::beans::Optional< OUString > getStringFromRequest( com::sun::star::uno::Reference< - com::sun::star::task::XInteractionRequest > const & rRequest) - SAL_THROW((com::sun::star::uno::RuntimeException)); + com::sun::star::task::XInteractionRequest > const & rRequest); // Helper. static OUString @@ -135,8 +131,7 @@ private: com::sun::star::task::XInteractionRequest > const & rRequest, bool bObtainErrorStringOnly, bool & bHasErrorString, - OUString & rErrorString) - SAL_THROW((com::sun::star::uno::RuntimeException)); + OUString & rErrorString); static long handlerequest(void* pHandleData, void* pInteractionHandler); @@ -144,27 +139,22 @@ private: com::sun::star::beans::Optional< OUString > getStringFromRequest_impl( com::sun::star::uno::Reference< - com::sun::star::task::XInteractionRequest > const & rRequest) - SAL_THROW((com::sun::star::uno::RuntimeException)); + com::sun::star::task::XInteractionRequest > const & rRequest); static long getstringfromrequest(void* pHandleData, void* pInteractionHandler); Window * - getParentProperty() - SAL_THROW(()); + getParentProperty(); ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow> - getParentXWindow() const - SAL_THROW(()); + getParentXWindow() const; OUString - getContextProperty() - SAL_THROW(()); + getContextProperty(); com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler2 > - getInteractionHandler() - SAL_THROW((com::sun::star::uno::RuntimeException)); + getInteractionHandler(); bool handleTypedHandlerImplementations( ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest > const & rRequest @@ -173,12 +163,10 @@ private: bool tryOtherInteractionHandler( com::sun::star::uno::Reference< - com::sun::star::task::XInteractionRequest > const & rRequest) - SAL_THROW((com::sun::star::uno::RuntimeException)); + com::sun::star::task::XInteractionRequest > const & rRequest); void - getInteractionHandlerList(InteractionHandlerDataList &rdataList) - SAL_THROW((com::sun::star::uno::RuntimeException)); + getInteractionHandlerList(InteractionHandlerDataList &rdataList); static bool isInformationalErrorMessageRequest( @@ -193,20 +181,17 @@ private: com::sun::star::task::XInteractionRequest > const & rRequest, bool bObtainErrorStringOnly, bool & bHasErrorString, - OUString & rErrorString) - SAL_THROW((com::sun::star::uno::RuntimeException)); + OUString & rErrorString); bool handleAuthenticationRequest( com::sun::star::uno::Reference< - com::sun::star::task::XInteractionRequest > const & rRequest) - SAL_THROW((com::sun::star::uno::RuntimeException)); + com::sun::star::task::XInteractionRequest > const & rRequest); bool handleCertificateValidationRequest( com::sun::star::uno::Reference< - com::sun::star::task::XInteractionRequest > const & rRequest) - SAL_THROW((com::sun::star::uno::RuntimeException)); + com::sun::star::task::XInteractionRequest > const & rRequest); void handleNameClashResolveRequest( @@ -214,38 +199,32 @@ private: com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::task::XInteractionContinuation > > const & - rContinuations) - SAL_THROW((com::sun::star::uno::RuntimeException)); + rContinuations); bool handleMasterPasswordRequest( com::sun::star::uno::Reference< - com::sun::star::task::XInteractionRequest > const & rRequest) - SAL_THROW((com::sun::star::uno::RuntimeException)); + com::sun::star::task::XInteractionRequest > const & rRequest); bool handlePasswordRequest( com::sun::star::uno::Reference< - com::sun::star::task::XInteractionRequest > const & rRequest) - SAL_THROW((com::sun::star::uno::RuntimeException)); + com::sun::star::task::XInteractionRequest > const & rRequest); bool handleNoSuchFilterRequest( com::sun::star::uno::Reference< - com::sun::star::task::XInteractionRequest > const & rRequest) - SAL_THROW((com::sun::star::uno::RuntimeException)); + com::sun::star::task::XInteractionRequest > const & rRequest); bool handleAmbigousFilterRequest( com::sun::star::uno::Reference< - com::sun::star::task::XInteractionRequest > const & rRequest) - SAL_THROW((com::sun::star::uno::RuntimeException)); + com::sun::star::task::XInteractionRequest > const & rRequest); bool handleFilterOptionsRequest( com::sun::star::uno::Reference< - com::sun::star::task::XInteractionRequest > const & rRequest) - SAL_THROW((com::sun::star::uno::RuntimeException)); + com::sun::star::task::XInteractionRequest > const & rRequest); void handleErrorHandlerRequest( @@ -258,8 +237,7 @@ private: rContinuations, bool bObtainErrorStringOnly, bool & bHasErrorString, - OUString & rErrorString) - SAL_THROW((com::sun::star::uno::RuntimeException)); + OUString & rErrorString); void handleGenericErrorRequest( @@ -270,8 +248,7 @@ private: rContinuations, bool bObtainErrorStringOnly, bool & bHasErrorString, - OUString & rErrorString) - SAL_THROW((com::sun::star::uno::RuntimeException)); + OUString & rErrorString); void handleMacroConfirmRequest( @@ -285,8 +262,7 @@ private: com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::task::XInteractionContinuation > > const & - rContinuations) - SAL_THROW((com::sun::star::uno::RuntimeException)); + rContinuations); void handleFutureDocumentVersionUpdateRequest( @@ -295,8 +271,7 @@ private: com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::task::XInteractionContinuation > > const & - rContinuations) - SAL_THROW((com::sun::star::uno::RuntimeException)); + rContinuations); void handleBrokenPackageRequest( @@ -307,23 +282,19 @@ private: rContinuations, bool bObtainErrorStringOnly, bool & bHasErrorString, - OUString & rErrorString) - SAL_THROW((::com::sun::star::uno::RuntimeException)); + OUString & rErrorString); bool handleLockedDocumentRequest( com::sun::star::uno::Reference< - com::sun::star::task::XInteractionRequest > const & rRequest) - SAL_THROW((::com::sun::star::uno::RuntimeException)); + com::sun::star::task::XInteractionRequest > const & rRequest); bool handleChangedByOthersRequest( com::sun::star::uno::Reference< - com::sun::star::task::XInteractionRequest > const & rRequest) - SAL_THROW((::com::sun::star::uno::RuntimeException)); + com::sun::star::task::XInteractionRequest > const & rRequest); bool handleLockFileIgnoreRequest( com::sun::star::uno::Reference< - com::sun::star::task::XInteractionRequest > const & rRequest) - SAL_THROW((::com::sun::star::uno::RuntimeException)); + com::sun::star::task::XInteractionRequest > const & rRequest); bool handleCustomRequest( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& i_rRequest, @@ -334,12 +305,11 @@ private: class ErrorResource: private Resource { public: - inline ErrorResource(ResId & rResId) SAL_THROW(()): Resource(rResId) {} + inline ErrorResource(ResId & rResId): Resource(rResId) {} - inline ~ErrorResource() SAL_THROW(()) { FreeResource(); } + inline ~ErrorResource() { FreeResource(); } - bool getString(ErrCode nErrorCode, OUString &rString) const - SAL_THROW(()); + bool getString(ErrCode nErrorCode, OUString &rString) const; }; #endif // INCLUDED_UUI_SOURCE_IAHNDL_HXX diff --git a/uui/source/interactionhandler.cxx b/uui/source/interactionhandler.cxx index 225ff82c0036..4cb9c523f458 100644 --- a/uui/source/interactionhandler.cxx +++ b/uui/source/interactionhandler.cxx @@ -46,10 +46,9 @@ private: public: UUIInteractionHandler(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > - const & rxContext) - SAL_THROW(()); + const & rxContext); - virtual ~UUIInteractionHandler() SAL_THROW(()); + virtual ~UUIInteractionHandler(); virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -83,7 +82,6 @@ public: UUIInteractionHandler::UUIInteractionHandler( uno::Reference< uno::XComponentContext > const & rxContext) - SAL_THROW(()) : m_pImpl(new UUIInteractionHelper(rxContext)) { } diff --git a/uui/source/passwordcontainer.cxx b/uui/source/passwordcontainer.cxx index 488a04863136..4315cff1fb39 100644 --- a/uui/source/passwordcontainer.cxx +++ b/uui/source/passwordcontainer.cxx @@ -122,7 +122,6 @@ bool PasswordContainerHelper::handleAuthenticationRequest( xSupplyAuthentication, OUString const & rURL, uno::Reference< task::XInteractionHandler2 > const & xIH ) - SAL_THROW((uno::RuntimeException)) { uno::Reference< task::XInteractionHandler > xIH1(xIH, uno::UNO_QUERY); @@ -228,7 +227,6 @@ bool PasswordContainerHelper::addRecord( uno::Sequence< OUString > const & rPasswords, uno::Reference< task::XInteractionHandler2 > const & xIH, bool bPersist ) - SAL_THROW((uno::RuntimeException)) { uno::Reference< task::XInteractionHandler > xIH1(xIH, uno::UNO_QUERY); diff --git a/uui/source/passwordcontainer.hxx b/uui/source/passwordcontainer.hxx index 768096ae8a0c..6c4542cfea7e 100644 --- a/uui/source/passwordcontainer.hxx +++ b/uui/source/passwordcontainer.hxx @@ -90,8 +90,7 @@ public: xSupplyAuthentication, OUString const & rURL, com::sun::star::uno::Reference< - com::sun::star::task::XInteractionHandler2 > const & xIH ) - SAL_THROW( (com::sun::star::uno::RuntimeException) ); + com::sun::star::task::XInteractionHandler2 > const & xIH ); /** This member function adds credentials for the given URL to the password container. @@ -126,8 +125,7 @@ public: rPasswords, com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler2 > const & xIH, - bool bPersist ) - SAL_THROW( (com::sun::star::uno::RuntimeException) ); + bool bPersist ); diff --git a/uui/source/requeststringresolver.cxx b/uui/source/requeststringresolver.cxx index c14a2f48ab94..48f6d6506b87 100644 --- a/uui/source/requeststringresolver.cxx +++ b/uui/source/requeststringresolver.cxx @@ -27,7 +27,6 @@ using namespace css; UUIInteractionRequestStringResolver::UUIInteractionRequestStringResolver( uno::Reference< uno::XComponentContext > const & rxContext) - SAL_THROW(()) : m_pImpl(new UUIInteractionHelper(rxContext)) { } @@ -90,7 +89,6 @@ uno::Reference< uno::XInterface > SAL_CALL UUIInteractionRequestStringResolver::createInstance( uno::Reference< lang::XMultiServiceFactory > const & rServiceFactory) - SAL_THROW((uno::Exception)) { try { diff --git a/uui/source/requeststringresolver.hxx b/uui/source/requeststringresolver.hxx index 3e720f48eaeb..7c6b4adb1c16 100644 --- a/uui/source/requeststringresolver.hxx +++ b/uui/source/requeststringresolver.hxx @@ -43,8 +43,7 @@ public: createInstance( com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > const & - rServiceFactory) - SAL_THROW((com::sun::star::uno::Exception)); + rServiceFactory); private: UUIInteractionHelper * m_pImpl; @@ -55,10 +54,9 @@ private: UUIInteractionRequestStringResolver( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > - const & rxContext) - SAL_THROW(()); + const & rxContext); - virtual ~UUIInteractionRequestStringResolver() SAL_THROW(()); + virtual ~UUIInteractionRequestStringResolver(); virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; -- cgit v1.2.3