cppuhelper: retrofit std::exception into overriding exception specs

Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3

13 files changed, 396 insertions, 396 deletions

diff --git a/io/source/TextInputStream/TextInputStream.cxx b/io/source/TextInputStream/TextInputStream.cxx
index d6df3a2dc517..3485877a0cb3 100644
--- a/io/source/TextInputStream/TextInputStream.cxx
+++ b/io/source/TextInputStream/TextInputStream.cxx
@@ -85,35 +85,35 @@ public:
 
     // Methods XTextInputStream
     virtual OUString SAL_CALL readLine(  )
-        throw(IOException, RuntimeException);
+        throw(IOException, RuntimeException, std::exception);
     virtual OUString SAL_CALL readString( const Sequence< sal_Unicode >& Delimiters, sal_Bool bRemoveDelimiter )
-        throw(IOException, RuntimeException);
+        throw(IOException, RuntimeException, std::exception);
     virtual sal_Bool SAL_CALL isEOF(  )
-        throw(IOException, RuntimeException);
-    virtual void SAL_CALL setEncoding( const OUString& Encoding ) throw(RuntimeException);
+        throw(IOException, RuntimeException, std::exception);
+    virtual void SAL_CALL setEncoding( const OUString& Encoding ) throw(RuntimeException, std::exception);
 
     // Methods XInputStream
     virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
-        throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException);
+        throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception);
     virtual sal_Int32 SAL_CALL readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
-        throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException);
+        throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception);
     virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
-        throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException);
+        throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception);
     virtual sal_Int32 SAL_CALL available(  )
-        throw(NotConnectedException, IOException, RuntimeException);
+        throw(NotConnectedException, IOException, RuntimeException, std::exception);
     virtual void SAL_CALL closeInput(  )
-        throw(NotConnectedException, IOException, RuntimeException);
+        throw(NotConnectedException, IOException, RuntimeException, std::exception);
 
     // Methods XActiveDataSink
     virtual void SAL_CALL setInputStream( const Reference< XInputStream >& aStream )
-        throw(RuntimeException);
+        throw(RuntimeException, std::exception);
     virtual Reference< XInputStream > SAL_CALL getInputStream()
-        throw(RuntimeException);
+        throw(RuntimeException, std::exception);
 
     // Methods XServiceInfo
-        virtual OUString              SAL_CALL getImplementationName() throw();
-        virtual Sequence< OUString >  SAL_CALL getSupportedServiceNames(void) throw();
-        virtual sal_Bool              SAL_CALL supportsService(const OUString& ServiceName) throw();
+        virtual OUString              SAL_CALL getImplementationName() throw(std::exception);
+        virtual Sequence< OUString >  SAL_CALL getSupportedServiceNames(void) throw(std::exception);
+        virtual sal_Bool              SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception);
 };
 
 OTextInputStream::OTextInputStream()
@@ -149,20 +149,20 @@ void OTextInputStream::implResizeBuffer( void )
 // XTextInputStream
 
 OUString OTextInputStream::readLine(  )
-    throw(IOException, RuntimeException)
+    throw(IOException, RuntimeException, std::exception)
 {
     static Sequence< sal_Unicode > aDummySeq;
     return implReadString( aDummySeq, sal_True, sal_True );
 }
 
 OUString OTextInputStream::readString( const Sequence< sal_Unicode >& Delimiters, sal_Bool bRemoveDelimiter )
-        throw(IOException, RuntimeException)
+        throw(IOException, RuntimeException, std::exception)
 {
     return implReadString( Delimiters, bRemoveDelimiter, sal_False );
 }
 
 sal_Bool OTextInputStream::isEOF()
-    throw(IOException, RuntimeException)
+    throw(IOException, RuntimeException, std::exception)
 {
     sal_Bool bRet = sal_False;
     if( mnCharsInBuffer == 0 && mbReachedEOF )
@@ -366,7 +366,7 @@ sal_Int32 OTextInputStream::implReadNext()
 }
 
 void OTextInputStream::setEncoding( const OUString& Encoding )
-    throw(RuntimeException)
+    throw(RuntimeException, std::exception)
 {
     OString aOEncodingStr = OUStringToOString( Encoding, RTL_TEXTENCODING_ASCII_US );
     rtl_TextEncoding encoding = rtl_getTextEncodingFromMimeCharset( aOEncodingStr.getStr() );
@@ -383,31 +383,31 @@ void OTextInputStream::setEncoding( const OUString& Encoding )
 // XInputStream
 
 sal_Int32 OTextInputStream::readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
-    throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException)
+    throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception)
 {
     return mxStream->readBytes( aData, nBytesToRead );
 }
 
 sal_Int32 OTextInputStream::readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
-    throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException)
+    throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception)
 {
     return mxStream->readSomeBytes( aData, nMaxBytesToRead );
 }
 
 void OTextInputStream::skipBytes( sal_Int32 nBytesToSkip )
-    throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException)
+    throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception)
 {
     mxStream->skipBytes( nBytesToSkip );
 }
 
 sal_Int32 OTextInputStream::available(  )
-    throw(NotConnectedException, IOException, RuntimeException)
+    throw(NotConnectedException, IOException, RuntimeException, std::exception)
 {
     return mxStream->available();
 }
 
 void OTextInputStream::closeInput(  )
-    throw(NotConnectedException, IOException, RuntimeException)
+    throw(NotConnectedException, IOException, RuntimeException, std::exception)
 {
     mxStream->closeInput();
 }
@@ -417,13 +417,13 @@ void OTextInputStream::closeInput(  )
 // XActiveDataSink
 
 void OTextInputStream::setInputStream( const Reference< XInputStream >& aStream )
-    throw(RuntimeException)
+    throw(RuntimeException, std::exception)
 {
     mxStream = aStream;
 }
 
 Reference< XInputStream > OTextInputStream::getInputStream()
-    throw(RuntimeException)
+    throw(RuntimeException, std::exception)
 {
     return mxStream;
 }
@@ -447,17 +447,17 @@ Sequence< OUString > TextInputStream_getSupportedServiceNames()
     return seqNames;
 }
 
-OUString OTextInputStream::getImplementationName() throw()
+OUString OTextInputStream::getImplementationName() throw(std::exception)
 {
     return TextInputStream_getImplementationName();
 }
 
-sal_Bool OTextInputStream::supportsService(const OUString& ServiceName) throw()
+sal_Bool OTextInputStream::supportsService(const OUString& ServiceName) throw(std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-Sequence< OUString > OTextInputStream::getSupportedServiceNames(void) throw()
+Sequence< OUString > OTextInputStream::getSupportedServiceNames(void) throw(std::exception)
 {
     return TextInputStream_getSupportedServiceNames();
 }
diff --git a/io/source/TextOutputStream/TextOutputStream.cxx b/io/source/TextOutputStream/TextOutputStream.cxx
index 6c1988ecaab4..7754ec5aa1fa 100644
--- a/io/source/TextOutputStream/TextOutputStream.cxx
+++ b/io/source/TextOutputStream/TextOutputStream.cxx
@@ -72,28 +72,28 @@ public:
 
     // Methods XTextOutputStream
     virtual void SAL_CALL writeString( const OUString& aString )
-        throw(IOException, RuntimeException);
+        throw(IOException, RuntimeException, std::exception);
     virtual void SAL_CALL setEncoding( const OUString& Encoding )
-        throw(RuntimeException);
+        throw(RuntimeException, std::exception);
 
     // Methods XOutputStream
     virtual void SAL_CALL writeBytes( const Sequence< sal_Int8 >& aData )
-        throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException);
+        throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception);
     virtual void SAL_CALL flush(  )
-        throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException);
+        throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception);
     virtual void SAL_CALL closeOutput(  )
-        throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException);
+        throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception);
 
     // Methods XActiveDataSource
     virtual void SAL_CALL setOutputStream( const Reference< XOutputStream >& aStream )
-        throw(RuntimeException);
+        throw(RuntimeException, std::exception);
     virtual Reference< XOutputStream > SAL_CALL getOutputStream(  )
-        throw(RuntimeException);
+        throw(RuntimeException, std::exception);
 
     // Methods XServiceInfo
-        virtual OUString              SAL_CALL getImplementationName() throw();
-        virtual Sequence< OUString >  SAL_CALL getSupportedServiceNames(void) throw();
-        virtual sal_Bool              SAL_CALL supportsService(const OUString& ServiceName) throw();
+        virtual OUString              SAL_CALL getImplementationName() throw(std::exception);
+        virtual Sequence< OUString >  SAL_CALL getSupportedServiceNames(void) throw(std::exception);
+        virtual sal_Bool              SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception);
 };
 
 OTextOutputStream::OTextOutputStream()
@@ -163,7 +163,7 @@ Sequence<sal_Int8> OTextOutputStream::implConvert( const OUString& rSource )
 // XTextOutputStream
 
 void OTextOutputStream::writeString( const OUString& aString )
-    throw(IOException, RuntimeException)
+    throw(IOException, RuntimeException, std::exception)
 {
     checkOutputStream();
     if( !mbEncodingInitialized )
@@ -179,7 +179,7 @@ void OTextOutputStream::writeString( const OUString& aString )
 }
 
 void OTextOutputStream::setEncoding( const OUString& Encoding )
-    throw(RuntimeException)
+    throw(RuntimeException, std::exception)
 {
     OString aOEncodingStr = OUStringToOString( Encoding, RTL_TEXTENCODING_ASCII_US );
     rtl_TextEncoding encoding = rtl_getTextEncodingFromMimeCharset( aOEncodingStr.getStr() );
@@ -195,21 +195,21 @@ void OTextOutputStream::setEncoding( const OUString& Encoding )
 
 // XOutputStream
 void OTextOutputStream::writeBytes( const Sequence< sal_Int8 >& aData )
-    throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException)
+    throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception)
 {
     checkOutputStream();
     mxStream->writeBytes( aData );
 }
 
 void OTextOutputStream::flush(  )
-    throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException)
+    throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception)
 {
     checkOutputStream();
     mxStream->flush();
 }
 
 void OTextOutputStream::closeOutput(  )
-    throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException)
+    throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception)
 {
     checkOutputStream();
     mxStream->closeOutput();
@@ -230,13 +230,13 @@ void OTextOutputStream::checkOutputStream()
 // XActiveDataSource
 
 void OTextOutputStream::setOutputStream( const Reference< XOutputStream >& aStream )
-    throw(RuntimeException)
+    throw(RuntimeException, std::exception)
 {
     mxStream = aStream;
 }
 
 Reference< XOutputStream > OTextOutputStream::getOutputStream()
-    throw(RuntimeException)
+    throw(RuntimeException, std::exception)
 {
     return mxStream;
 }
@@ -261,17 +261,17 @@ Sequence< OUString > TextOutputStream_getSupportedServiceNames()
     return seqNames;
 }
 
-OUString OTextOutputStream::getImplementationName() throw()
+OUString OTextOutputStream::getImplementationName() throw(std::exception)
 {
     return TextOutputStream_getImplementationName();
 }
 
-sal_Bool OTextOutputStream::supportsService(const OUString& ServiceName) throw()
+sal_Bool OTextOutputStream::supportsService(const OUString& ServiceName) throw(std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-Sequence< OUString > OTextOutputStream::getSupportedServiceNames(void) throw()
+Sequence< OUString > OTextOutputStream::getSupportedServiceNames(void) throw(std::exception)
 {
     return TextOutputStream_getSupportedServiceNames();
 }
diff --git a/io/source/acceptor/acc_pipe.cxx b/io/source/acceptor/acc_pipe.cxx
index 9ff92addcba6..fb982124305c 100644
--- a/io/source/acceptor/acc_pipe.cxx
+++ b/io/source/acceptor/acc_pipe.cxx
@@ -46,18 +46,18 @@ namespace io_acceptor
 
         virtual sal_Int32 SAL_CALL read( Sequence< sal_Int8 >& aReadBytes, sal_Int32 nBytesToRead )
             throw(::com::sun::star::io::IOException,
-                  ::com::sun::star::uno::RuntimeException);
+                  ::com::sun::star::uno::RuntimeException, std::exception);
         virtual void SAL_CALL write( const Sequence< sal_Int8 >& aData )
             throw(::com::sun::star::io::IOException,
-                  ::com::sun::star::uno::RuntimeException);
+                  ::com::sun::star::uno::RuntimeException, std::exception);
         virtual void SAL_CALL flush(  ) throw(
             ::com::sun::star::io::IOException,
-            ::com::sun::star::uno::RuntimeException);
+            ::com::sun::star::uno::RuntimeException, std::exception);
         virtual void SAL_CALL close(  )
             throw(::com::sun::star::io::IOException,
-                  ::com::sun::star::uno::RuntimeException);
+                  ::com::sun::star::uno::RuntimeException, std::exception);
         virtual OUString SAL_CALL getDescription(  )
-            throw(::com::sun::star::uno::RuntimeException);
+            throw(::com::sun::star::uno::RuntimeException, std::exception);
     public:
         ::osl::StreamPipe m_pipe;
         oslInterlockedCount m_nStatus;
@@ -84,7 +84,7 @@ namespace io_acceptor
 
     sal_Int32 PipeConnection::read( Sequence < sal_Int8 > & aReadBytes , sal_Int32 nBytesToRead )
         throw(::com::sun::star::io::IOException,
-              ::com::sun::star::uno::RuntimeException)
+              ::com::sun::star::uno::RuntimeException, std::exception)
     {
         if( ! m_nStatus )
         {
@@ -107,7 +107,7 @@ namespace io_acceptor
 
     void PipeConnection::write( const Sequence < sal_Int8 > &seq )
             throw(::com::sun::star::io::IOException,
-                  ::com::sun::star::uno::RuntimeException)
+                  ::com::sun::star::uno::RuntimeException, std::exception)
     {
         if( ! m_nStatus )
         {
@@ -123,13 +123,13 @@ namespace io_acceptor
 
     void PipeConnection::flush( )
         throw(  ::com::sun::star::io::IOException,
-                ::com::sun::star::uno::RuntimeException)
+                ::com::sun::star::uno::RuntimeException, std::exception)
     {
     }
 
     void PipeConnection::close()
         throw( ::com::sun::star::io::IOException,
-               ::com::sun::star::uno::RuntimeException)
+               ::com::sun::star::uno::RuntimeException, std::exception)
     {
         if(  1 == osl_atomic_increment( (&m_nStatus) ) )
         {
@@ -138,7 +138,7 @@ namespace io_acceptor
     }
 
     OUString PipeConnection::getDescription()
-            throw(::com::sun::star::uno::RuntimeException)
+            throw(::com::sun::star::uno::RuntimeException, std::exception)
     {
         return m_sDescription;
     }
diff --git a/io/source/acceptor/acc_socket.cxx b/io/source/acceptor/acc_socket.cxx
index 6a10eb4fd5cf..196b5613436d 100644
--- a/io/source/acceptor/acc_socket.cxx
+++ b/io/source/acceptor/acc_socket.cxx
@@ -75,24 +75,24 @@ namespace io_acceptor {
         virtual sal_Int32 SAL_CALL read( ::com::sun::star::uno::Sequence< sal_Int8 >& aReadBytes,
                                          sal_Int32 nBytesToRead )
             throw(::com::sun::star::io::IOException,
-                  ::com::sun::star::uno::RuntimeException);
+                  ::com::sun::star::uno::RuntimeException, std::exception);
         virtual void SAL_CALL write( const ::com::sun::star::uno::Sequence< sal_Int8 >& aData )
             throw(::com::sun::star::io::IOException,
-                  ::com::sun::star::uno::RuntimeException);
+                  ::com::sun::star::uno::RuntimeException, std::exception);
         virtual void SAL_CALL flush(  ) throw(
             ::com::sun::star::io::IOException,
-            ::com::sun::star::uno::RuntimeException);
+            ::com::sun::star::uno::RuntimeException, std::exception);
         virtual void SAL_CALL close(  )
             throw(::com::sun::star::io::IOException,
-                  ::com::sun::star::uno::RuntimeException);
+                  ::com::sun::star::uno::RuntimeException, std::exception);
         virtual OUString SAL_CALL getDescription(  )
-            throw(::com::sun::star::uno::RuntimeException);
+            throw(::com::sun::star::uno::RuntimeException, std::exception);
 
         // XConnectionBroadcaster
         virtual void SAL_CALL addStreamListener(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>& aListener)
-            throw(::com::sun::star::uno::RuntimeException);
+            throw(::com::sun::star::uno::RuntimeException, std::exception);
         virtual void SAL_CALL removeStreamListener(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>& aListener)
-            throw(::com::sun::star::uno::RuntimeException);
+            throw(::com::sun::star::uno::RuntimeException, std::exception);
 
     public:
         void completeConnectionString();
@@ -192,7 +192,7 @@ namespace io_acceptor {
 
     sal_Int32 SocketConnection::read( Sequence < sal_Int8 > & aReadBytes , sal_Int32 nBytesToRead )
             throw(::com::sun::star::io::IOException,
-                  ::com::sun::star::uno::RuntimeException)
+                  ::com::sun::star::uno::RuntimeException, std::exception)
     {
         if( ! m_nStatus )
         {
@@ -240,7 +240,7 @@ namespace io_acceptor {
 
     void SocketConnection::write( const Sequence < sal_Int8 > &seq )
             throw(::com::sun::star::io::IOException,
-                  ::com::sun::star::uno::RuntimeException)
+                  ::com::sun::star::uno::RuntimeException, std::exception)
     {
         if( ! m_nStatus )
         {
@@ -276,14 +276,14 @@ namespace io_acceptor {
 
     void SocketConnection::flush( )
             throw(::com::sun::star::io::IOException,
-                  ::com::sun::star::uno::RuntimeException)
+                  ::com::sun::star::uno::RuntimeException, std::exception)
     {
 
     }
 
     void SocketConnection::close()
             throw(::com::sun::star::io::IOException,
-                  ::com::sun::star::uno::RuntimeException)
+                  ::com::sun::star::uno::RuntimeException, std::exception)
     {
         // enshure close is called only once
         if(  1 == osl_atomic_increment( (&m_nStatus) ) )
@@ -294,21 +294,21 @@ namespace io_acceptor {
     }
 
     OUString SocketConnection::getDescription()
-            throw( ::com::sun::star::uno::RuntimeException)
+            throw( ::com::sun::star::uno::RuntimeException, std::exception)
     {
         return m_sDescription;
     }
 
 
     // XConnectionBroadcaster
-    void SAL_CALL SocketConnection::addStreamListener(const Reference<XStreamListener> & aListener) throw(RuntimeException)
+    void SAL_CALL SocketConnection::addStreamListener(const Reference<XStreamListener> & aListener) throw(RuntimeException, std::exception)
     {
         MutexGuard guard(_mutex);
 
         _listeners.insert(aListener);
     }
 
-    void SAL_CALL SocketConnection::removeStreamListener(const Reference<XStreamListener> & aListener) throw(RuntimeException)
+    void SAL_CALL SocketConnection::removeStreamListener(const Reference<XStreamListener> & aListener) throw(RuntimeException, std::exception)
     {
         MutexGuard guard(_mutex);
 
diff --git a/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx
index 089d08199452..6159d3e7188f 100644
--- a/io/source/acceptor/acceptor.cxx
+++ b/io/source/acceptor/acceptor.cxx
@@ -58,13 +58,13 @@ namespace io_acceptor
             throw( AlreadyAcceptingException,
                    ConnectionSetupException,
                    IllegalArgumentException,
-                   RuntimeException);
-        virtual void SAL_CALL stopAccepting(  ) throw( RuntimeException);
+                   RuntimeException, std::exception);
+        virtual void SAL_CALL stopAccepting(  ) throw( RuntimeException, std::exception);
 
     public: // XServiceInfo
-                virtual OUString              SAL_CALL getImplementationName() throw();
-                virtual Sequence< OUString >  SAL_CALL getSupportedServiceNames(void) throw();
-                virtual sal_Bool              SAL_CALL supportsService(const OUString& ServiceName) throw();
+                virtual OUString              SAL_CALL getImplementationName() throw(std::exception);
+                virtual Sequence< OUString >  SAL_CALL getSupportedServiceNames(void) throw(std::exception);
+                virtual sal_Bool              SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception);
 
     private:
         PipeAcceptor *m_pPipe;
@@ -123,7 +123,7 @@ namespace io_acceptor
         throw( AlreadyAcceptingException,
                ConnectionSetupException,
                IllegalArgumentException,
-               RuntimeException)
+               RuntimeException, std::exception)
     {
         OSL_TRACE(
             "acceptor %s\n",
@@ -249,7 +249,7 @@ namespace io_acceptor
         return r;
     }
 
-    void SAL_CALL OAcceptor::stopAccepting(  ) throw( RuntimeException)
+    void SAL_CALL OAcceptor::stopAccepting(  ) throw( RuntimeException, std::exception)
     {
         MutexGuard guard( m_mutex );
 
@@ -285,17 +285,17 @@ namespace io_acceptor
         return seqNames;
     }
 
-        OUString OAcceptor::getImplementationName() throw()
+        OUString OAcceptor::getImplementationName() throw(std::exception)
     {
         return acceptor_getImplementationName();
     }
 
-        sal_Bool OAcceptor::supportsService(const OUString& ServiceName) throw()
+        sal_Bool OAcceptor::supportsService(const OUString& ServiceName) throw(std::exception)
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-        Sequence< OUString > OAcceptor::getSupportedServiceNames(void) throw()
+        Sequence< OUString > OAcceptor::getSupportedServiceNames(void) throw(std::exception)
     {
         return acceptor_getSupportedServiceNames();
     }
diff --git a/io/source/connector/connector.cxx b/io/source/connector/connector.cxx
index b697483a5482..a580ba927981 100644
--- a/io/source/connector/connector.cxx
+++ b/io/source/connector/connector.cxx
@@ -58,12 +58,12 @@ namespace stoc_connector
         // Methods
         virtual Reference< XConnection > SAL_CALL connect(
             const OUString& sConnectionDescription )
-            throw( NoConnectException, ConnectionSetupException, RuntimeException);
+            throw( NoConnectException, ConnectionSetupException, RuntimeException, std::exception);
 
     public: // XServiceInfo
-                virtual OUString              SAL_CALL getImplementationName() throw();
-                virtual Sequence< OUString >  SAL_CALL getSupportedServiceNames(void) throw();
-                virtual sal_Bool              SAL_CALL supportsService(const OUString& ServiceName) throw();
+                virtual OUString              SAL_CALL getImplementationName() throw(std::exception);
+                virtual Sequence< OUString >  SAL_CALL getSupportedServiceNames(void) throw(std::exception);
+                virtual sal_Bool              SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception);
     };
 
     OConnector::OConnector(const Reference< XComponentContext > &xCtx)
@@ -74,7 +74,7 @@ namespace stoc_connector
     OConnector::~OConnector() {}
 
     Reference< XConnection > SAL_CALL OConnector::connect( const OUString& sConnectionDescription )
-        throw( NoConnectException, ConnectionSetupException, RuntimeException)
+        throw( NoConnectException, ConnectionSetupException, RuntimeException, std::exception)
     {
         OSL_TRACE(
             "connector %s\n",
@@ -187,17 +187,17 @@ namespace stoc_connector
         return OUString( IMPLEMENTATION_NAME );
     }
 
-        OUString OConnector::getImplementationName() throw()
+        OUString OConnector::getImplementationName() throw(std::exception)
     {
         return connector_getImplementationName();
     }
 
-        sal_Bool OConnector::supportsService(const OUString& ServiceName) throw()
+        sal_Bool OConnector::supportsService(const OUString& ServiceName) throw(std::exception)
     {
         return cppu::supportsService(this, ServiceName);
     }
 
-        Sequence< OUString > OConnector::getSupportedServiceNames(void) throw()
+        Sequence< OUString > OConnector::getSupportedServiceNames(void) throw(std::exception)
     {
         return connector_getSupportedServiceNames();
     }
diff --git a/io/source/connector/connector.hxx b/io/source/connector/connector.hxx
index 14abf3c6119f..b15707abbadd 100644
--- a/io/source/connector/connector.hxx
+++ b/io/source/connector/connector.hxx
@@ -64,18 +64,18 @@ namespace stoc_connector
         virtual sal_Int32 SAL_CALL read( ::com::sun::star::uno::Sequence< sal_Int8 >& aReadBytes,
                                          sal_Int32 nBytesToRead )
             throw(::com::sun::star::io::IOException,
-                  ::com::sun::star::uno::RuntimeException);
+                  ::com::sun::star::uno::RuntimeException, std::exception);
         virtual void SAL_CALL write( const ::com::sun::star::uno::Sequence< sal_Int8 >& aData )
             throw(::com::sun::star::io::IOException,
-                  ::com::sun::star::uno::RuntimeException);
+                  ::com::sun::star::uno::RuntimeException, std::exception);
         virtual void SAL_CALL flush(  ) throw(
             ::com::sun::star::io::IOException,
-            ::com::sun::star::uno::RuntimeException);
+            ::com::sun::star::uno::RuntimeException, std::exception);
         virtual void SAL_CALL close(  )
             throw(::com::sun::star::io::IOException,
-                  ::com::sun::star::uno::RuntimeException);
+                  ::com::sun::star::uno::RuntimeException, std::exception);
         virtual OUString SAL_CALL getDescription(  )
-            throw(::com::sun::star::uno::RuntimeException);
+            throw(::com::sun::star::uno::RuntimeException, std::exception);
     public:
         ::osl::StreamPipe m_pipe;
         oslInterlockedCount m_nStatus;
@@ -93,25 +93,25 @@ namespace stoc_connector
         virtual sal_Int32 SAL_CALL read( ::com::sun::star::uno::Sequence< sal_Int8 >& aReadBytes,
                                          sal_Int32 nBytesToRead )
             throw(::com::sun::star::io::IOException,
-                  ::com::sun::star::uno::RuntimeException);
+                  ::com::sun::star::uno::RuntimeException, std::exception);
         virtual void SAL_CALL write( const ::com::sun::star::uno::Sequence< sal_Int8 >& aData )
             throw(::com::sun::star::io::IOException,
-                  ::com::sun::star::uno::RuntimeException);
+                  ::com::sun::star::uno::RuntimeException, std::exception);
         virtual void SAL_CALL flush(  ) throw(
             ::com::sun::star::io::IOException,
-            ::com::sun::star::uno::RuntimeException);
+            ::com::sun::star::uno::RuntimeException, std::exception);
         virtual void SAL_CALL close(  )
             throw(::com::sun::star::io::IOException,
-                  ::com::sun::star::uno::RuntimeException);
+                  ::com::sun::star::uno::RuntimeException, std::exception);
         virtual OUString SAL_CALL getDescription(  )
-            throw(::com::sun::star::uno::RuntimeException);
+            throw(::com::sun::star::uno::RuntimeException, std::exception);
 
 
         // XConnectionBroadcaster
         virtual void SAL_CALL addStreamListener(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>& aListener)
-            throw(::com::sun::star::uno::RuntimeException);
+            throw(::com::sun::star::uno::RuntimeException, std::exception);
         virtual void SAL_CALL removeStreamListener(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>& aListener)
-            throw(::com::sun::star::uno::RuntimeException);
+            throw(::com::sun::star::uno::RuntimeException, std::exception);
 
     public:
         void completeConnectionString();
diff --git a/io/source/connector/ctr_pipe.cxx b/io/source/connector/ctr_pipe.cxx
index 5533bcf79e52..1b5037a88bf7 100644
--- a/io/source/connector/ctr_pipe.cxx
+++ b/io/source/connector/ctr_pipe.cxx
@@ -47,7 +47,7 @@ namespace stoc_connector {
 
     sal_Int32 PipeConnection::read( Sequence < sal_Int8 > & aReadBytes , sal_Int32 nBytesToRead )
             throw(::com::sun::star::io::IOException,
-                  ::com::sun::star::uno::RuntimeException)
+                  ::com::sun::star::uno::RuntimeException, std::exception)
     {
         if( ! m_nStatus )
         {
@@ -64,7 +64,7 @@ namespace stoc_connector {
 
     void PipeConnection::write( const Sequence < sal_Int8 > &seq )
             throw(::com::sun::star::io::IOException,
-                  ::com::sun::star::uno::RuntimeException)
+                  ::com::sun::star::uno::RuntimeException, std::exception)
     {
         if( ! m_nStatus )
         {
@@ -80,14 +80,14 @@ namespace stoc_connector {
 
     void PipeConnection::flush( )
             throw(::com::sun::star::io::IOException,
-                  ::com::sun::star::uno::RuntimeException)
+                  ::com::sun::star::uno::RuntimeException, std::exception)
     {
 
     }
 
     void PipeConnection::close()
             throw(::com::sun::star::io::IOException,
-                  ::com::sun::star::uno::RuntimeException)
+                  ::com::sun::star::uno::RuntimeException, std::exception)
     {
         // ensure that close is called only once
         if(1 == osl_atomic_increment( (&m_nStatus) ) )
@@ -97,7 +97,7 @@ namespace stoc_connector {
     }
 
     OUString PipeConnection::getDescription()
-            throw( ::com::sun::star::uno::RuntimeException)
+            throw( ::com::sun::star::uno::RuntimeException, std::exception)
     {
         return m_sDescription;
     }
diff --git a/io/source/connector/ctr_socket.cxx b/io/source/connector/ctr_socket.cxx
index e27d9af76cf5..7d6e582ffadb 100644
--- a/io/source/connector/ctr_socket.cxx
+++ b/io/source/connector/ctr_socket.cxx
@@ -118,7 +118,7 @@ namespace stoc_connector {
 
     sal_Int32 SocketConnection::read( Sequence < sal_Int8 > & aReadBytes , sal_Int32 nBytesToRead )
             throw(::com::sun::star::io::IOException,
-                  ::com::sun::star::uno::RuntimeException)
+                  ::com::sun::star::uno::RuntimeException, std::exception)
     {
         if( ! m_nStatus )
         {
@@ -164,7 +164,7 @@ namespace stoc_connector {
 
     void SocketConnection::write( const Sequence < sal_Int8 > &seq )
             throw(::com::sun::star::io::IOException,
-                  ::com::sun::star::uno::RuntimeException)
+                  ::com::sun::star::uno::RuntimeException, std::exception)
     {
         if( ! m_nStatus )
         {
@@ -200,14 +200,14 @@ namespace stoc_connector {
 
     void SocketConnection::flush( )
             throw(::com::sun::star::io::IOException,
-                  ::com::sun::star::uno::RuntimeException)
+                  ::com::sun::star::uno::RuntimeException, std::exception)
     {
 
     }
 
     void SocketConnection::close()
             throw(::com::sun::star::io::IOException,
-                  ::com::sun::star::uno::RuntimeException)
+                  ::com::sun::star::uno::RuntimeException, std::exception)
     {
             // ensure that close is called only once
         if( 1 == osl_atomic_increment( (&m_nStatus) ) )
@@ -218,7 +218,7 @@ namespace stoc_connector {
     }
 
     OUString SocketConnection::getDescription()
-            throw( ::com::sun::star::uno::RuntimeException)
+            throw( ::com::sun::star::uno::RuntimeException, std::exception)
     {
         return m_sDescription;
     }
@@ -226,14 +226,14 @@ namespace stoc_connector {
 
 
     // XConnectionBroadcaster
-    void SAL_CALL SocketConnection::addStreamListener(const Reference<XStreamListener> & aListener) throw(RuntimeException)
+    void SAL_CALL SocketConnection::addStreamListener(const Reference<XStreamListener> & aListener) throw(RuntimeException, std::exception)
     {
         MutexGuard guard(_mutex);
 
         _listeners.insert(aListener);
     }
 
-    void SAL_CALL SocketConnection::removeStreamListener(const Reference<XStreamListener> & aListener) throw(RuntimeException)
+    void SAL_CALL SocketConnection::removeStreamListener(const Reference<XStreamListener> & aListener) throw(RuntimeException, std::exception)
     {
         MutexGuard guard(_mutex);
 
diff --git a/io/source/stm/odata.cxx b/io/source/stm/odata.cxx
index 94799b77e6a4..e93f1537a719 100644
--- a/io/source/stm/odata.cxx
+++ b/io/source/stm/odata.cxx
@@ -68,48 +68,48 @@ public: // XInputStream
     virtual sal_Int32 SAL_CALL readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
                                                             throw ( NotConnectedException,
                                                                         BufferSizeExceededException,
-                                                                        RuntimeException);
+                                                                        RuntimeException, std::exception);
     virtual sal_Int32 SAL_CALL readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead)
                                                             throw ( NotConnectedException,
                                                                         BufferSizeExceededException,
-                                                                        RuntimeException);
+                                                                        RuntimeException, std::exception);
     virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip)                 throw ( NotConnectedException,
                                                                         BufferSizeExceededException,
-                                                                        RuntimeException);
+                                                                        RuntimeException, std::exception);
     virtual sal_Int32 SAL_CALL available(void)                          throw ( NotConnectedException,
-                                                                        RuntimeException);
+                                                                        RuntimeException, std::exception);
     virtual void SAL_CALL closeInput(void)                          throw ( NotConnectedException,
-                                                                        RuntimeException);
+                                                                        RuntimeException, std::exception);
 
 public: // XDataInputStream
-    virtual sal_Int8 SAL_CALL readBoolean(void) throw (IOException, RuntimeException);
-    virtual sal_Int8 SAL_CALL readByte(void) throw (IOException, RuntimeException);
-    virtual sal_Unicode SAL_CALL readChar(void) throw (IOException, RuntimeException);
-    virtual sal_Int16 SAL_CALL readShort(void) throw (IOException, RuntimeException);
-    virtual sal_Int32 SAL_CALL readLong(void) throw (IOException, RuntimeException);
-    virtual sal_Int64 SAL_CALL readHyper(void) throw (IOException, RuntimeException);
-    virtual float SAL_CALL readFloat(void) throw (IOException, RuntimeException);
-    virtual double SAL_CALL readDouble(void) throw (IOException, RuntimeException);
-    virtual OUString SAL_CALL readUTF(void) throw (IOException, RuntimeException);
+    virtual sal_Int8 SAL_CALL readBoolean(void) throw (IOException, RuntimeException, std::exception);
+    virtual sal_Int8 SAL_CALL readByte(void) throw (IOException, RuntimeException, std::exception);
+    virtual sal_Unicode SAL_CALL readChar(void) throw (IOException, RuntimeException, std::exception);
+    virtual sal_Int16 SAL_CALL readShort(void) throw (IOException, RuntimeException, std::exception);
+    virtual sal_Int32 SAL_CALL readLong(void) throw (IOException, RuntimeException, std::exception);
+    virtual sal_Int64 SAL_CALL readHyper(void) throw (IOException, RuntimeException, std::exception);
+    virtual float SAL_CALL readFloat(void) throw (IOException, RuntimeException, std::exception);
+    virtual double SAL_CALL readDouble(void) throw (IOException, RuntimeException, std::exception);
+    virtual OUString SAL_CALL readUTF(void) throw (IOException, RuntimeException, std::exception);
 
 
 
 public: // XActiveDataSink
     virtual void SAL_CALL setInputStream(const Reference< XInputStream > & aStream)
-        throw (RuntimeException);
-    virtual Reference< XInputStream > SAL_CALL getInputStream(void) throw (RuntimeException);
+        throw (RuntimeException, std::exception);
+    virtual Reference< XInputStream > SAL_CALL getInputStream(void) throw (RuntimeException, std::exception);
 
 public: // XConnectable
-    virtual void SAL_CALL setPredecessor(const Reference < XConnectable >& aPredecessor) throw (RuntimeException);
-    virtual Reference < XConnectable > SAL_CALL getPredecessor(void) throw (RuntimeException);
-    virtual void SAL_CALL setSuccessor(const Reference < XConnectable >& aSuccessor) throw (RuntimeException);
-    virtual Reference < XConnectable > SAL_CALL getSuccessor(void) throw (RuntimeException) ;
+    virtual void SAL_CALL setPredecessor(const Reference < XConnectable >& aPredecessor) throw (RuntimeException, std::exception);
+    virtual Reference < XConnectable > SAL_CALL getPredecessor(void) throw (RuntimeException, std::exception);
+    virtual void SAL_CALL setSuccessor(const Reference < XConnectable >& aSuccessor) throw (RuntimeException, std::exception);
+    virtual Reference < XConnectable > SAL_CALL getSuccessor(void) throw (RuntimeException, std::exception) ;
 
 
 public: // XServiceInfo
-    OUString                     SAL_CALL getImplementationName() throw ();
-    Sequence< OUString >         SAL_CALL getSupportedServiceNames(void) throw ();
-    sal_Bool                        SAL_CALL supportsService(const OUString& ServiceName) throw ();
+    OUString                     SAL_CALL getImplementationName() throw (std::exception);
+    Sequence< OUString >         SAL_CALL getSupportedServiceNames(void) throw (std::exception);
+    sal_Bool                        SAL_CALL supportsService(const OUString& ServiceName) throw (std::exception);
 
 protected:
 
@@ -127,7 +127,7 @@ ODataInputStream::~ODataInputStream()
 sal_Int32 ODataInputStream::readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
     throw ( NotConnectedException,
             BufferSizeExceededException,
-            RuntimeException)
+            RuntimeException, std::exception)
 {
      sal_Int32 nRead;
 
@@ -146,7 +146,7 @@ sal_Int32 ODataInputStream::readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBy
 sal_Int32 ODataInputStream::readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead)
     throw ( NotConnectedException,
             BufferSizeExceededException,
-            RuntimeException)
+            RuntimeException, std::exception)
 {
      sal_Int32 nRead;
      if( m_bValidStream ) {
@@ -161,7 +161,7 @@ sal_Int32 ODataInputStream::readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32
 void ODataInputStream::skipBytes(sal_Int32 nBytesToSkip)
     throw ( NotConnectedException,
             BufferSizeExceededException,
-            RuntimeException)
+            RuntimeException, std::exception)
 {
      if( m_bValidStream ) {
          m_input->skipBytes( nBytesToSkip );
@@ -175,7 +175,7 @@ void ODataInputStream::skipBytes(sal_Int32 nBytesToSkip)
 
 sal_Int32 ODataInputStream::available(void)
     throw ( NotConnectedException,
-            RuntimeException)
+            RuntimeException, std::exception)
 {
      sal_Int32 nAvail;
 
@@ -192,7 +192,7 @@ sal_Int32 ODataInputStream::available(void)
 
 void ODataInputStream::closeInput(void )
     throw ( NotConnectedException,
-            RuntimeException)
+            RuntimeException, std::exception)
 {
      if( m_bValidStream ) {
          m_input->closeInput( );
@@ -213,12 +213,12 @@ void ODataInputStream::closeInput(void )
 //== XDataInputStream ===========================================
 
 // XDataInputStream
-sal_Int8 ODataInputStream::readBoolean(void) throw (IOException, RuntimeException)
+sal_Int8 ODataInputStream::readBoolean(void) throw (IOException, RuntimeException, std::exception)
 {
     return readByte();
 }
 
-sal_Int8 ODataInputStream::readByte(void)    throw (IOException, RuntimeException)
+sal_Int8 ODataInputStream::readByte(void)    throw (IOException, RuntimeException, std::exception)
 {
     Sequence<sal_Int8> aTmp(1);
     if( 1 != readBytes( aTmp, 1 ) )
@@ -228,7 +228,7 @@ sal_Int8 ODataInputStream::readByte(void)    throw (IOException, RuntimeExceptio
     return aTmp.getArray()[0];
 }
 
-sal_Unicode ODataInputStream::readChar(void) throw (IOException, RuntimeException)
+sal_Unicode ODataInputStream::readChar(void) throw (IOException, RuntimeException, std::exception)
 {
     Sequence<sal_Int8> aTmp(2);
     if( 2 != readBytes( aTmp, 2 ) )
@@ -240,7 +240,7 @@ sal_Unicode ODataInputStream::readChar(void) throw (IOException, RuntimeExceptio
     return ((sal_Unicode)pBytes[0] << 8) + pBytes[1];
 }
 
-sal_Int16 ODataInputStream::readShort(void) throw (IOException, RuntimeException)
+sal_Int16 ODataInputStream::readShort(void) throw (IOException, RuntimeException, std::exception)
 {
     Sequence<sal_Int8> aTmp(2);
     if( 2 != readBytes( aTmp, 2 ) )
@@ -253,7 +253,7 @@ sal_Int16 ODataInputStream::readShort(void) throw (IOException, RuntimeException
 }
 
 
-sal_Int32 ODataInputStream::readLong(void) throw (IOException, RuntimeException)
+sal_Int32 ODataInputStream::readLong(void) throw (IOException, RuntimeException, std::exception)
 {
     Sequence<sal_Int8> aTmp(4);
     if( 4 != readBytes( aTmp, 4 ) )
@@ -266,7 +266,7 @@ sal_Int32 ODataInputStream::readLong(void) throw (IOException, RuntimeException)
 }
 
 
-sal_Int64 ODataInputStream::readHyper(void) throw (IOException, RuntimeException)
+sal_Int64 ODataInputStream::readHyper(void) throw (IOException, RuntimeException, std::exception)
 {
     Sequence<sal_Int8> aTmp(8);
     if( 8 != readBytes( aTmp, 8 ) )
@@ -286,14 +286,14 @@ sal_Int64 ODataInputStream::readHyper(void) throw (IOException, RuntimeException
         pBytes[7];
 }
 
-float ODataInputStream::readFloat(void) throw (IOException, RuntimeException)
+float ODataInputStream::readFloat(void) throw (IOException, RuntimeException, std::exception)
 {
     union { float f; sal_uInt32 n; } a;
     a.n = readLong();
     return a.f;
 }
 
-double ODataInputStream::readDouble(void) throw (IOException, RuntimeException)
+double ODataInputStream::readDouble(void) throw (IOException, RuntimeException, std::exception)
 {
     sal_uInt32 n = 1;
     union { double d; struct { sal_uInt32 n1; sal_uInt32 n2; } ad; } a;
@@ -312,7 +312,7 @@ double ODataInputStream::readDouble(void) throw (IOException, RuntimeException)
     return a.d;
 }
 
-OUString ODataInputStream::readUTF(void) throw (IOException, RuntimeException)
+OUString ODataInputStream::readUTF(void) throw (IOException, RuntimeException, std::exception)
 {
     sal_uInt16              nShortLen = (sal_uInt16)readShort();
     sal_Int32               nUTFLen;
@@ -394,7 +394,7 @@ OUString ODataInputStream::readUTF(void) throw (IOException, RuntimeException)
 
 // XActiveDataSource
 void ODataInputStream::setInputStream(const Reference< XInputStream > & aStream)
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
 
     if( m_input != aStream ) {
@@ -407,7 +407,7 @@ void ODataInputStream::setInputStream(const Reference< XInputStream > & aStream)
     m_bValidStream = m_input.is();
 }
 
-Reference< XInputStream > ODataInputStream::getInputStream(void) throw (RuntimeException)
+Reference< XInputStream > ODataInputStream::getInputStream(void) throw (RuntimeException, std::exception)
 {
     return m_input;
 }
@@ -415,7 +415,7 @@ Reference< XInputStream > ODataInputStream::getInputStream(void) throw (RuntimeE
 
 
 // XDataSink
-void ODataInputStream::setSuccessor( const Reference < XConnectable > &r ) throw (RuntimeException)
+void ODataInputStream::setSuccessor( const Reference < XConnectable > &r ) throw (RuntimeException, std::exception)
 {
      /// if the references match, nothing needs to be done
      if( m_succ != r ) {
@@ -430,7 +430,7 @@ void ODataInputStream::setSuccessor( const Reference < XConnectable > &r ) throw
      }
 }
 
-Reference < XConnectable > ODataInputStream::getSuccessor() throw (RuntimeException)
+Reference < XConnectable > ODataInputStream::getSuccessor() throw (RuntimeException, std::exception)
 {
     return m_succ;
 }
@@ -438,7 +438,7 @@ Reference < XConnectable > ODataInputStream::getSuccessor() throw (RuntimeExcept
 
 // XDataSource
 void ODataInputStream::setPredecessor( const Reference < XConnectable > &r )
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     if( r != m_pred ) {
         m_pred = r;
@@ -448,25 +448,25 @@ void ODataInputStream::setPredecessor( const Reference < XConnectable > &r )
         }
     }
 }
-Reference < XConnectable > ODataInputStream::getPredecessor() throw (RuntimeException)
+Reference < XConnectable > ODataInputStream::getPredecessor() throw (RuntimeException, std::exception)
 {
     return m_pred;
 }
 
 // XServiceInfo
-OUString ODataInputStream::getImplementationName() throw ()
+OUString ODataInputStream::getImplementationName() throw (std::exception)
 {
     return ODataInputStream_getImplementationName();
 }
 
 // XServiceInfo
-sal_Bool ODataInputStream::supportsService(const OUString& ServiceName) throw ()
+sal_Bool ODataInputStream::supportsService(const OUString& ServiceName) throw (std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 // XServiceInfo
-Sequence< OUString > ODataInputStream::getSupportedServiceNames(void) throw ()
+Sequence< OUString > ODataInputStream::getSupportedServiceNames(void) throw (std::exception)
 {
     return ODataInputStream_getSupportedServiceNames();
 }
@@ -519,46 +519,46 @@ public: // XOutputStream
     virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData)
         throw ( NotConnectedException,
                 BufferSizeExceededException,
-                RuntimeException);
+                RuntimeException, std::exception);
     virtual void SAL_CALL flush(void)
         throw ( NotConnectedException,
                 BufferSizeExceededException,
-                RuntimeException);
+                RuntimeException, std::exception);
     virtual void SAL_CALL closeOutput(void)
         throw ( NotConnectedException,
                 BufferSizeExceededException,
-                RuntimeException);
+                RuntimeException, std::exception);
 
 public: // XDataOutputStream
-    virtual void SAL_CALL writeBoolean(sal_Bool Value) throw (IOException, RuntimeException);
-    virtual void SAL_CALL writeByte(sal_Int8 Value) throw (IOException, RuntimeException);
-    virtual void SAL_CALL writeChar(sal_Unicode Value) throw (IOException, RuntimeException);
-    virtual void SAL_CALL writeShort(sal_Int16 Value) throw (IOException, RuntimeException);
-    virtual void SAL_CALL writeLong(sal_Int32 Value) throw (IOException, RuntimeException);
-    virtual void SAL_CALL writeHyper(sal_Int64 Value) throw (IOException, RuntimeException);
-    virtual void SAL_CALL writeFloat(float Value) throw (IOException, RuntimeException);
-    virtual void SAL_CALL writeDouble(double Value) throw (IOException, RuntimeException);
-    virtual void SAL_CALL writeUTF(const OUString& Value) throw (IOException, RuntimeException);
+    virtual void SAL_CALL writeBoolean(sal_Bool Value) throw (IOException, RuntimeException, std::exception);
+    virtual void SAL_CALL writeByte(sal_Int8 Value) throw (IOException, RuntimeException, std::exception);
+    virtual void SAL_CALL writeChar(sal_Unicode Value) throw (IOException, RuntimeException, std::exception);
+    virtual void SAL_CALL writeShort(sal_Int16 Value) throw (IOException, RuntimeException, std::exception);
+    virtual void SAL_CALL writeLong(sal_Int32 Value) throw (IOException, RuntimeException, std::exception);
+    virtual void SAL_CALL writeHyper(sal_Int64 Value) throw (IOException, RuntimeException, std::exception);
+    virtual void SAL_CALL writeFloat(float Value) throw (IOException, RuntimeException, std::exception);
+    virtual void SAL_CALL writeDouble(double Value) throw (IOException, RuntimeException, std::exception);
+    virtual void SAL_CALL writeUTF(const OUString& Value) throw (IOException, RuntimeException, std::exception);
 
 public: // XActiveDataSource
     virtual void SAL_CALL setOutputStream(const Reference< XOutputStream > & aStream)
-        throw (RuntimeException);
-    virtual Reference < XOutputStream > SAL_CALL getOutputStream(void) throw (RuntimeException);
+        throw (RuntimeException, std::exception);
+    virtual Reference < XOutputStream > SAL_CALL getOutputStream(void) throw (RuntimeException, std::exception);
 
 public: // XConnectable
     virtual void SAL_CALL setPredecessor(const Reference < XConnectable >& aPredecessor)
-        throw (RuntimeException);
+        throw (RuntimeException, std::exception);
     virtual Reference < XConnectable > SAL_CALL getPredecessor(void)
-        throw (RuntimeException);
+        throw (RuntimeException, std::exception);
     virtual void SAL_CALL setSuccessor(const Reference < XConnectable >& aSuccessor)
-        throw (RuntimeException);
+        throw (RuntimeException, std::exception);
     virtual Reference < XConnectable > SAL_CALL getSuccessor(void)
-        throw (RuntimeException);
+        throw (RuntimeException, std::exception);
 
 public: // XServiceInfo
-    OUString                     SAL_CALL getImplementationName() throw ();
-    Sequence< OUString >         SAL_CALL getSupportedServiceNames(void) throw ();
-    sal_Bool                     SAL_CALL supportsService(const OUString& ServiceName) throw ();
+    OUString                     SAL_CALL getImplementationName() throw (std::exception);
+    Sequence< OUString >         SAL_CALL getSupportedServiceNames(void) throw (std::exception);
+    sal_Bool                     SAL_CALL supportsService(const OUString& ServiceName) throw (std::exception);
 
 protected:
     Reference < XConnectable >  m_succ;
@@ -576,7 +576,7 @@ ODataOutputStream::~ODataOutputStream()
 void ODataOutputStream::writeBytes(const Sequence< sal_Int8 >& aData)
     throw ( NotConnectedException,
             BufferSizeExceededException,
-            RuntimeException)
+            RuntimeException, std::exception)
 {
     if( m_bValidStream )
     {
@@ -590,7 +590,7 @@ void ODataOutputStream::writeBytes(const Sequence< sal_Int8 >& aData)
 void ODataOutputStream::flush(void)
     throw ( NotConnectedException,
             BufferSizeExceededException,
-            RuntimeException)
+            RuntimeException, std::exception)
 {
     if( m_bValidStream )
     {
@@ -607,7 +607,7 @@ void ODataOutputStream::flush(void)
 void ODataOutputStream::closeOutput(void)
     throw ( NotConnectedException,
             BufferSizeExceededException,
-            RuntimeException)
+            RuntimeException, std::exception)
 {
     if( m_bValidStream )
     {
@@ -625,7 +625,7 @@ void ODataOutputStream::closeOutput(void)
 // XDataOutputStream
 void ODataOutputStream::writeBoolean(sal_Bool Value)
     throw ( IOException,
-            RuntimeException)
+            RuntimeException, std::exception)
 {
     if( Value )
     {
@@ -640,7 +640,7 @@ void ODataOutputStream::writeBoolean(sal_Bool Value)
 
 void ODataOutputStream::writeByte(sal_Int8 Value)
     throw ( IOException,
-            RuntimeException)
+            RuntimeException, std::exception)
 {
     Sequence<sal_Int8> aTmp( 1 );
     aTmp.getArray()[0] = Value;
@@ -649,7 +649,7 @@ void ODataOutputStream::writeByte(sal_Int8 Value)
 
 void ODataOutputStream::writeChar(sal_Unicode Value)
     throw ( IOException,
-            RuntimeException)
+            RuntimeException, std::exception)
 {
     Sequence<sal_Int8> aTmp( 2 );
     sal_Int8 * pBytes = ( sal_Int8 * ) aTmp.getArray();
@@ -661,7 +661,7 @@ void ODataOutputStream::writeChar(sal_Unicode Value)
 
 void ODataOutputStream::writeShort(sal_Int16 Value)
     throw ( IOException,
-            RuntimeException)
+            RuntimeException, std::exception)
 {
     Sequence<sal_Int8> aTmp( 2 );
     sal_Int8 * pBytes = aTmp.getArray();
@@ -672,7 +672,7 @@ void ODataOutputStream::writeShort(sal_Int16 Value)
 
 void ODataOutputStream::writeLong(sal_Int32 Value)
     throw ( IOException,
-            RuntimeException)
+            RuntimeException, std::exception)
 {
     Sequence<sal_Int8> aTmp( 4 );
     sal_Int8 * pBytes = aTmp.getArray();
@@ -685,7 +685,7 @@ void ODataOutputStream::writeLong(sal_Int32 Value)
 
 void ODataOutputStream::writeHyper(sal_Int64 Value)
     throw ( IOException,
-            RuntimeException)
+            RuntimeException, std::exception)
 {
     Sequence<sal_Int8> aTmp( 8 );
     sal_Int8 * pBytes = aTmp.getArray();
@@ -703,7 +703,7 @@ void ODataOutputStream::writeHyper(sal_Int64 Value)
 
 void ODataOutputStream::writeFloat(float Value)
     throw ( IOException,
-            RuntimeException)
+            RuntimeException, std::exception)
 {
     union { float f; sal_uInt32 n; } a;
     a.f = Value;
@@ -712,7 +712,7 @@ void ODataOutputStream::writeFloat(float Value)
 
 void ODataOutputStream::writeDouble(double Value)
     throw ( IOException,
-            RuntimeException)
+            RuntimeException, std::exception)
 {
     sal_uInt32 n = 1;
     union { double d; struct { sal_uInt32 n1; sal_uInt32 n2; } ad; } a;
@@ -733,7 +733,7 @@ void ODataOutputStream::writeDouble(double Value)
 
 void ODataOutputStream::writeUTF(const OUString& Value)
     throw ( IOException,
-            RuntimeException)
+            RuntimeException, std::exception)
 {
     sal_Int32 nStrLen = Value.getLength();
     const sal_Unicode * pStr = Value.getStr();
@@ -792,7 +792,7 @@ void ODataOutputStream::writeUTF(const OUString& Value)
 
 // XActiveDataSource
 void ODataOutputStream::setOutputStream(const Reference< XOutputStream > & aStream)
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     if( m_output != aStream ) {
         m_output = aStream;
@@ -804,7 +804,7 @@ void ODataOutputStream::setOutputStream(const Reference< XOutputStream > & aStre
 }
 
 Reference< XOutputStream > ODataOutputStream::getOutputStream(void)
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     return m_output;
 }
@@ -814,7 +814,7 @@ Reference< XOutputStream > ODataOutputStream::getOutputStream(void)
 
 // XDataSink
 void ODataOutputStream::setSuccessor( const Reference < XConnectable > &r )
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
      /// if the references match, nothing needs to be done
      if( m_succ != r )
@@ -830,14 +830,14 @@ void ODataOutputStream::setSuccessor( const Reference < XConnectable > &r )
          }
      }
 }
-Reference < XConnectable > ODataOutputStream::getSuccessor()    throw (RuntimeException)
+Reference < XConnectable > ODataOutputStream::getSuccessor()    throw (RuntimeException, std::exception)
 {
     return m_succ;
 }
 
 
 // XDataSource
-void ODataOutputStream::setPredecessor( const Reference < XConnectable > &r )   throw (RuntimeException)
+void ODataOutputStream::setPredecessor( const Reference < XConnectable > &r )   throw (RuntimeException, std::exception)
 {
     if( r != m_pred ) {
         m_pred = r;
@@ -847,7 +847,7 @@ void ODataOutputStream::setPredecessor( const Reference < XConnectable > &r )
         }
     }
 }
-Reference < XConnectable > ODataOutputStream::getPredecessor()  throw (RuntimeException)
+Reference < XConnectable > ODataOutputStream::getPredecessor()  throw (RuntimeException, std::exception)
 {
     return m_pred;
 }
@@ -855,19 +855,19 @@ Reference < XConnectable > ODataOutputStream::getPredecessor()  throw (RuntimeEx
 
 
 // XServiceInfo
-OUString ODataOutputStream::getImplementationName() throw ()
+OUString ODataOutputStream::getImplementationName() throw (std::exception)
 {
     return ODataOutputStream_getImplementationName();
 }
 
 // XServiceInfo
-sal_Bool ODataOutputStream::supportsService(const OUString& ServiceName) throw ()
+sal_Bool ODataOutputStream::supportsService(const OUString& ServiceName) throw (std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 // XServiceInfo
-Sequence< OUString > ODataOutputStream::getSupportedServiceNames(void) throw ()
+Sequence< OUString > ODataOutputStream::getSupportedServiceNames(void) throw (std::exception)
 {
     return ODataOutputStream_getSupportedServiceNames();
 }
@@ -940,57 +940,57 @@ public:
     virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData)
         throw ( NotConnectedException,
                 BufferSizeExceededException,
-                RuntimeException)
+                RuntimeException, std::exception)
         { ODataOutputStream::writeBytes( aData ); }
 
     virtual void SAL_CALL flush(void)
         throw ( NotConnectedException,
                 BufferSizeExceededException,
-                RuntimeException)
+                RuntimeException, std::exception)
         { ODataOutputStream::flush(); }
 
     virtual void SAL_CALL closeOutput(void)
         throw ( NotConnectedException,
                 BufferSizeExceededException,
-                RuntimeException)
+                RuntimeException, std::exception)
         { ODataOutputStream::closeOutput(); }
 
 public:
     // XDataOutputStream
-    virtual void SAL_CALL writeBoolean(sal_Bool Value) throw (IOException, RuntimeException)
+    virtual void SAL_CALL writeBoolean(sal_Bool Value) throw (IOException, RuntimeException, std::exception)
                 { ODataOutputStream::writeBoolean( Value ); }
-    virtual void SAL_CALL writeByte(sal_Int8 Value) throw (IOException, RuntimeException)
+    virtual void SAL_CALL writeByte(sal_Int8 Value) throw (IOException, RuntimeException, std::exception)
                 { ODataOutputStream::writeByte( Value ); }
-    virtual void SAL_CALL writeChar(sal_Unicode Value) throw (IOException, RuntimeException)
+    virtual void SAL_CALL writeChar(sal_Unicode Value) throw (IOException, RuntimeException, std::exception)
                 { ODataOutputStream::writeChar( Value ); }
-    virtual void SAL_CALL writeShort(sal_Int16 Value) throw (IOException, RuntimeException)
+    virtual void SAL_CALL writeShort(sal_Int16 Value) throw (IOException, RuntimeException, std::exception)
                 { ODataOutputStream::writeShort( Value ); }
-    virtual void SAL_CALL writeLong(sal_Int32 Value) throw (IOException, RuntimeException)
+    virtual void SAL_CALL writeLong(sal_Int32 Value) throw (IOException, RuntimeException, std::exception)
                 { ODataOutputStream::writeLong( Value ); }
-    virtual void SAL_CALL writeHyper(sal_Int64 Value) throw (IOException, RuntimeException)
+    virtual void SAL_CALL writeHyper(sal_Int64 Value) throw (IOException, RuntimeException, std::exception)
                 { ODataOutputStream::writeHyper( Value ); }
-    virtual void SAL_CALL writeFloat(float Value) throw (IOException, RuntimeException)
+    virtual void SAL_CALL writeFloat(float Value) throw (IOException, RuntimeException, std::exception)
                 { ODataOutputStream::writeFloat( Value ); }
-    virtual void SAL_CALL writeDouble(double Value) throw (IOException, RuntimeException)
+    virtual void SAL_CALL writeDouble(double Value) throw (IOException, RuntimeException, std::exception)
                 { ODataOutputStream::writeDouble( Value ); }
-    virtual void SAL_CALL writeUTF(const OUString& Value) throw (IOException, RuntimeException)
+    virtual void SAL_CALL writeUTF(const OUString& Value) throw (IOException, RuntimeException, std::exception)
                 { ODataOutputStream::writeUTF( Value );}
 
     // XObjectOutputStream
-        virtual void SAL_CALL writeObject( const Reference< XPersistObject > & r ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL writeObject( const Reference< XPersistObject > & r ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception);
 
 public: // XMarkableStream
-    virtual sal_Int32 SAL_CALL createMark(void)                 throw (IOException, RuntimeException);
-    virtual void SAL_CALL deleteMark(sal_Int32 Mark)            throw (IOException, IllegalArgumentException, RuntimeException);
-    virtual void SAL_CALL jumpToMark(sal_Int32 nMark)       throw (IOException, IllegalArgumentException, RuntimeException);
-    virtual void SAL_CALL jumpToFurthest(void)          throw (IOException, RuntimeException);
+    virtual sal_Int32 SAL_CALL createMark(void)                 throw (IOException, RuntimeException, std::exception);
+    virtual void SAL_CALL deleteMark(sal_Int32 Mark)            throw (IOException, IllegalArgumentException, RuntimeException, std::exception);
+    virtual void SAL_CALL jumpToMark(sal_Int32 nMark)       throw (IOException, IllegalArgumentException, RuntimeException, std::exception);
+    virtual void SAL_CALL jumpToFurthest(void)          throw (IOException, RuntimeException, std::exception);
     virtual sal_Int32 SAL_CALL offsetToMark(sal_Int32 nMark)
-        throw (IOException, IllegalArgumentException, RuntimeException);
+        throw (IOException, IllegalArgumentException, RuntimeException, std::exception);
 
 public: // XServiceInfo
-    OUString                   SAL_CALL   getImplementationName() throw ();
-    Sequence< OUString >       SAL_CALL   getSupportedServiceNames(void) throw ();
-    sal_Bool                   SAL_CALL   supportsService(const OUString& ServiceName) throw ();
+    OUString                   SAL_CALL   getImplementationName() throw (std::exception);
+    Sequence< OUString >       SAL_CALL   getSupportedServiceNames(void) throw (std::exception);
+    sal_Bool                   SAL_CALL   supportsService(const OUString& ServiceName) throw (std::exception);
 
 private:
     void connectToMarkable();
@@ -1005,7 +1005,7 @@ OObjectOutputStream::~OObjectOutputStream()
 {
 }
 
-void OObjectOutputStream::writeObject( const Reference< XPersistObject > & xPObj ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException)
+void OObjectOutputStream::writeObject( const Reference< XPersistObject > & xPObj ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception)
 {
 
     connectToMarkable();
@@ -1102,7 +1102,7 @@ void OObjectOutputStream::connectToMarkable(void)
 
 
 sal_Int32 OObjectOutputStream::createMark(void)
-    throw (IOException, RuntimeException)
+    throw (IOException, RuntimeException, std::exception)
 {
     connectToMarkable();    // throws an exception, if a markable is not connected !
 
@@ -1110,7 +1110,7 @@ sal_Int32 OObjectOutputStream::createMark(void)
 }
 
 void OObjectOutputStream::deleteMark(sal_Int32 Mark)
-    throw (IOException, IllegalArgumentException, RuntimeException)
+    throw (IOException, IllegalArgumentException, RuntimeException, std::exception)
 {
     if( ! m_bValidMarkable )
     {
@@ -1120,7 +1120,7 @@ void OObjectOutputStream::deleteMark(sal_Int32 Mark)
 }
 
 void OObjectOutputStream::jumpToMark(sal_Int32 nMark)
-    throw (IOException, IllegalArgumentException, RuntimeException)
+    throw (IOException, IllegalArgumentException, RuntimeException, std::exception)
 {
     if( ! m_bValidMarkable )
     {
@@ -1131,14 +1131,14 @@ void OObjectOutputStream::jumpToMark(sal_Int32 nMark)
 
 
 void OObjectOutputStream::jumpToFurthest(void)
-    throw (IOException, RuntimeException)
+    throw (IOException, RuntimeException, std::exception)
 {
     connectToMarkable();
     m_rMarkable->jumpToFurthest();
 }
 
 sal_Int32 OObjectOutputStream::offsetToMark(sal_Int32 nMark)
-    throw (IOException, IllegalArgumentException, RuntimeException)
+    throw (IOException, IllegalArgumentException, RuntimeException, std::exception)
 {
     if( ! m_bValidMarkable )
     {
@@ -1171,19 +1171,19 @@ Sequence<OUString> OObjectOutputStream_getSupportedServiceNames(void)
 }
 
 // XServiceInfo
-OUString OObjectOutputStream::getImplementationName() throw ()
+OUString OObjectOutputStream::getImplementationName() throw (std::exception)
 {
     return ODataInputStream_getImplementationName();
 }
 
 // XServiceInfo
-sal_Bool OObjectOutputStream::supportsService(const OUString& ServiceName) throw ()
+sal_Bool OObjectOutputStream::supportsService(const OUString& ServiceName) throw (std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 // XServiceInfo
-Sequence< OUString > OObjectOutputStream::getSupportedServiceNames(void) throw ()
+Sequence< OUString > OObjectOutputStream::getSupportedServiceNames(void) throw (std::exception)
 {
     return OObjectOutputStream_getSupportedServiceNames();
 }
@@ -1206,67 +1206,67 @@ public: // XInputStream
     virtual sal_Int32 SAL_CALL readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
         throw ( NotConnectedException,
                 BufferSizeExceededException,
-                RuntimeException)
+                RuntimeException, std::exception)
         { return ODataInputStream::readBytes( aData , nBytesToRead ); }
 
     virtual sal_Int32 SAL_CALL readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead)
         throw ( NotConnectedException,
                 BufferSizeExceededException,
-                RuntimeException)
+                RuntimeException, std::exception)
         { return ODataInputStream::readSomeBytes( aData, nMaxBytesToRead ); }
 
     virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip)
         throw ( NotConnectedException,
                 BufferSizeExceededException,
-                RuntimeException)
+                RuntimeException, std::exception)
         { ODataInputStream::skipBytes( nBytesToSkip ); }
 
     virtual sal_Int32 SAL_CALL available(void)
         throw ( NotConnectedException,
-                RuntimeException)
+                RuntimeException, std::exception)
         { return ODataInputStream::available(); }
 
     virtual void SAL_CALL closeInput(void)
         throw ( NotConnectedException,
-                RuntimeException)
+                RuntimeException, std::exception)
         { ODataInputStream::closeInput(); }
 
 public: // XDataInputStream
-    virtual sal_Int8 SAL_CALL readBoolean(void) throw (IOException, RuntimeException)
+    virtual sal_Int8 SAL_CALL readBoolean(void) throw (IOException, RuntimeException, std::exception)
                 { return ODataInputStream::readBoolean(); }
-    virtual sal_Int8 SAL_CALL readByte(void) throw (IOException, RuntimeException)
+    virtual sal_Int8 SAL_CALL readByte(void) throw (IOException, RuntimeException, std::exception)
                 { return ODataInputStream::readByte(); }
-    virtual sal_Unicode SAL_CALL readChar(void) throw (IOException, RuntimeException)
+    virtual sal_Unicode SAL_CALL readChar(void) throw (IOException, RuntimeException, std::exception)
                 { return ODataInputStream::readChar(); }
-    virtual sal_Int16 SAL_CALL readShort(void) throw (IOException, RuntimeException)
+    virtual sal_Int16 SAL_CALL readShort(void) throw (IOException, RuntimeException, std::exception)
                 { return ODataInputStream::readShort(); }
-    virtual sal_Int32 SAL_CALL readLong(void) throw (IOException, RuntimeException)
+    virtual sal_Int32 SAL_CALL readLong(void) throw (IOException, RuntimeException, std::exception)
                 { return ODataInputStream::readLong(); }
-    virtual sal_Int64 SAL_CALL readHyper(void) throw (IOException, RuntimeException)
+    virtual sal_Int64 SAL_CALL readHyper(void) throw (IOException, RuntimeException, std::exception)
                 { return ODataInputStream::readHyper(); }
-    virtual float SAL_CALL readFloat(void) throw (IOException, RuntimeException)
+    virtual float SAL_CALL readFloat(void) throw (IOException, RuntimeException, std::exception)
                 { return ODataInputStream::readFloat(); }
-    virtual double SAL_CALL readDouble(void) throw (IOException, RuntimeException)
+    virtual double SAL_CALL readDouble(void) throw (IOException, RuntimeException, std::exception)
         { return ODataInputStream::readDouble(); }
-    virtual OUString SAL_CALL readUTF(void) throw (IOException, RuntimeException)
+    virtual OUString SAL_CALL readUTF(void) throw (IOException, RuntimeException, std::exception)
                 { return ODataInputStream::readUTF(); }
 
 public: // XObjectInputStream
-        virtual Reference< XPersistObject > SAL_CALL readObject( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+        virtual Reference< XPersistObject > SAL_CALL readObject( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception);
 
 public: // XMarkableStream
     virtual sal_Int32 SAL_CALL createMark(void)
-        throw (IOException, RuntimeException);
-    virtual void SAL_CALL deleteMark(sal_Int32 Mark)            throw (IOException, IllegalArgumentException, RuntimeException);
-    virtual void SAL_CALL jumpToMark(sal_Int32 nMark)       throw (IOException, IllegalArgumentException, RuntimeException);
-    virtual void SAL_CALL jumpToFurthest(void)          throw (IOException, RuntimeException);
+        throw (IOException, RuntimeException, std::exception);
+    virtual void SAL_CALL deleteMark(sal_Int32 Mark)            throw (IOException, IllegalArgumentException, RuntimeException, std::exception);
+    virtual void SAL_CALL jumpToMark(sal_Int32 nMark)       throw (IOException, IllegalArgumentException, RuntimeException, std::exception);
+    virtual void SAL_CALL jumpToFurthest(void)          throw (IOException, RuntimeException, std::exception);
     virtual sal_Int32 SAL_CALL offsetToMark(sal_Int32 nMark)
-        throw (IOException, IllegalArgumentException, RuntimeException);
+        throw (IOException, IllegalArgumentException, RuntimeException, std::exception);
 
 public: // XServiceInfo
-    OUString                     SAL_CALL getImplementationName() throw ();
-    Sequence< OUString >         SAL_CALL getSupportedServiceNames(void) throw ();
-    sal_Bool                     SAL_CALL supportsService(const OUString& ServiceName) throw ();
+    OUString                     SAL_CALL getImplementationName() throw (std::exception);
+    Sequence< OUString >         SAL_CALL getSupportedServiceNames(void) throw (std::exception);
+    sal_Bool                     SAL_CALL supportsService(const OUString& ServiceName) throw (std::exception);
 
 private:
     void connectToMarkable();
@@ -1283,7 +1283,7 @@ OObjectInputStream::~OObjectInputStream()
 {
 }
 
-Reference< XPersistObject >  OObjectInputStream::readObject() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException)
+Reference< XPersistObject >  OObjectInputStream::readObject() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception)
 {
     // check if chain contains a XMarkableStream
     connectToMarkable();
@@ -1398,14 +1398,14 @@ void OObjectInputStream::connectToMarkable()
     }
 }
 
-sal_Int32 OObjectInputStream::createMark(void)              throw (IOException, RuntimeException)
+sal_Int32 OObjectInputStream::createMark(void)              throw (IOException, RuntimeException, std::exception)
 {
     connectToMarkable();    // throws an exception, if a markable is not connected !
 
     return m_rMarkable->createMark();
 }
 
-void OObjectInputStream::deleteMark(sal_Int32 Mark)         throw (IOException, IllegalArgumentException, RuntimeException)
+void OObjectInputStream::deleteMark(sal_Int32 Mark)         throw (IOException, IllegalArgumentException, RuntimeException, std::exception)
 {
     if( ! m_bValidMarkable )
     {
@@ -1414,7 +1414,7 @@ void OObjectInputStream::deleteMark(sal_Int32 Mark)         throw (IOException,
     m_rMarkable->deleteMark( Mark );
 }
 
-void OObjectInputStream::jumpToMark(sal_Int32 nMark)        throw (IOException, IllegalArgumentException, RuntimeException)
+void OObjectInputStream::jumpToMark(sal_Int32 nMark)        throw (IOException, IllegalArgumentException, RuntimeException, std::exception)
 {
     if( ! m_bValidMarkable )
     {
@@ -1422,14 +1422,14 @@ void OObjectInputStream::jumpToMark(sal_Int32 nMark)        throw (IOException,
     }
     m_rMarkable->jumpToMark( nMark );
 }
-void OObjectInputStream::jumpToFurthest(void)           throw (IOException, RuntimeException)
+void OObjectInputStream::jumpToFurthest(void)           throw (IOException, RuntimeException, std::exception)
 {
     connectToMarkable();
     m_rMarkable->jumpToFurthest();
 }
 
 sal_Int32 OObjectInputStream::offsetToMark(sal_Int32 nMark)
-    throw (IOException, IllegalArgumentException, RuntimeException)
+    throw (IOException, IllegalArgumentException, RuntimeException, std::exception)
 {
     if( ! m_bValidMarkable )
     {
@@ -1439,19 +1439,19 @@ sal_Int32 OObjectInputStream::offsetToMark(sal_Int32 nMark)
 }
 
 // XServiceInfo
-OUString OObjectInputStream::getImplementationName() throw ()
+OUString OObjectInputStream::getImplementationName() throw (std::exception)
 {
     return OObjectInputStream_getImplementationName();
 }
 
 // XServiceInfo
-sal_Bool OObjectInputStream::supportsService(const OUString& ServiceName) throw ()
+sal_Bool OObjectInputStream::supportsService(const OUString& ServiceName) throw (std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 // XServiceInfo
-Sequence< OUString > OObjectInputStream::getSupportedServiceNames(void) throw ()
+Sequence< OUString > OObjectInputStream::getSupportedServiceNames(void) throw (std::exception)
 {
     return OObjectInputStream_getSupportedServiceNames();
 }
diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx
index 7cf5d49afd25..970c7e7d5f1c 100644
--- a/io/source/stm/omark.cxx
+++ b/io/source/stm/omark.cxx
@@ -81,52 +81,52 @@ public: // XOutputStream
     virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData)
         throw ( NotConnectedException,
                 BufferSizeExceededException,
-                RuntimeException);
+                RuntimeException, std::exception);
     virtual void SAL_CALL flush(void)
         throw ( NotConnectedException,
                 BufferSizeExceededException,
-                RuntimeException);
+                RuntimeException, std::exception);
     virtual void SAL_CALL closeOutput(void)
         throw ( NotConnectedException,
                 BufferSizeExceededException,
-                RuntimeException);
+                RuntimeException, std::exception);
 
 public: // XMarkable
     virtual sal_Int32 SAL_CALL createMark(void)
-        throw (IOException, RuntimeException);
+        throw (IOException, RuntimeException, std::exception);
     virtual void SAL_CALL deleteMark(sal_Int32 Mark)
         throw (IOException,
                IllegalArgumentException,
-               RuntimeException);
+               RuntimeException, std::exception);
     virtual void SAL_CALL jumpToMark(sal_Int32 nMark)
         throw (IOException,
                IllegalArgumentException,
-               RuntimeException);
+               RuntimeException, std::exception);
     virtual void SAL_CALL jumpToFurthest(void)
-        throw (IOException, RuntimeException);
+        throw (IOException, RuntimeException, std::exception);
     virtual sal_Int32 SAL_CALL offsetToMark(sal_Int32 nMark)
         throw (IOException,
                IllegalArgumentException,
-               RuntimeException);
+               RuntimeException, std::exception);
 
 public: // XActiveDataSource
     virtual void SAL_CALL setOutputStream(const Reference < XOutputStream > & aStream)
-        throw (RuntimeException);
+        throw (RuntimeException, std::exception);
     virtual Reference < XOutputStream > SAL_CALL getOutputStream(void)
-        throw (RuntimeException);
+        throw (RuntimeException, std::exception);
 
 public: // XConnectable
     virtual void SAL_CALL setPredecessor(const Reference < XConnectable > & aPredecessor)
-        throw (RuntimeException);
-    virtual Reference < XConnectable > SAL_CALL getPredecessor(void) throw (RuntimeException);
+        throw (RuntimeException, std::exception);
+    virtual Reference < XConnectable > SAL_CALL getPredecessor(void) throw (RuntimeException, std::exception);
     virtual void SAL_CALL setSuccessor(const Reference < XConnectable >& aSuccessor)
-        throw (RuntimeException);
-    virtual Reference<  XConnectable >  SAL_CALL getSuccessor(void) throw (RuntimeException);
+        throw (RuntimeException, std::exception);
+    virtual Reference<  XConnectable >  SAL_CALL getSuccessor(void) throw (RuntimeException, std::exception);
 
 public: // XServiceInfo
-    OUString                     SAL_CALL getImplementationName() throw ();
-    Sequence< OUString >         SAL_CALL getSupportedServiceNames(void) throw ();
-    sal_Bool                        SAL_CALL supportsService(const OUString& ServiceName) throw ();
+    OUString                     SAL_CALL getImplementationName() throw (std::exception);
+    Sequence< OUString >         SAL_CALL getSupportedServiceNames(void) throw (std::exception);
+    sal_Bool                        SAL_CALL supportsService(const OUString& ServiceName) throw (std::exception);
 
 private:
     // helper methods
@@ -163,7 +163,7 @@ OMarkableOutputStream::~OMarkableOutputStream()
 void OMarkableOutputStream::writeBytes(const Sequence< sal_Int8 >& aData)
     throw ( NotConnectedException,
             BufferSizeExceededException,
-            RuntimeException)
+            RuntimeException, std::exception)
 {
     if( m_bValidStream ) {
         if( m_mapMarks.empty() && ( m_pBuffer->getSize() == 0 ) ) {
@@ -197,7 +197,7 @@ void OMarkableOutputStream::writeBytes(const Sequence< sal_Int8 >& aData)
 void OMarkableOutputStream::flush(void)
     throw ( NotConnectedException,
             BufferSizeExceededException,
-            RuntimeException)
+            RuntimeException, std::exception)
 {
     Reference< XOutputStream > output;
     {
@@ -217,7 +217,7 @@ void OMarkableOutputStream::flush(void)
 void OMarkableOutputStream::closeOutput(void)
     throw ( NotConnectedException,
             BufferSizeExceededException,
-            RuntimeException)
+            RuntimeException, std::exception)
 {
     if( m_bValidStream ) {
         MutexGuard guard( m_mutex );
@@ -244,7 +244,7 @@ void OMarkableOutputStream::closeOutput(void)
 
 sal_Int32 OMarkableOutputStream::createMark(void)
     throw ( IOException,
-            RuntimeException)
+            RuntimeException, std::exception)
 {
     MutexGuard guard( m_mutex );
     sal_Int32 nMark = m_nCurrentMark;
@@ -258,7 +258,7 @@ sal_Int32 OMarkableOutputStream::createMark(void)
 void OMarkableOutputStream::deleteMark(sal_Int32 Mark)
     throw( IOException,
            IllegalArgumentException,
-           RuntimeException)
+           RuntimeException, std::exception)
 {
     MutexGuard guard( m_mutex );
     map<sal_Int32,sal_Int32,less<sal_Int32> >::iterator ii = m_mapMarks.find( Mark );
@@ -279,7 +279,7 @@ void OMarkableOutputStream::deleteMark(sal_Int32 Mark)
 void OMarkableOutputStream::jumpToMark(sal_Int32 nMark)
     throw (IOException,
            IllegalArgumentException,
-           RuntimeException)
+           RuntimeException, std::exception)
 {
     MutexGuard guard( m_mutex );
     map<sal_Int32,sal_Int32,less<sal_Int32> >::iterator ii = m_mapMarks.find( nMark );
@@ -298,7 +298,7 @@ void OMarkableOutputStream::jumpToMark(sal_Int32 nMark)
 
 void OMarkableOutputStream::jumpToFurthest(void)
     throw (IOException,
-           RuntimeException)
+           RuntimeException, std::exception)
 {
     MutexGuard guard( m_mutex );
     m_nCurrentPos = m_pBuffer->getSize();
@@ -308,7 +308,7 @@ void OMarkableOutputStream::jumpToFurthest(void)
 sal_Int32 OMarkableOutputStream::offsetToMark(sal_Int32 nMark)
     throw (IOException,
            IllegalArgumentException,
-           RuntimeException)
+           RuntimeException, std::exception)
 {
 
     MutexGuard guard( m_mutex );
@@ -329,7 +329,7 @@ sal_Int32 OMarkableOutputStream::offsetToMark(sal_Int32 nMark)
 
 // XActiveDataSource2
 void OMarkableOutputStream::setOutputStream(const Reference < XOutputStream >& aStream)
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     if( m_output != aStream ) {
         m_output = aStream;
@@ -340,7 +340,7 @@ void OMarkableOutputStream::setOutputStream(const Reference < XOutputStream >& a
     m_bValidStream = m_output.is();
 }
 
-Reference< XOutputStream > OMarkableOutputStream::getOutputStream(void) throw (RuntimeException)
+Reference< XOutputStream > OMarkableOutputStream::getOutputStream(void) throw (RuntimeException, std::exception)
 {
     return m_output;
 }
@@ -348,7 +348,7 @@ Reference< XOutputStream > OMarkableOutputStream::getOutputStream(void) throw (R
 
 
 void OMarkableOutputStream::setSuccessor( const Reference< XConnectable > &r )
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
      /// if the references match, nothing needs to be done
      if( m_succ != r ) {
@@ -361,7 +361,7 @@ void OMarkableOutputStream::setSuccessor( const Reference< XConnectable > &r )
          }
      }
 }
-Reference <XConnectable > OMarkableOutputStream::getSuccessor()     throw (RuntimeException)
+Reference <XConnectable > OMarkableOutputStream::getSuccessor()     throw (RuntimeException, std::exception)
 {
     return m_succ;
 }
@@ -369,7 +369,7 @@ Reference <XConnectable > OMarkableOutputStream::getSuccessor()     throw (Runti
 
 // XDataSource
 void OMarkableOutputStream::setPredecessor( const Reference< XConnectable > &r )
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     if( r != m_pred ) {
         m_pred = r;
@@ -379,7 +379,7 @@ void OMarkableOutputStream::setPredecessor( const Reference< XConnectable > &r )
         }
     }
 }
-Reference < XConnectable > OMarkableOutputStream::getPredecessor() throw (RuntimeException)
+Reference < XConnectable > OMarkableOutputStream::getPredecessor() throw (RuntimeException, std::exception)
 {
     return m_pred;
 }
@@ -422,19 +422,19 @@ void OMarkableOutputStream::checkMarksAndFlush() throw(     NotConnectedExceptio
 
 
 // XServiceInfo
-OUString OMarkableOutputStream::getImplementationName() throw ()
+OUString OMarkableOutputStream::getImplementationName() throw (std::exception)
 {
     return OMarkableOutputStream_getImplementationName();
 }
 
 // XServiceInfo
-sal_Bool OMarkableOutputStream::supportsService(const OUString& ServiceName) throw ()
+sal_Bool OMarkableOutputStream::supportsService(const OUString& ServiceName) throw (std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 // XServiceInfo
-Sequence< OUString > OMarkableOutputStream::getSupportedServiceNames(void) throw ()
+Sequence< OUString > OMarkableOutputStream::getSupportedServiceNames(void) throw (std::exception)
 {
     return OMarkableOutputStream_getSupportedServiceNames();
 }
@@ -496,52 +496,52 @@ public: // XInputStream
     virtual sal_Int32 SAL_CALL readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
         throw ( NotConnectedException,
                 BufferSizeExceededException,
-                RuntimeException) ;
+                RuntimeException, std::exception) ;
     virtual sal_Int32 SAL_CALL readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead)
         throw ( NotConnectedException,
                 BufferSizeExceededException,
-                RuntimeException);
+                RuntimeException, std::exception);
     virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip)
         throw ( NotConnectedException,
                 BufferSizeExceededException,
-                RuntimeException);
+                RuntimeException, std::exception);
 
     virtual sal_Int32 SAL_CALL available(void)
         throw ( NotConnectedException,
-                RuntimeException);
-    virtual void SAL_CALL closeInput(void) throw (NotConnectedException, RuntimeException);
+                RuntimeException, std::exception);
+    virtual void SAL_CALL closeInput(void) throw (NotConnectedException, RuntimeException, std::exception);
 
 public: // XMarkable
     virtual sal_Int32 SAL_CALL createMark(void)
-        throw (IOException, RuntimeException);
+        throw (IOException, RuntimeException, std::exception);
     virtual void SAL_CALL deleteMark(sal_Int32 Mark)
-        throw (IOException, IllegalArgumentException, RuntimeException);
+        throw (IOException, IllegalArgumentException, RuntimeException, std::exception);
     virtual void SAL_CALL jumpToMark(sal_Int32 nMark)
-        throw (IOException, IllegalArgumentException, RuntimeException);
+        throw (IOException, IllegalArgumentException, RuntimeException, std::exception);
     virtual void SAL_CALL jumpToFurthest(void)
-        throw (IOException, RuntimeException);
+        throw (IOException, RuntimeException, std::exception);
     virtual sal_Int32 SAL_CALL offsetToMark(sal_Int32 nMark)
-        throw (IOException, IllegalArgumentException,RuntimeException);
+        throw (IOException, IllegalArgumentException,RuntimeException, std::exception);
 
 public: // XActiveDataSink
     virtual void SAL_CALL setInputStream(const Reference < XInputStream > & aStream)
-        throw (RuntimeException);
+        throw (RuntimeException, std::exception);
     virtual Reference < XInputStream > SAL_CALL getInputStream(void)
-        throw (RuntimeException);
+        throw (RuntimeException, std::exception);
 
 public: // XConnectable
     virtual void SAL_CALL setPredecessor(const Reference < XConnectable > & aPredecessor)
-        throw (RuntimeException);
+        throw (RuntimeException, std::exception);
     virtual Reference < XConnectable > SAL_CALL getPredecessor(void)
-        throw (RuntimeException);
+        throw (RuntimeException, std::exception);
     virtual void SAL_CALL setSuccessor(const Reference < XConnectable > & aSuccessor)
-        throw (RuntimeException);
-    virtual Reference < XConnectable > SAL_CALL getSuccessor(void) throw (RuntimeException);
+        throw (RuntimeException, std::exception);
+    virtual Reference < XConnectable > SAL_CALL getSuccessor(void) throw (RuntimeException, std::exception);
 
 public: // XServiceInfo
-    OUString                     SAL_CALL getImplementationName() throw ();
-    Sequence< OUString >         SAL_CALL getSupportedServiceNames(void) throw ();
-    sal_Bool                         SAL_CALL  supportsService(const OUString& ServiceName) throw ();
+    OUString                     SAL_CALL getImplementationName() throw (std::exception);
+    Sequence< OUString >         SAL_CALL getSupportedServiceNames(void) throw (std::exception);
+    sal_Bool                         SAL_CALL  supportsService(const OUString& ServiceName) throw (std::exception);
 
 private:
     void checkMarksAndFlush();
@@ -583,7 +583,7 @@ OMarkableInputStream::~OMarkableInputStream()
 sal_Int32 OMarkableInputStream::readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
     throw ( NotConnectedException,
             BufferSizeExceededException,
-            RuntimeException)
+            RuntimeException, std::exception)
 {
     sal_Int32 nBytesRead;
 
@@ -640,7 +640,7 @@ sal_Int32 OMarkableInputStream::readBytes(Sequence< sal_Int8 >& aData, sal_Int32
 sal_Int32 OMarkableInputStream::readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead)
     throw ( NotConnectedException,
             BufferSizeExceededException,
-            RuntimeException)
+            RuntimeException, std::exception)
 {
 
     sal_Int32 nBytesRead;
@@ -704,7 +704,7 @@ sal_Int32 OMarkableInputStream::readSomeBytes(Sequence< sal_Int8 >& aData, sal_I
 void OMarkableInputStream::skipBytes(sal_Int32 nBytesToSkip)
     throw ( NotConnectedException,
             BufferSizeExceededException,
-            RuntimeException)
+            RuntimeException, std::exception)
 {
     if ( nBytesToSkip < 0 )
         throw BufferSizeExceededException(
@@ -717,7 +717,7 @@ void OMarkableInputStream::skipBytes(sal_Int32 nBytesToSkip)
     readBytes( seqDummy , nBytesToSkip );
 }
 
-sal_Int32 OMarkableInputStream::available(void) throw (NotConnectedException, RuntimeException)
+sal_Int32 OMarkableInputStream::available(void) throw (NotConnectedException, RuntimeException, std::exception)
 {
     sal_Int32 nAvail;
     if( m_bValidStream ) {
@@ -735,7 +735,7 @@ sal_Int32 OMarkableInputStream::available(void) throw (NotConnectedException, Ru
 }
 
 
-void OMarkableInputStream::closeInput(void) throw (NotConnectedException, RuntimeException)
+void OMarkableInputStream::closeInput(void) throw (NotConnectedException, RuntimeException, std::exception)
 {
     if( m_bValidStream ) {
         MutexGuard guard( m_mutex );
@@ -760,7 +760,7 @@ void OMarkableInputStream::closeInput(void) throw (NotConnectedException, Runtim
 
 // XMarkable
 
-sal_Int32 OMarkableInputStream::createMark(void)            throw (IOException, RuntimeException)
+sal_Int32 OMarkableInputStream::createMark(void)            throw (IOException, RuntimeException, std::exception)
 {
     MutexGuard guard( m_mutex );
     sal_Int32 nMark = m_nCurrentMark;
@@ -771,7 +771,7 @@ sal_Int32 OMarkableInputStream::createMark(void)            throw (IOException,
     return nMark;
 }
 
-void OMarkableInputStream::deleteMark(sal_Int32 Mark)       throw (IOException, IllegalArgumentException, RuntimeException)
+void OMarkableInputStream::deleteMark(sal_Int32 Mark)       throw (IOException, IllegalArgumentException, RuntimeException, std::exception)
 {
     MutexGuard guard( m_mutex );
     map<sal_Int32,sal_Int32,less<sal_Int32> >::iterator ii = m_mapMarks.find( Mark );
@@ -792,7 +792,7 @@ void OMarkableInputStream::deleteMark(sal_Int32 Mark)       throw (IOException,
 void OMarkableInputStream::jumpToMark(sal_Int32 nMark)
     throw (IOException,
            IllegalArgumentException,
-           RuntimeException)
+           RuntimeException, std::exception)
 {
     MutexGuard guard( m_mutex );
     map<sal_Int32,sal_Int32,less<sal_Int32> >::iterator ii = m_mapMarks.find( nMark );
@@ -811,7 +811,7 @@ void OMarkableInputStream::jumpToMark(sal_Int32 nMark)
     }
 }
 
-void OMarkableInputStream::jumpToFurthest(void)         throw (IOException, RuntimeException)
+void OMarkableInputStream::jumpToFurthest(void)         throw (IOException, RuntimeException, std::exception)
 {
     MutexGuard guard( m_mutex );
     m_nCurrentPos = m_pBuffer->getSize();
@@ -821,7 +821,7 @@ void OMarkableInputStream::jumpToFurthest(void)         throw (IOException, Runt
 sal_Int32 OMarkableInputStream::offsetToMark(sal_Int32 nMark)
      throw (IOException,
            IllegalArgumentException,
-           RuntimeException)
+           RuntimeException, std::exception)
 {
     MutexGuard guard( m_mutex );
     map<sal_Int32,sal_Int32,less<sal_Int32> >::const_iterator ii = m_mapMarks.find( nMark );
@@ -845,7 +845,7 @@ sal_Int32 OMarkableInputStream::offsetToMark(sal_Int32 nMark)
 
 // XActiveDataSource
 void OMarkableInputStream::setInputStream(const Reference< XInputStream > & aStream)
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
 
     if( m_input != aStream ) {
@@ -859,7 +859,7 @@ void OMarkableInputStream::setInputStream(const Reference< XInputStream > & aStr
 
 }
 
-Reference< XInputStream > OMarkableInputStream::getInputStream(void) throw (RuntimeException)
+Reference< XInputStream > OMarkableInputStream::getInputStream(void) throw (RuntimeException, std::exception)
 {
     return m_input;
 }
@@ -868,7 +868,7 @@ Reference< XInputStream > OMarkableInputStream::getInputStream(void) throw (Runt
 
 // XDataSink
 void OMarkableInputStream::setSuccessor( const Reference< XConnectable > &r )
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
      /// if the references match, nothing needs to be done
      if( m_succ != r ) {
@@ -883,7 +883,7 @@ void OMarkableInputStream::setSuccessor( const Reference< XConnectable > &r )
      }
 }
 
-Reference < XConnectable >  OMarkableInputStream::getSuccessor() throw (RuntimeException)
+Reference < XConnectable >  OMarkableInputStream::getSuccessor() throw (RuntimeException, std::exception)
 {
     return m_succ;
 }
@@ -891,7 +891,7 @@ Reference < XConnectable >  OMarkableInputStream::getSuccessor() throw (RuntimeE
 
 // XDataSource
 void OMarkableInputStream::setPredecessor( const Reference < XConnectable >  &r )
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     if( r != m_pred ) {
         m_pred = r;
@@ -901,7 +901,7 @@ void OMarkableInputStream::setPredecessor( const Reference < XConnectable >  &r
         }
     }
 }
-Reference< XConnectable >  OMarkableInputStream::getPredecessor() throw (RuntimeException)
+Reference< XConnectable >  OMarkableInputStream::getPredecessor() throw (RuntimeException, std::exception)
 {
     return m_pred;
 }
@@ -938,19 +938,19 @@ void OMarkableInputStream::checkMarksAndFlush()
 }
 
 // XServiceInfo
-OUString OMarkableInputStream::getImplementationName() throw ()
+OUString OMarkableInputStream::getImplementationName() throw (std::exception)
 {
     return OMarkableInputStream_getImplementationName();
 }
 
 // XServiceInfo
-sal_Bool OMarkableInputStream::supportsService(const OUString& ServiceName) throw ()
+sal_Bool OMarkableInputStream::supportsService(const OUString& ServiceName) throw (std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 // XServiceInfo
-Sequence< OUString > OMarkableInputStream::getSupportedServiceNames(void) throw ()
+Sequence< OUString > OMarkableInputStream::getSupportedServiceNames(void) throw (std::exception)
 {
     return OMarkableInputStream_getSupportedServiceNames();
 }
diff --git a/io/source/stm/opipe.cxx b/io/source/stm/opipe.cxx
index 847a9a0bb351..b090a5817a11 100644
--- a/io/source/stm/opipe.cxx
+++ b/io/source/stm/opipe.cxx
@@ -63,50 +63,50 @@ public: // XInputStream
     virtual sal_Int32 SAL_CALL readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
         throw(  NotConnectedException,
                 BufferSizeExceededException,
-                RuntimeException );
+                RuntimeException, std::exception );
     virtual sal_Int32 SAL_CALL readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead)
         throw( NotConnectedException,
                BufferSizeExceededException,
-               RuntimeException );
+               RuntimeException, std::exception );
     virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip)
         throw( NotConnectedException,
                BufferSizeExceededException,
-               RuntimeException );
+               RuntimeException, std::exception );
     virtual sal_Int32 SAL_CALL available(void)
         throw( NotConnectedException,
-               RuntimeException );
+               RuntimeException, std::exception );
     virtual void SAL_CALL closeInput(void)
         throw( NotConnectedException,
-               RuntimeException );
+               RuntimeException, std::exception );
 
 public: // XOutputStream
 
     virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData)
         throw( NotConnectedException,
                BufferSizeExceededException,
-               RuntimeException );
+               RuntimeException, std::exception );
     virtual void SAL_CALL flush(void)
         throw( NotConnectedException,
                BufferSizeExceededException,
-               RuntimeException );
+               RuntimeException, std::exception );
     virtual void SAL_CALL closeOutput(void)
         throw( NotConnectedException,
                BufferSizeExceededException,
-               RuntimeException );
+               RuntimeException, std::exception );
 
 public: // XConnectable
     virtual void SAL_CALL setPredecessor(const Reference< XConnectable >& aPredecessor)
-        throw( RuntimeException );
-    virtual Reference< XConnectable > SAL_CALL getPredecessor(void) throw( RuntimeException );
+        throw( RuntimeException, std::exception );
+    virtual Reference< XConnectable > SAL_CALL getPredecessor(void) throw( RuntimeException, std::exception );
     virtual void SAL_CALL setSuccessor(const Reference < XConnectable > & aSuccessor)
-        throw( RuntimeException );
-    virtual Reference < XConnectable > SAL_CALL getSuccessor(void) throw( RuntimeException ) ;
+        throw( RuntimeException, std::exception );
+    virtual Reference < XConnectable > SAL_CALL getSuccessor(void) throw( RuntimeException, std::exception ) ;
 
 
 public: // XServiceInfo
-    OUString                    SAL_CALL getImplementationName() throw(  );
-    Sequence< OUString >         SAL_CALL getSupportedServiceNames(void) throw(  );
-    sal_Bool                        SAL_CALL supportsService(const OUString& ServiceName) throw(  );
+    OUString                    SAL_CALL getImplementationName() throw(std::exception  );
+    Sequence< OUString >         SAL_CALL getSupportedServiceNames(void) throw(std::exception  );
+    sal_Bool                        SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception  );
 
 private:
 
@@ -144,7 +144,7 @@ OPipeImpl::~OPipeImpl()
 
 
 sal_Int32 OPipeImpl::readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
-    throw( NotConnectedException, BufferSizeExceededException,RuntimeException )
+    throw( NotConnectedException, BufferSizeExceededException,RuntimeException, std::exception )
 {
     while( true )
     {
@@ -184,7 +184,7 @@ sal_Int32 OPipeImpl::readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRe
 sal_Int32 OPipeImpl::readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead)
     throw( NotConnectedException,
            BufferSizeExceededException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     while( true ) {
         {
@@ -218,7 +218,7 @@ sal_Int32 OPipeImpl::readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBy
 void OPipeImpl::skipBytes(sal_Int32 nBytesToSkip)
     throw( NotConnectedException,
            BufferSizeExceededException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     MutexGuard guard( m_mutexAccess );
     if( m_bInputStreamClosed )
@@ -246,7 +246,7 @@ void OPipeImpl::skipBytes(sal_Int32 nBytesToSkip)
 
 sal_Int32 OPipeImpl::available(void)
     throw( NotConnectedException,
-           RuntimeException )
+           RuntimeException, std::exception )
  {
     MutexGuard guard( m_mutexAccess );
     if( m_bInputStreamClosed )
@@ -260,7 +260,7 @@ sal_Int32 OPipeImpl::available(void)
 
 void OPipeImpl::closeInput(void)
     throw( NotConnectedException,
-           RuntimeException)
+           RuntimeException, std::exception)
 {
     MutexGuard guard( m_mutexAccess );
 
@@ -280,7 +280,7 @@ void OPipeImpl::closeInput(void)
 void OPipeImpl::writeBytes(const Sequence< sal_Int8 >& aData)
     throw( NotConnectedException,
            BufferSizeExceededException,
-           RuntimeException)
+           RuntimeException, std::exception)
 {
     MutexGuard guard( m_mutexAccess );
 
@@ -343,7 +343,7 @@ void OPipeImpl::writeBytes(const Sequence< sal_Int8 >& aData)
 void OPipeImpl::flush(void)
     throw( NotConnectedException,
            BufferSizeExceededException,
-           RuntimeException)
+           RuntimeException, std::exception)
 {
     // nothing to do for a pipe
     return;
@@ -352,7 +352,7 @@ void OPipeImpl::flush(void)
 void OPipeImpl::closeOutput(void)
     throw( NotConnectedException,
            BufferSizeExceededException,
-           RuntimeException)
+           RuntimeException, std::exception)
 {
     MutexGuard guard( m_mutexAccess );
 
@@ -364,7 +364,7 @@ void OPipeImpl::closeOutput(void)
 
 
 void OPipeImpl::setSuccessor( const Reference < XConnectable >  &r )
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
      /// if the references match, nothing needs to be done
      if( m_succ != r ) {
@@ -379,7 +379,7 @@ void OPipeImpl::setSuccessor( const Reference < XConnectable >  &r )
      }
 }
 
-Reference < XConnectable > OPipeImpl::getSuccessor()    throw( RuntimeException )
+Reference < XConnectable > OPipeImpl::getSuccessor()    throw( RuntimeException, std::exception )
 {
     return m_succ;
 }
@@ -387,7 +387,7 @@ Reference < XConnectable > OPipeImpl::getSuccessor()    throw( RuntimeException
 
 // XDataSource
 void OPipeImpl::setPredecessor( const Reference < XConnectable > &r )
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     if( r != m_pred ) {
         m_pred = r;
@@ -398,7 +398,7 @@ void OPipeImpl::setPredecessor( const Reference < XConnectable > &r )
     }
 }
 
-Reference < XConnectable > OPipeImpl::getPredecessor() throw( RuntimeException )
+Reference < XConnectable > OPipeImpl::getPredecessor() throw( RuntimeException, std::exception )
 {
     return m_pred;
 }
@@ -407,19 +407,19 @@ Reference < XConnectable > OPipeImpl::getPredecessor() throw( RuntimeException )
 
 
 // XServiceInfo
-OUString OPipeImpl::getImplementationName() throw(  )
+OUString OPipeImpl::getImplementationName() throw(std::exception  )
 {
     return OPipeImpl_getImplementationName();
 }
 
 // XServiceInfo
-sal_Bool OPipeImpl::supportsService(const OUString& ServiceName) throw(  )
+sal_Bool OPipeImpl::supportsService(const OUString& ServiceName) throw(std::exception  )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 // XServiceInfo
-Sequence< OUString > OPipeImpl::getSupportedServiceNames(void) throw(  )
+Sequence< OUString > OPipeImpl::getSupportedServiceNames(void) throw(std::exception  )
 {
     return OPipeImpl_getSupportedServiceNames();
 }
diff --git a/io/source/stm/opump.cxx b/io/source/stm/opump.cxx
index 35d1233e5ad5..6e81dff97b6e 100644
--- a/io/source/stm/opump.cxx
+++ b/io/source/stm/opump.cxx
@@ -80,29 +80,29 @@ namespace io_stm {
         virtual ~Pump();
 
         // XActiveDataSource
-        virtual void SAL_CALL setOutputStream( const Reference< ::com::sun::star::io::XOutputStream >& xOutput ) throw();
-        virtual Reference< ::com::sun::star::io::XOutputStream > SAL_CALL getOutputStream() throw();
+        virtual void SAL_CALL setOutputStream( const Reference< ::com::sun::star::io::XOutputStream >& xOutput ) throw(std::exception);
+        virtual Reference< ::com::sun::star::io::XOutputStream > SAL_CALL getOutputStream() throw(std::exception);
 
         // XActiveDataSink
-        virtual void SAL_CALL setInputStream( const Reference< ::com::sun::star::io::XInputStream >& xStream ) throw();
-        virtual Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream() throw();
+        virtual void SAL_CALL setInputStream( const Reference< ::com::sun::star::io::XInputStream >& xStream ) throw(std::exception);
+        virtual Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream() throw(std::exception);
 
         // XActiveDataControl
-        virtual void SAL_CALL addListener( const Reference< ::com::sun::star::io::XStreamListener >& xListener ) throw();
-        virtual void SAL_CALL removeListener( const Reference< ::com::sun::star::io::XStreamListener >& xListener ) throw();
-        virtual void SAL_CALL start() throw( RuntimeException );
-        virtual void SAL_CALL terminate() throw();
+        virtual void SAL_CALL addListener( const Reference< ::com::sun::star::io::XStreamListener >& xListener ) throw(std::exception);
+        virtual void SAL_CALL removeListener( const Reference< ::com::sun::star::io::XStreamListener >& xListener ) throw(std::exception);
+        virtual void SAL_CALL start() throw( RuntimeException, std::exception );
+        virtual void SAL_CALL terminate() throw(std::exception);
 
         // XConnectable
-        virtual void SAL_CALL setPredecessor( const Reference< ::com::sun::star::io::XConnectable >& xPred ) throw();
-        virtual Reference< ::com::sun::star::io::XConnectable > SAL_CALL getPredecessor() throw();
-        virtual void SAL_CALL setSuccessor( const Reference< ::com::sun::star::io::XConnectable >& xSucc ) throw();
-        virtual Reference< ::com::sun::star::io::XConnectable > SAL_CALL getSuccessor() throw();
+        virtual void SAL_CALL setPredecessor( const Reference< ::com::sun::star::io::XConnectable >& xPred ) throw(std::exception);
+        virtual Reference< ::com::sun::star::io::XConnectable > SAL_CALL getPredecessor() throw(std::exception);
+        virtual void SAL_CALL setSuccessor( const Reference< ::com::sun::star::io::XConnectable >& xSucc ) throw(std::exception);
+        virtual Reference< ::com::sun::star::io::XConnectable > SAL_CALL getSuccessor() throw(std::exception);
 
     public: // XServiceInfo
-        virtual OUString    SAL_CALL getImplementationName() throw(  );
-        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(  );
-        virtual sal_Bool     SAL_CALL supportsService(const OUString& ServiceName) throw(  );
+        virtual OUString    SAL_CALL getImplementationName() throw(std::exception  );
+        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(std::exception  );
+        virtual sal_Bool     SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception  );
     };
 
 Pump::Pump() : m_aThread( 0 ),
@@ -309,7 +309,7 @@ void Pump::run()
  * XConnectable
  */
 
-void Pump::setPredecessor( const Reference< XConnectable >& xPred ) throw()
+void Pump::setPredecessor( const Reference< XConnectable >& xPred ) throw(std::exception)
 {
     Guard< Mutex > aGuard( m_aMutex );
     m_xPred = xPred;
@@ -317,7 +317,7 @@ void Pump::setPredecessor( const Reference< XConnectable >& xPred ) throw()
 
 
 
-Reference< XConnectable > Pump::getPredecessor() throw()
+Reference< XConnectable > Pump::getPredecessor() throw(std::exception)
 {
     Guard< Mutex > aGuard( m_aMutex );
     return m_xPred;
@@ -325,7 +325,7 @@ Reference< XConnectable > Pump::getPredecessor() throw()
 
 
 
-void Pump::setSuccessor( const Reference< XConnectable >& xSucc ) throw()
+void Pump::setSuccessor( const Reference< XConnectable >& xSucc ) throw(std::exception)
 {
     Guard< Mutex > aGuard( m_aMutex );
     m_xSucc = xSucc;
@@ -333,7 +333,7 @@ void Pump::setSuccessor( const Reference< XConnectable >& xSucc ) throw()
 
 
 
-Reference< XConnectable > Pump::getSuccessor() throw()
+Reference< XConnectable > Pump::getSuccessor() throw(std::exception)
 {
     Guard< Mutex > aGuard( m_aMutex );
     return m_xSucc;
@@ -345,21 +345,21 @@ Reference< XConnectable > Pump::getSuccessor() throw()
  * XActiveDataControl
  */
 
-void Pump::addListener( const Reference< XStreamListener >& xListener ) throw()
+void Pump::addListener( const Reference< XStreamListener >& xListener ) throw(std::exception)
 {
     m_cnt.addInterface( xListener );
 }
 
 
 
-void Pump::removeListener( const Reference< XStreamListener >& xListener ) throw()
+void Pump::removeListener( const Reference< XStreamListener >& xListener ) throw(std::exception)
 {
     m_cnt.removeInterface( xListener );
 }
 
 
 
-void Pump::start() throw( RuntimeException )
+void Pump::start() throw( RuntimeException, std::exception )
 {
     Guard< Mutex > aGuard( m_aMutex );
     m_aThread = osl_createSuspendedThread((oslWorkerFunction)Pump::static_run,this);
@@ -379,7 +379,7 @@ void Pump::start() throw( RuntimeException )
 
 
 
-void Pump::terminate() throw()
+void Pump::terminate() throw(std::exception)
 {
     close();
 
@@ -397,7 +397,7 @@ void Pump::terminate() throw()
  * XActiveDataSink
  */
 
-void Pump::setInputStream( const Reference< XInputStream >& xStream ) throw()
+void Pump::setInputStream( const Reference< XInputStream >& xStream ) throw(std::exception)
 {
     Guard< Mutex > aGuard( m_aMutex );
     m_xInput = xStream;
@@ -409,7 +409,7 @@ void Pump::setInputStream( const Reference< XInputStream >& xStream ) throw()
 
 
 
-Reference< XInputStream > Pump::getInputStream() throw()
+Reference< XInputStream > Pump::getInputStream() throw(std::exception)
 {
     Guard< Mutex > aGuard( m_aMutex );
     return m_xInput;
@@ -421,7 +421,7 @@ Reference< XInputStream > Pump::getInputStream() throw()
  * XActiveDataSource
  */
 
-void Pump::setOutputStream( const Reference< XOutputStream >& xOut ) throw()
+void Pump::setOutputStream( const Reference< XOutputStream >& xOut ) throw(std::exception)
 {
     Guard< Mutex > aGuard( m_aMutex );
     m_xOutput = xOut;
@@ -431,26 +431,26 @@ void Pump::setOutputStream( const Reference< XOutputStream >& xOut ) throw()
     // data transfer starts in XActiveDataControl::start
 }
 
-Reference< XOutputStream > Pump::getOutputStream() throw()
+Reference< XOutputStream > Pump::getOutputStream() throw(std::exception)
 {
     Guard< Mutex > aGuard( m_aMutex );
     return m_xOutput;
 }
 
 // XServiceInfo
-OUString Pump::getImplementationName() throw(  )
+OUString Pump::getImplementationName() throw(std::exception  )
 {
     return OPumpImpl_getImplementationName();
 }
 
 // XServiceInfo
-sal_Bool Pump::supportsService(const OUString& ServiceName) throw(  )
+sal_Bool Pump::supportsService(const OUString& ServiceName) throw(std::exception  )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 // XServiceInfo
-Sequence< OUString > Pump::getSupportedServiceNames(void) throw(  )
+Sequence< OUString > Pump::getSupportedServiceNames(void) throw(std::exception  )
 {
     return OPumpImpl_getSupportedServiceNames();
 }