diff options
Diffstat (limited to 'framework/source/fwe/dispatch/interaction.cxx')
| -rw-r--r-- | framework/source/fwe/dispatch/interaction.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/framework/source/fwe/dispatch/interaction.cxx b/framework/source/fwe/dispatch/interaction.cxx index 61dc5bed6b97..68eb2c7f3f57 100644 --- a/framework/source/fwe/dispatch/interaction.cxx +++ b/framework/source/fwe/dispatch/interaction.cxx @@ -53,8 +53,8 @@ class ContinuationFilterSelect : public comphelper::OInteraction< ::com::sun::st // uno interface public: - virtual void SAL_CALL setFilter( const OUString& sFilter ) throw( ::com::sun::star::uno::RuntimeException ); - virtual OUString SAL_CALL getFilter( ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setFilter( const OUString& sFilter ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getFilter( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); // member private: @@ -74,7 +74,7 @@ ContinuationFilterSelect::ContinuationFilterSelect() // handler should use it after selection to set user specified filter for transport -void SAL_CALL ContinuationFilterSelect::setFilter( const OUString& sFilter ) throw( css::uno::RuntimeException ) +void SAL_CALL ContinuationFilterSelect::setFilter( const OUString& sFilter ) throw( css::uno::RuntimeException, std::exception ) { m_sFilter = sFilter; } @@ -82,7 +82,7 @@ void SAL_CALL ContinuationFilterSelect::setFilter( const OUString& sFilter ) thr // read access to transported filter -OUString SAL_CALL ContinuationFilterSelect::getFilter() throw( css::uno::RuntimeException ) +OUString SAL_CALL ContinuationFilterSelect::getFilter() throw( css::uno::RuntimeException, std::exception ) { return m_sFilter; } @@ -95,8 +95,8 @@ public: OUString getFilter() const; public: - virtual ::com::sun::star::uno::Any SAL_CALL getRequest() throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Any SAL_CALL getRequest() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( ::com::sun::star::uno::RuntimeException, std::exception ); private: ::com::sun::star::uno::Any m_aRequest ; @@ -148,7 +148,7 @@ OUString RequestFilterSelect_Impl::getFilter() const // handler call it to get type of request // Is hard coded to "please select filter" here. see ctor for further information. -css::uno::Any SAL_CALL RequestFilterSelect_Impl::getRequest() throw( css::uno::RuntimeException ) +css::uno::Any SAL_CALL RequestFilterSelect_Impl::getRequest() throw( css::uno::RuntimeException, std::exception ) { return m_aRequest; } @@ -159,7 +159,7 @@ css::uno::Any SAL_CALL RequestFilterSelect_Impl::getRequest() throw( css::uno::R // After interaction we support read access on these continuations on our c++ interface to // return user decision. -css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL RequestFilterSelect_Impl::getContinuations() throw( css::uno::RuntimeException ) +css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL RequestFilterSelect_Impl::getContinuations() throw( css::uno::RuntimeException, std::exception ) { return m_lContinuations; } @@ -213,18 +213,18 @@ public: m_lContinuations = lContinuations; } - virtual uno::Any SAL_CALL getRequest() throw( uno::RuntimeException ); + virtual uno::Any SAL_CALL getRequest() throw( uno::RuntimeException, std::exception ); virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL getContinuations() - throw( uno::RuntimeException ); + throw( uno::RuntimeException, std::exception ); }; -uno::Any SAL_CALL InteractionRequest_Impl::getRequest() throw( uno::RuntimeException ) +uno::Any SAL_CALL InteractionRequest_Impl::getRequest() throw( uno::RuntimeException, std::exception ) { return m_aRequest; } uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL InteractionRequest_Impl::getContinuations() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return m_lContinuations; } |