diff options
Diffstat (limited to 'ucbhelper/source/client')
-rw-r--r-- | ucbhelper/source/client/activedatasink.cxx | 4 | ||||
-rw-r--r-- | ucbhelper/source/client/activedatastreamer.cxx | 4 | ||||
-rw-r--r-- | ucbhelper/source/client/commandenvironment.cxx | 4 | ||||
-rw-r--r-- | ucbhelper/source/client/content.cxx | 28 | ||||
-rw-r--r-- | ucbhelper/source/client/interceptedinteraction.cxx | 2 | ||||
-rw-r--r-- | ucbhelper/source/client/proxydecider.cxx | 8 |
6 files changed, 25 insertions, 25 deletions
diff --git a/ucbhelper/source/client/activedatasink.cxx b/ucbhelper/source/client/activedatasink.cxx index 11ba985e6170..aed7305e5efe 100644 --- a/ucbhelper/source/client/activedatasink.cxx +++ b/ucbhelper/source/client/activedatasink.cxx @@ -67,7 +67,7 @@ XTYPEPROVIDER_IMPL_2( ActiveDataSink, // virtual void SAL_CALL ActiveDataSink::setInputStream( const uno::Reference< io::XInputStream >& aStream ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { m_xStream = aStream; } @@ -75,7 +75,7 @@ void SAL_CALL ActiveDataSink::setInputStream( // virtual uno::Reference< io::XInputStream > SAL_CALL ActiveDataSink::getInputStream() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return m_xStream; } diff --git a/ucbhelper/source/client/activedatastreamer.cxx b/ucbhelper/source/client/activedatastreamer.cxx index 17035c6760da..27ab53a9b4c0 100644 --- a/ucbhelper/source/client/activedatastreamer.cxx +++ b/ucbhelper/source/client/activedatastreamer.cxx @@ -66,7 +66,7 @@ XTYPEPROVIDER_IMPL_2( ActiveDataStreamer, // virtual void SAL_CALL ActiveDataStreamer::setStream( const uno::Reference< io::XStream >& xStream ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { m_xStream = xStream; } @@ -74,7 +74,7 @@ void SAL_CALL ActiveDataStreamer::setStream( const uno::Reference< io::XStream > // virtual uno::Reference< io::XStream > SAL_CALL ActiveDataStreamer::getStream() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return m_xStream; } diff --git a/ucbhelper/source/client/commandenvironment.cxx b/ucbhelper/source/client/commandenvironment.cxx index ad07f2d73b4a..a8e938cd21c0 100644 --- a/ucbhelper/source/client/commandenvironment.cxx +++ b/ucbhelper/source/client/commandenvironment.cxx @@ -110,7 +110,7 @@ XTYPEPROVIDER_IMPL_2( CommandEnvironment, // virtual Reference< XInteractionHandler > SAL_CALL CommandEnvironment::getInteractionHandler() - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { return m_pImpl->m_xInteractionHandler; } @@ -119,7 +119,7 @@ CommandEnvironment::getInteractionHandler() // virtual Reference< XProgressHandler > SAL_CALL CommandEnvironment::getProgressHandler() - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { return m_pImpl->m_xProgressHandler; } diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx index ac1bd2d67092..e1ef0bb281bb 100644 --- a/ucbhelper/source/client/content.cxx +++ b/ucbhelper/source/client/content.cxx @@ -80,21 +80,21 @@ class EmptyInputStream : public ::cppu::WeakImplHelper1< XInputStream > public: virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 > & data, sal_Int32 nBytesToRead ) - throw (IOException, RuntimeException); + throw (IOException, RuntimeException, std::exception); virtual sal_Int32 SAL_CALL readSomeBytes( Sequence< sal_Int8 > & data, sal_Int32 nMaxBytesToRead ) - throw (IOException, RuntimeException); + throw (IOException, RuntimeException, std::exception); virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) - throw (IOException, RuntimeException); + throw (IOException, RuntimeException, std::exception); virtual sal_Int32 SAL_CALL available() - throw (IOException, RuntimeException); + throw (IOException, RuntimeException, std::exception); virtual void SAL_CALL closeInput() - throw (IOException, RuntimeException); + throw (IOException, RuntimeException, std::exception); }; sal_Int32 EmptyInputStream::readBytes( Sequence< sal_Int8 > & data, sal_Int32 ) - throw (IOException, RuntimeException) + throw (IOException, RuntimeException, std::exception) { data.realloc( 0 ); return 0; @@ -102,25 +102,25 @@ sal_Int32 EmptyInputStream::readBytes( sal_Int32 EmptyInputStream::readSomeBytes( Sequence< sal_Int8 > & data, sal_Int32 ) - throw (IOException, RuntimeException) + throw (IOException, RuntimeException, std::exception) { data.realloc( 0 ); return 0; } void EmptyInputStream::skipBytes( sal_Int32 ) - throw (IOException, RuntimeException) + throw (IOException, RuntimeException, std::exception) { } sal_Int32 EmptyInputStream::available() - throw (IOException, RuntimeException) + throw (IOException, RuntimeException, std::exception) { return 0; } void EmptyInputStream::closeInput() - throw (IOException, RuntimeException) + throw (IOException, RuntimeException, std::exception) { } @@ -147,11 +147,11 @@ public: // XContentEventListener virtual void SAL_CALL contentEvent( const ContentEvent& evt ) - throw( RuntimeException ); + throw( RuntimeException, std::exception ); // XEventListener ( base of XContentEventListener ) virtual void SAL_CALL disposing( const EventObject& Source ) - throw( RuntimeException ); + throw( RuntimeException, std::exception ); }; @@ -1330,7 +1330,7 @@ XINTERFACE_IMPL_2( ContentEventListener_Impl, // virtual void SAL_CALL ContentEventListener_Impl::contentEvent( const ContentEvent& evt ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { if ( evt.Source == m_rContent.m_xContent ) { @@ -1358,7 +1358,7 @@ void SAL_CALL ContentEventListener_Impl::contentEvent( const ContentEvent& evt ) // virtual void SAL_CALL ContentEventListener_Impl::disposing( const EventObject& Source ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { m_rContent.disposing(Source); } diff --git a/ucbhelper/source/client/interceptedinteraction.cxx b/ucbhelper/source/client/interceptedinteraction.cxx index f98cc784d29a..6dd1d0a180e8 100644 --- a/ucbhelper/source/client/interceptedinteraction.cxx +++ b/ucbhelper/source/client/interceptedinteraction.cxx @@ -63,7 +63,7 @@ css::uno::Reference< css::task::XInteractionContinuation > InterceptedInteractio } void SAL_CALL InterceptedInteraction::handle(const css::uno::Reference< css::task::XInteractionRequest >& xRequest) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { impl_handleDefault(xRequest); } diff --git a/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx index 5bcb5f0f0c32..7652f021e90a 100644 --- a/ucbhelper/source/client/proxydecider.cxx +++ b/ucbhelper/source/client/proxydecider.cxx @@ -150,11 +150,11 @@ public: // XChangesListener virtual void SAL_CALL changesOccurred( const util::ChangesEvent& Event ) - throw( uno::RuntimeException ); + throw( uno::RuntimeException, std::exception ); // XEventListener ( base of XChangesLisetenr ) virtual void SAL_CALL disposing( const lang::EventObject& Source ) - throw( uno::RuntimeException ); + throw( uno::RuntimeException, std::exception ); private: void setNoProxyList( const OUString & rNoProxyList ); @@ -563,7 +563,7 @@ const InternetProxyServer & InternetProxyDecider_Impl::getProxy( // virtual void SAL_CALL InternetProxyDecider_Impl::changesOccurred( const util::ChangesEvent& Event ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -659,7 +659,7 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred( // virtual void SAL_CALL InternetProxyDecider_Impl::disposing(const lang::EventObject&) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { if ( m_xNotifier.is() ) { |