1 files changed, 30 insertions, 31 deletions

diff --git a/io/source/stm/opump.cxx b/io/source/stm/opump.cxx
index 147ba94be334..26ecb927e497 100644
--- a/io/source/stm/opump.cxx
+++ b/io/source/stm/opump.cxx
@@ -80,29 +80,29 @@ namespace io_stm {
         virtual ~Pump() override;
 
         // XActiveDataSource
-        virtual void SAL_CALL setOutputStream( const Reference< css::io::XOutputStream >& xOutput ) throw(std::exception) override;
-        virtual Reference< css::io::XOutputStream > SAL_CALL getOutputStream() throw(std::exception) override;
+        virtual void SAL_CALL setOutputStream( const Reference< css::io::XOutputStream >& xOutput ) override;
+        virtual Reference< css::io::XOutputStream > SAL_CALL getOutputStream() override;
 
         // XActiveDataSink
-        virtual void SAL_CALL setInputStream( const Reference< css::io::XInputStream >& xStream ) throw(std::exception) override;
-        virtual Reference< css::io::XInputStream > SAL_CALL getInputStream() throw(std::exception) override;
+        virtual void SAL_CALL setInputStream( const Reference< css::io::XInputStream >& xStream ) override;
+        virtual Reference< css::io::XInputStream > SAL_CALL getInputStream() override;
 
         // XActiveDataControl
-        virtual void SAL_CALL addListener( const Reference< css::io::XStreamListener >& xListener ) throw(std::exception) override;
-        virtual void SAL_CALL removeListener( const Reference< css::io::XStreamListener >& xListener ) throw(std::exception) override;
-        virtual void SAL_CALL start() throw( RuntimeException, std::exception ) override;
-        virtual void SAL_CALL terminate() throw(std::exception) override;
+        virtual void SAL_CALL addListener( const Reference< css::io::XStreamListener >& xListener ) override;
+        virtual void SAL_CALL removeListener( const Reference< css::io::XStreamListener >& xListener ) override;
+        virtual void SAL_CALL start() override;
+        virtual void SAL_CALL terminate() override;
 
         // XConnectable
-        virtual void SAL_CALL setPredecessor( const Reference< css::io::XConnectable >& xPred ) throw(std::exception) override;
-        virtual Reference< css::io::XConnectable > SAL_CALL getPredecessor() throw(std::exception) override;
-        virtual void SAL_CALL setSuccessor( const Reference< css::io::XConnectable >& xSucc ) throw(std::exception) override;
-        virtual Reference< css::io::XConnectable > SAL_CALL getSuccessor() throw(std::exception) override;
+        virtual void SAL_CALL setPredecessor( const Reference< css::io::XConnectable >& xPred ) override;
+        virtual Reference< css::io::XConnectable > SAL_CALL getPredecessor() override;
+        virtual void SAL_CALL setSuccessor( const Reference< css::io::XConnectable >& xSucc ) override;
+        virtual Reference< css::io::XConnectable > SAL_CALL getSuccessor() override;
 
     public: // XServiceInfo
-        virtual OUString    SAL_CALL getImplementationName() throw(std::exception  ) override;
-        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception  ) override;
-        virtual sal_Bool     SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception  ) override;
+        virtual OUString    SAL_CALL getImplementationName() override;
+        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
+        virtual sal_Bool     SAL_CALL supportsService(const OUString& ServiceName) override;
     };
 
 Pump::Pump() : m_aThread( nullptr ),
@@ -304,28 +304,28 @@ void Pump::run()
  * XConnectable
  */
 
-void Pump::setPredecessor( const Reference< XConnectable >& xPred ) throw(std::exception)
+void Pump::setPredecessor( const Reference< XConnectable >& xPred )
 {
     Guard< Mutex > aGuard( m_aMutex );
     m_xPred = xPred;
 }
 
 
-Reference< XConnectable > Pump::getPredecessor() throw(std::exception)
+Reference< XConnectable > Pump::getPredecessor()
 {
     Guard< Mutex > aGuard( m_aMutex );
     return m_xPred;
 }
 
 
-void Pump::setSuccessor( const Reference< XConnectable >& xSucc ) throw(std::exception)
+void Pump::setSuccessor( const Reference< XConnectable >& xSucc )
 {
     Guard< Mutex > aGuard( m_aMutex );
     m_xSucc = xSucc;
 }
 
 
-Reference< XConnectable > Pump::getSuccessor() throw(std::exception)
+Reference< XConnectable > Pump::getSuccessor()
 {
     Guard< Mutex > aGuard( m_aMutex );
     return m_xSucc;
@@ -336,19 +336,19 @@ Reference< XConnectable > Pump::getSuccessor() throw(std::exception)
  * XActiveDataControl
  */
 
-void Pump::addListener( const Reference< XStreamListener >& xListener ) throw(std::exception)
+void Pump::addListener( const Reference< XStreamListener >& xListener )
 {
     m_cnt.addInterface( xListener );
 }
 
 
-void Pump::removeListener( const Reference< XStreamListener >& xListener ) throw(std::exception)
+void Pump::removeListener( const Reference< XStreamListener >& xListener )
 {
     m_cnt.removeInterface( xListener );
 }
 
 
-void Pump::start() throw( RuntimeException, std::exception )
+void Pump::start()
 {
     Guard< Mutex > aGuard( m_aMutex );
     m_aThread = osl_createSuspendedThread(Pump::static_run,this);
@@ -367,7 +367,7 @@ void Pump::start() throw( RuntimeException, std::exception )
 }
 
 
-void Pump::terminate() throw(std::exception)
+void Pump::terminate()
 {
     close();
 
@@ -384,7 +384,7 @@ void Pump::terminate() throw(std::exception)
  * XActiveDataSink
  */
 
-void Pump::setInputStream( const Reference< XInputStream >& xStream ) throw(std::exception)
+void Pump::setInputStream( const Reference< XInputStream >& xStream )
 {
     Guard< Mutex > aGuard( m_aMutex );
     m_xInput = xStream;
@@ -395,7 +395,7 @@ void Pump::setInputStream( const Reference< XInputStream >& xStream ) throw(std:
 }
 
 
-Reference< XInputStream > Pump::getInputStream() throw(std::exception)
+Reference< XInputStream > Pump::getInputStream()
 {
     Guard< Mutex > aGuard( m_aMutex );
     return m_xInput;
@@ -406,7 +406,7 @@ Reference< XInputStream > Pump::getInputStream() throw(std::exception)
  * XActiveDataSource
  */
 
-void Pump::setOutputStream( const Reference< XOutputStream >& xOut ) throw(std::exception)
+void Pump::setOutputStream( const Reference< XOutputStream >& xOut )
 {
     Guard< Mutex > aGuard( m_aMutex );
     m_xOutput = xOut;
@@ -416,26 +416,26 @@ void Pump::setOutputStream( const Reference< XOutputStream >& xOut ) throw(std::
     // data transfer starts in XActiveDataControl::start
 }
 
-Reference< XOutputStream > Pump::getOutputStream() throw(std::exception)
+Reference< XOutputStream > Pump::getOutputStream()
 {
     Guard< Mutex > aGuard( m_aMutex );
     return m_xOutput;
 }
 
 // XServiceInfo
-OUString Pump::getImplementationName() throw(std::exception  )
+OUString Pump::getImplementationName()
 {
     return OPumpImpl_getImplementationName();
 }
 
 // XServiceInfo
-sal_Bool Pump::supportsService(const OUString& ServiceName) throw(std::exception  )
+sal_Bool Pump::supportsService(const OUString& ServiceName)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 // XServiceInfo
-Sequence< OUString > Pump::getSupportedServiceNames() throw(std::exception  )
+Sequence< OUString > Pump::getSupportedServiceNames()
 {
     return OPumpImpl_getSupportedServiceNames();
 }
@@ -443,7 +443,6 @@ Sequence< OUString > Pump::getSupportedServiceNames() throw(std::exception  )
 
 Reference< XInterface > SAL_CALL OPumpImpl_CreateInstance(
     SAL_UNUSED_PARAMETER const Reference< XComponentContext > & )
-    throw (Exception)
 {
     return Reference< XInterface >( *new Pump );
 }