cppuhelper: retrofit std::exception into overriding exception specs

Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3

10 files changed, 132 insertions, 132 deletions

diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx
index c798c41e0e59..cbb7a5e9a4e6 100644
--- a/ucb/source/ucp/ftp/ftpcontent.cxx
+++ b/ucb/source/ucp/ftp/ftpcontent.cxx
@@ -178,7 +178,7 @@ XSERVICEINFO_IMPL_1( FTPContent,
 
 // virtual
 OUString SAL_CALL FTPContent::getContentType()
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     return OUString(FTP_CONTENT_TYPE);
 }
@@ -193,7 +193,7 @@ OUString SAL_CALL FTPContent::getContentType()
 
 //virtual
 void SAL_CALL FTPContent::abort( sal_Int32 /*CommandId*/ )
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
 }
 
@@ -274,7 +274,7 @@ Any SAL_CALL FTPContent::execute(
     throw(
         Exception,
         CommandAbortedException,
-        RuntimeException
+        RuntimeException, std::exception
     )
 {
     ACTION action(NOACTION);
@@ -620,7 +620,7 @@ Any SAL_CALL FTPContent::execute(
 
 Sequence<ContentInfo > SAL_CALL
 FTPContent::queryCreatableContentsInfo(  )
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     return queryCreatableContentsInfo_Static();
 }
@@ -654,7 +654,7 @@ FTPContent::queryCreatableContentsInfo_Static(  )
 
 Reference<XContent > SAL_CALL
 FTPContent::createNewContent( const ContentInfo& Info )
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     if( Info.Type =="application/vnd.sun.staroffice.ftp-file" || Info.Type == "application/vnd.sun.staroffice.ftp-folder" )
         return new FTPContent(m_xContext,
@@ -669,7 +669,7 @@ FTPContent::createNewContent( const ContentInfo& Info )
 
 Reference<XInterface > SAL_CALL
 FTPContent::getParent(  )
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     Reference<XContentIdentifier>
         xIdent(new FTPContentIdentifier(m_aFTPURL.parent(false)));
@@ -680,7 +680,7 @@ FTPContent::getParent(  )
 void SAL_CALL
 FTPContent::setParent(const Reference<XInterface >& /*Parent*/ )
     throw (NoSupportException,
-           RuntimeException)
+           RuntimeException, std::exception)
 {
     throw NoSupportException();
 }
diff --git a/ucb/source/ucp/ftp/ftpcontent.hxx b/ucb/source/ucp/ftp/ftpcontent.hxx
index 1023c35c4bc2..e797cb266a28 100644
--- a/ucb/source/ucp/ftp/ftpcontent.hxx
+++ b/ucb/source/ucp/ftp/ftpcontent.hxx
@@ -80,7 +80,7 @@ namespace ftp
         // XContent
         virtual OUString SAL_CALL
         getContentType()
-            throw( com::sun::star::uno::RuntimeException );
+            throw( com::sun::star::uno::RuntimeException, std::exception );
 
         // XCommandProcessor
         virtual com::sun::star::uno::Any SAL_CALL
@@ -90,35 +90,35 @@ namespace ftp
                  com::sun::star::ucb::XCommandEnvironment >& Environment )
             throw( com::sun::star::uno::Exception,
                    com::sun::star::ucb::CommandAbortedException,
-                   com::sun::star::uno::RuntimeException );
+                   com::sun::star::uno::RuntimeException, std::exception );
 
         virtual void SAL_CALL
         abort(sal_Int32 CommandId)
-            throw( com::sun::star::uno::RuntimeException);
+            throw( com::sun::star::uno::RuntimeException, std::exception);
 
         // XContentCreator
         virtual com::sun::star::uno::Sequence<
         com::sun::star::ucb::ContentInfo > SAL_CALL
         queryCreatableContentsInfo(  )
-            throw (com::sun::star::uno::RuntimeException);
+            throw (com::sun::star::uno::RuntimeException, std::exception);
 
         virtual com::sun::star::uno::Reference<
         com::sun::star::ucb::XContent > SAL_CALL
         createNewContent( const com::sun::star::ucb::ContentInfo& Info )
-            throw (com::sun::star::uno::RuntimeException);
+            throw (com::sun::star::uno::RuntimeException, std::exception);
 
         // XChild
 
         virtual ::com::sun::star::uno::Reference<
         ::com::sun::star::uno::XInterface > SAL_CALL
         getParent(  )
-            throw (::com::sun::star::uno::RuntimeException);
+            throw (::com::sun::star::uno::RuntimeException, std::exception);
 
         virtual void SAL_CALL
         setParent( const ::com::sun::star::uno::Reference<
                    ::com::sun::star::uno::XInterface >& Parent )
             throw (::com::sun::star::lang::NoSupportException,
-                   ::com::sun::star::uno::RuntimeException);
+                   ::com::sun::star::uno::RuntimeException, std::exception);
 
 
         static com::sun::star::uno::Sequence<
diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
index 402372ca83dd..0232bd5194e3 100644
--- a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
@@ -50,7 +50,7 @@ FTPContentIdentifier::queryInterface(
     const Type& rType
 )
     throw(
-        RuntimeException
+        RuntimeException, std::exception
     )
 {
     Any aRet =
@@ -74,7 +74,7 @@ void SAL_CALL FTPContentIdentifier::release( void ) throw() {
 
 Sequence<sal_Int8> SAL_CALL
 FTPContentIdentifier::getImplementationId()
-    throw(RuntimeException)
+    throw(RuntimeException, std::exception)
 {
     static cppu::OImplementationId* pId = NULL;
     if(!pId)
@@ -93,7 +93,7 @@ FTPContentIdentifier::getImplementationId()
 Sequence<Type> SAL_CALL
 FTPContentIdentifier::getTypes(
     void )
-    throw(RuntimeException)
+    throw(RuntimeException, std::exception)
 {
     static cppu::OTypeCollection* pCollection = NULL;
     if ( !pCollection ) {
@@ -116,7 +116,7 @@ OUString SAL_CALL
 FTPContentIdentifier::getContentIdentifier(
 )
     throw (
-        com::sun::star::uno::RuntimeException
+        com::sun::star::uno::RuntimeException, std::exception
     )
 {
     return m_ident;
@@ -127,7 +127,7 @@ OUString SAL_CALL
 FTPContentIdentifier::getContentProviderScheme(
 )
     throw (
-        com::sun::star::uno::RuntimeException
+        com::sun::star::uno::RuntimeException, std::exception
     )
 {
     return OUString("ftp");
diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.hxx b/ucb/source/ucp/ftp/ftpcontentidentifier.hxx
index f4d1c443b128..96122eac72e5 100644
--- a/ucb/source/ucp/ftp/ftpcontentidentifier.hxx
+++ b/ucb/source/ucp/ftp/ftpcontentidentifier.hxx
@@ -54,7 +54,7 @@ namespace ftp {
 
         virtual com::sun::star::uno::Any SAL_CALL
         queryInterface( const com::sun::star::uno::Type& rType )
-            throw( com::sun::star::uno::RuntimeException );
+            throw( com::sun::star::uno::RuntimeException, std::exception );
 
         virtual void SAL_CALL acquire( void ) throw();
 
@@ -67,14 +67,14 @@ namespace ftp {
         getTypes(
         )
             throw(
-                com::sun::star::uno::RuntimeException
+                com::sun::star::uno::RuntimeException, std::exception
             );
 
         virtual com::sun::star::uno::Sequence<sal_Int8> SAL_CALL
         getImplementationId(
         )
             throw(
-                com::sun::star::uno::RuntimeException
+                com::sun::star::uno::RuntimeException, std::exception
             );
 
 
@@ -84,14 +84,14 @@ namespace ftp {
         getContentIdentifier(
         )
             throw (
-                com::sun::star::uno::RuntimeException
+                com::sun::star::uno::RuntimeException, std::exception
             );
 
         virtual OUString SAL_CALL
         getContentProviderScheme(
         )
             throw (
-                ::com::sun::star::uno::RuntimeException
+                ::com::sun::star::uno::RuntimeException, std::exception
             );
 
 
diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.cxx b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
index 982f1c39d331..f2130cdb5a96 100644
--- a/ucb/source/ucp/ftp/ftpcontentprovider.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
@@ -120,7 +120,7 @@ FTPContentProvider::queryContent(
 )
     throw(
         IllegalIdentifierException,
-        RuntimeException
+        RuntimeException, std::exception
     )
 {
     // Check, if a content with given id already exists...
diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.hxx b/ucb/source/ucp/ftp/ftpcontentprovider.hxx
index 3ec371cd3998..ade75efe20f9 100644
--- a/ucb/source/ucp/ftp/ftpcontentprovider.hxx
+++ b/ucb/source/ucp/ftp/ftpcontentprovider.hxx
@@ -73,7 +73,7 @@ namespace ftp {
         queryContent(
             const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& Identifier )
             throw( com::sun::star::ucb::IllegalIdentifierException,
-                   com::sun::star::uno::RuntimeException );
+                   com::sun::star::uno::RuntimeException, std::exception );
 
         // FTPHandleProvider.
 
diff --git a/ucb/source/ucp/ftp/ftpintreq.cxx b/ucb/source/ucp/ftp/ftpintreq.cxx
index fff1d3d3ed39..e968e9c5be18 100644
--- a/ucb/source/ucp/ftp/ftpintreq.cxx
+++ b/ucb/source/ucp/ftp/ftpintreq.cxx
@@ -56,7 +56,7 @@ XInteractionApproveImpl::release( void )
 
 Any SAL_CALL
 XInteractionApproveImpl::queryInterface( const Type& rType )
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     Any aRet = cppu::queryInterface(
         rType,
@@ -76,7 +76,7 @@ XTYPEPROVIDER_IMPL_2( XInteractionApproveImpl,
 
 
 void SAL_CALL XInteractionApproveImpl::select()
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     m_bSelected = true;
 }
@@ -115,7 +115,7 @@ XInteractionDisapproveImpl::release( void )
 
 Any SAL_CALL
 XInteractionDisapproveImpl::queryInterface( const Type& rType )
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     Any aRet = cppu::queryInterface(
         rType,
@@ -135,7 +135,7 @@ XTYPEPROVIDER_IMPL_2( XInteractionDisapproveImpl,
 
 
 void SAL_CALL XInteractionDisapproveImpl::select()
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 
 {
     m_bSelected = true;
@@ -175,7 +175,7 @@ XInteractionRequestImpl::release( void )
 
 Any SAL_CALL
 XInteractionRequestImpl::queryInterface( const Type& rType )
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     Any aRet = cppu::queryInterface(
         rType,
@@ -195,7 +195,7 @@ XTYPEPROVIDER_IMPL_2( XInteractionRequestImpl,
 
 
 Any SAL_CALL XInteractionRequestImpl::getRequest(  )
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     Any aAny;
     UnsupportedNameClashException excep;
@@ -207,7 +207,7 @@ Any SAL_CALL XInteractionRequestImpl::getRequest(  )
 
 Sequence<Reference<XInteractionContinuation > > SAL_CALL
 XInteractionRequestImpl::getContinuations(  )
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     return m_aSeq;
 }
diff --git a/ucb/source/ucp/ftp/ftpintreq.hxx b/ucb/source/ucp/ftp/ftpintreq.hxx
index 00fbc5d7c9d9..1fedb441d25c 100644
--- a/ucb/source/ucp/ftp/ftpintreq.hxx
+++ b/ucb/source/ucp/ftp/ftpintreq.hxx
@@ -45,7 +45,7 @@ namespace ftp {
         virtual com::sun::star::uno::Any SAL_CALL
         queryInterface(
             const com::sun::star::uno::Type& rType )
-            throw( com::sun::star::uno::RuntimeException);
+            throw( com::sun::star::uno::RuntimeException, std::exception);
 
         virtual void SAL_CALL
         acquire(
@@ -63,7 +63,7 @@ namespace ftp {
         XTYPEPROVIDER_DECL()
 
         virtual void SAL_CALL select()
-            throw (com::sun::star::uno::RuntimeException);
+            throw (com::sun::star::uno::RuntimeException, std::exception);
 
         bool isSelected() const;
 
@@ -87,7 +87,7 @@ namespace ftp {
         virtual com::sun::star::uno::Any SAL_CALL
         queryInterface(
             const com::sun::star::uno::Type& rType )
-            throw( com::sun::star::uno::RuntimeException);
+            throw( com::sun::star::uno::RuntimeException, std::exception);
 
         virtual void SAL_CALL
         acquire(
@@ -105,7 +105,7 @@ namespace ftp {
         XTYPEPROVIDER_DECL()
 
         virtual void SAL_CALL select()
-            throw (com::sun::star::uno::RuntimeException);
+            throw (com::sun::star::uno::RuntimeException, std::exception);
 
     private:
 
@@ -126,7 +126,7 @@ namespace ftp {
         virtual com::sun::star::uno::Any SAL_CALL
         queryInterface(
             const com::sun::star::uno::Type& rType )
-            throw( com::sun::star::uno::RuntimeException);
+            throw( com::sun::star::uno::RuntimeException, std::exception);
 
         virtual void SAL_CALL
         acquire(
@@ -145,13 +145,13 @@ namespace ftp {
 
         com::sun::star::uno::Any SAL_CALL
         getRequest(  )
-            throw (com::sun::star::uno::RuntimeException);
+            throw (com::sun::star::uno::RuntimeException, std::exception);
 
         com::sun::star::uno::Sequence<
             com::sun::star::uno::Reference<
             com::sun::star::task::XInteractionContinuation > > SAL_CALL
         getContinuations(  )
-            throw (com::sun::star::uno::RuntimeException);
+            throw (com::sun::star::uno::RuntimeException, std::exception);
 
         bool approved() const;
 
diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.cxx b/ucb/source/ucp/ftp/ftpresultsetbase.cxx
index 8ace75c65de2..b63b1596496e 100644
--- a/ucb/source/ucp/ftp/ftpresultsetbase.cxx
+++ b/ucb/source/ucp/ftp/ftpresultsetbase.cxx
@@ -82,7 +82,7 @@ ResultSetBase::release(
 uno::Any SAL_CALL
 ResultSetBase::queryInterface(
     const uno::Type& rType )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     uno::Any aRet = cppu::queryInterface(
         rType,
@@ -103,7 +103,7 @@ ResultSetBase::queryInterface(
 void SAL_CALL
 ResultSetBase::addEventListener(
     const uno::Reference< lang::XEventListener >& Listener )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -118,7 +118,7 @@ ResultSetBase::addEventListener(
 void SAL_CALL
 ResultSetBase::removeEventListener(
     const uno::Reference< lang::XEventListener >& Listener )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -130,7 +130,7 @@ ResultSetBase::removeEventListener(
 
 void SAL_CALL
 ResultSetBase::dispose()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -159,7 +159,7 @@ sal_Bool SAL_CALL
 ResultSetBase::next(
     void )
     throw( sdbc::SQLException,
-           uno::RuntimeException )
+           uno::RuntimeException, std::exception )
 {
     sal_Bool test;
     if( ++m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
@@ -174,7 +174,7 @@ sal_Bool SAL_CALL
 ResultSetBase::isBeforeFirst(
     void )
     throw( sdbc::SQLException,
-           uno::RuntimeException )
+           uno::RuntimeException, std::exception )
 {
     return m_nRow == -1;
 }
@@ -184,7 +184,7 @@ sal_Bool SAL_CALL
 ResultSetBase::isAfterLast(
     void )
     throw( sdbc::SQLException,
-           uno::RuntimeException )
+           uno::RuntimeException, std::exception )
 {
     return m_nRow >= sal::static_int_cast<sal_Int32>(m_aItems.size());   // Cannot happen, if m_aFolder.isOpen()
 }
@@ -194,7 +194,7 @@ sal_Bool SAL_CALL
 ResultSetBase::isFirst(
     void )
     throw( sdbc::SQLException,
-           uno::RuntimeException )
+           uno::RuntimeException, std::exception )
 {
     return m_nRow == 0;
 }
@@ -204,7 +204,7 @@ sal_Bool SAL_CALL
 ResultSetBase::isLast(
     void  )
     throw( sdbc::SQLException,
-           uno::RuntimeException)
+           uno::RuntimeException, std::exception)
 {
     if( m_nRow ==  sal::static_int_cast<sal_Int32>(m_aItems.size()) - 1 )
         return true;
@@ -217,7 +217,7 @@ void SAL_CALL
 ResultSetBase::beforeFirst(
     void  )
     throw( sdbc::SQLException,
-           uno::RuntimeException)
+           uno::RuntimeException, std::exception)
 {
     m_nRow = -1;
 }
@@ -227,7 +227,7 @@ void SAL_CALL
 ResultSetBase::afterLast(
     void  )
     throw( sdbc::SQLException,
-           uno::RuntimeException )
+           uno::RuntimeException, std::exception )
 {
     m_nRow = m_aItems.size();
 }
@@ -237,7 +237,7 @@ sal_Bool SAL_CALL
 ResultSetBase::first(
     void  )
     throw( sdbc::SQLException,
-           uno::RuntimeException)
+           uno::RuntimeException, std::exception)
 {
     m_nRow = -1;
     return next();
@@ -248,7 +248,7 @@ sal_Bool SAL_CALL
 ResultSetBase::last(
     void  )
     throw( sdbc::SQLException,
-           uno::RuntimeException )
+           uno::RuntimeException, std::exception )
 {
     m_nRow = m_aItems.size() - 1;
     return true;
@@ -259,7 +259,7 @@ sal_Int32 SAL_CALL
 ResultSetBase::getRow(
     void )
     throw( sdbc::SQLException,
-           uno::RuntimeException)
+           uno::RuntimeException, std::exception)
 {
     // Test, whether behind last row
     if( -1 == m_nRow || m_nRow >= sal::static_int_cast<sal_Int32>(m_aItems.size()) )
@@ -270,7 +270,7 @@ ResultSetBase::getRow(
 
 
 sal_Bool SAL_CALL ResultSetBase::absolute( sal_Int32 row )
-    throw( sdbc::SQLException, uno::RuntimeException)
+    throw( sdbc::SQLException, uno::RuntimeException, std::exception)
 {
     if( row >= 0 )
         m_nRow = row - 1;
@@ -292,7 +292,7 @@ sal_Bool SAL_CALL
 ResultSetBase::relative(
     sal_Int32 row )
     throw( sdbc::SQLException,
-           uno::RuntimeException)
+           uno::RuntimeException, std::exception)
 {
     if( isAfterLast() || isBeforeFirst() )
         throw sdbc::SQLException();
@@ -313,7 +313,7 @@ sal_Bool SAL_CALL
 ResultSetBase::previous(
     void )
     throw( sdbc::SQLException,
-           uno::RuntimeException)
+           uno::RuntimeException, std::exception)
 {
     if( m_nRow > sal::static_int_cast<sal_Int32>(m_aItems.size()) )
         m_nRow = m_aItems.size();  // Correct Handling of afterLast
@@ -327,7 +327,7 @@ void SAL_CALL
 ResultSetBase::refreshRow(
     void )
     throw( sdbc::SQLException,
-           uno::RuntimeException)
+           uno::RuntimeException, std::exception)
 {
 }
 
@@ -336,7 +336,7 @@ sal_Bool SAL_CALL
 ResultSetBase::rowUpdated(
     void )
     throw( sdbc::SQLException,
-           uno::RuntimeException )
+           uno::RuntimeException, std::exception )
 {
     return false;
 }
@@ -345,7 +345,7 @@ sal_Bool SAL_CALL
 ResultSetBase::rowInserted(
     void  )
     throw( sdbc::SQLException,
-           uno::RuntimeException )
+           uno::RuntimeException, std::exception )
 {
     return false;
 }
@@ -354,7 +354,7 @@ sal_Bool SAL_CALL
 ResultSetBase::rowDeleted(
     void  )
     throw( sdbc::SQLException,
-           uno::RuntimeException )
+           uno::RuntimeException, std::exception )
 {
     return false;
 }
@@ -364,7 +364,7 @@ uno::Reference< uno::XInterface > SAL_CALL
 ResultSetBase::getStatement(
     void  )
     throw( sdbc::SQLException,
-           uno::RuntimeException )
+           uno::RuntimeException, std::exception )
 {
     uno::Reference< uno::XInterface > test( 0 );
     return test;
@@ -377,7 +377,7 @@ void SAL_CALL
 ResultSetBase::close(
     void )
     throw( sdbc::SQLException,
-           uno::RuntimeException)
+           uno::RuntimeException, std::exception)
 {
 }
 
@@ -385,7 +385,7 @@ ResultSetBase::close(
 OUString SAL_CALL
 ResultSetBase::queryContentIdentifierString(
     void )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
         return m_aPath[m_nRow];
@@ -399,7 +399,7 @@ ResultSetBase::queryContentIdentifier(
     void
 )
     throw(
-        uno::RuntimeException
+        uno::RuntimeException, std::exception
     )
 {
     if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
@@ -421,7 +421,7 @@ ResultSetBase::queryContentIdentifier(
 uno::Reference< ucb::XContent > SAL_CALL
 ResultSetBase::queryContent(
     void )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
         return m_xProvider->queryContent(queryContentIdentifier());
@@ -456,7 +456,7 @@ public:
     }
 
     uno::Any SAL_CALL queryInterface( const uno::Type& rType )
-        throw( uno::RuntimeException )
+        throw( uno::RuntimeException, std::exception )
     {
         uno::Any aRet = cppu::queryInterface(
             rType,
@@ -465,14 +465,14 @@ public:
     }
 
     uno::Sequence< beans::Property > SAL_CALL getProperties()
-        throw( uno::RuntimeException )
+        throw( uno::RuntimeException, std::exception )
     {
         return m_aSeq;
     }
 
     beans::Property SAL_CALL getPropertyByName( const OUString& aName )
         throw( beans::UnknownPropertyException,
-               uno::RuntimeException)
+               uno::RuntimeException, std::exception)
     {
         for( int i = 0; i < m_aSeq.getLength(); ++i )
             if( aName == m_aSeq[i].Name )
@@ -481,7 +481,7 @@ public:
     }
 
     sal_Bool SAL_CALL hasPropertyByName( const OUString& Name )
-        throw( uno::RuntimeException )
+        throw( uno::RuntimeException, std::exception )
     {
         for( int i = 0; i < m_aSeq.getLength(); ++i )
             if( Name == m_aSeq[i].Name )
@@ -499,7 +499,7 @@ private:
 // XPropertySet
 uno::Reference< beans::XPropertySetInfo > SAL_CALL
 ResultSetBase::getPropertySetInfo()
-    throw( uno::RuntimeException)
+    throw( uno::RuntimeException, std::exception)
 {
     uno::Sequence< beans::Property > seq(2);
     seq[0].Name = "RowCount";
@@ -525,7 +525,7 @@ void SAL_CALL ResultSetBase::setPropertyValue(
            beans::PropertyVetoException,
            lang::IllegalArgumentException,
            lang::WrappedTargetException,
-           uno::RuntimeException)
+           uno::RuntimeException, std::exception)
 {
     if( aPropertyName == "IsRowCountFinal" ||
         aPropertyName == "RowCount" )
@@ -539,7 +539,7 @@ uno::Any SAL_CALL ResultSetBase::getPropertyValue(
     const OUString& PropertyName )
     throw( beans::UnknownPropertyException,
            lang::WrappedTargetException,
-           uno::RuntimeException)
+           uno::RuntimeException, std::exception)
 {
     if( PropertyName == "IsRowCountFinal" )
     {
@@ -564,7 +564,7 @@ void SAL_CALL ResultSetBase::addPropertyChangeListener(
     const uno::Reference< beans::XPropertyChangeListener >& xListener )
     throw( beans::UnknownPropertyException,
            lang::WrappedTargetException,
-           uno::RuntimeException)
+           uno::RuntimeException, std::exception)
 {
     if( aPropertyName == "IsRowCountFinal" )
     {
@@ -593,7 +593,7 @@ void SAL_CALL ResultSetBase::removePropertyChangeListener(
     const uno::Reference< beans::XPropertyChangeListener >& aListener )
     throw( beans::UnknownPropertyException,
            lang::WrappedTargetException,
-           uno::RuntimeException)
+           uno::RuntimeException, std::exception)
 {
     if( aPropertyName == "IsRowCountFinal" &&
         m_pIsFinalListeners )
@@ -617,7 +617,7 @@ void SAL_CALL ResultSetBase::addVetoableChangeListener(
     const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
     throw( beans::UnknownPropertyException,
            lang::WrappedTargetException,
-           uno::RuntimeException)
+           uno::RuntimeException, std::exception)
 {
 }
 
@@ -627,7 +627,7 @@ void SAL_CALL ResultSetBase::removeVetoableChangeListener(
     const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
     throw( beans::UnknownPropertyException,
            lang::WrappedTargetException,
-           uno::RuntimeException)
+           uno::RuntimeException, std::exception)
 {
 }
 
@@ -638,7 +638,7 @@ uno::Reference< sdbc::XResultSetMetaData > SAL_CALL
 ResultSetBase::getMetaData(
     void )
     throw( sdbc::SQLException,
-           uno::RuntimeException )
+           uno::RuntimeException, std::exception )
 {
     ::ucbhelper::ResultSetMetaData* p =
           new ::ucbhelper::ResultSetMetaData( m_xContext, m_sProperty );
diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.hxx b/ucb/source/ucp/ftp/ftpresultsetbase.hxx
index 0c9803148110..13acb45b5204 100644
--- a/ucb/source/ucp/ftp/ftpresultsetbase.hxx
+++ b/ucb/source/ucp/ftp/ftpresultsetbase.hxx
@@ -66,7 +66,7 @@ namespace ftp {
         virtual com::sun::star::uno::Any SAL_CALL
         queryInterface(
             const com::sun::star::uno::Type& aType )
-            throw( com::sun::star::uno::RuntimeException);
+            throw( com::sun::star::uno::RuntimeException, std::exception);
 
         virtual void SAL_CALL
         acquire(
@@ -82,18 +82,18 @@ namespace ftp {
         virtual void SAL_CALL
         dispose(
             void )
-            throw( com::sun::star::uno::RuntimeException );
+            throw( com::sun::star::uno::RuntimeException, std::exception );
 
         virtual void SAL_CALL
         addEventListener(
             const com::sun::star::uno::Reference<
             com::sun::star::lang::XEventListener >& xListener )
-            throw( com::sun::star::uno::RuntimeException );
+            throw( com::sun::star::uno::RuntimeException, std::exception );
 
         virtual void SAL_CALL
         removeEventListener( const com::sun::star::uno::Reference<
                              com::sun::star::lang::XEventListener >& aListener )
-            throw( com::sun::star::uno::RuntimeException );
+            throw( com::sun::star::uno::RuntimeException, std::exception );
 
 
         // XRow
@@ -101,7 +101,7 @@ namespace ftp {
         wasNull(
             void )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException )
+                   com::sun::star::uno::RuntimeException, std::exception )
         {
             if( 0<= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 m_nWasNull = m_aItems[m_nRow]->wasNull();
@@ -114,7 +114,7 @@ namespace ftp {
         getString(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException)
+                   com::sun::star::uno::RuntimeException, std::exception)
         {
             OUString ret;
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
@@ -127,7 +127,7 @@ namespace ftp {
         getBoolean(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException)
+                   com::sun::star::uno::RuntimeException, std::exception)
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getBoolean( columnIndex );
@@ -139,7 +139,7 @@ namespace ftp {
         getByte(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException)
+                   com::sun::star::uno::RuntimeException, std::exception)
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getByte( columnIndex );
@@ -152,7 +152,7 @@ namespace ftp {
             sal_Int32 columnIndex )
             throw(
                 com::sun::star::sdbc::SQLException,
-                com::sun::star::uno::RuntimeException)
+                com::sun::star::uno::RuntimeException, std::exception)
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getShort( columnIndex );
@@ -164,7 +164,7 @@ namespace ftp {
         getInt(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException )
+                   com::sun::star::uno::RuntimeException, std::exception )
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getInt( columnIndex );
@@ -176,7 +176,7 @@ namespace ftp {
         getLong(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException)
+                   com::sun::star::uno::RuntimeException, std::exception)
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getLong( columnIndex );
@@ -188,7 +188,7 @@ namespace ftp {
         getFloat(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException )
+                   com::sun::star::uno::RuntimeException, std::exception )
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getFloat( columnIndex );
@@ -200,7 +200,7 @@ namespace ftp {
         getDouble(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException )
+                   com::sun::star::uno::RuntimeException, std::exception )
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getDouble( columnIndex );
@@ -212,7 +212,7 @@ namespace ftp {
         getBytes(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException )
+                   com::sun::star::uno::RuntimeException, std::exception )
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getBytes( columnIndex );
@@ -224,7 +224,7 @@ namespace ftp {
         getDate(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException)
+                   com::sun::star::uno::RuntimeException, std::exception)
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getDate( columnIndex );
@@ -236,7 +236,7 @@ namespace ftp {
         getTime(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException)
+                   com::sun::star::uno::RuntimeException, std::exception)
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getTime( columnIndex );
@@ -248,7 +248,7 @@ namespace ftp {
         getTimestamp(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException)
+                   com::sun::star::uno::RuntimeException, std::exception)
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getTimestamp( columnIndex );
@@ -262,7 +262,7 @@ namespace ftp {
         getBinaryStream(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException)
+                   com::sun::star::uno::RuntimeException, std::exception)
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getBinaryStream( columnIndex );
@@ -276,7 +276,7 @@ namespace ftp {
         getCharacterStream(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException)
+                   com::sun::star::uno::RuntimeException, std::exception)
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getCharacterStream( columnIndex );
@@ -291,7 +291,7 @@ namespace ftp {
             const com::sun::star::uno::Reference<
             com::sun::star::container::XNameAccess >& typeMap )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException)
+                   com::sun::star::uno::RuntimeException, std::exception)
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getObject( columnIndex,typeMap );
@@ -304,7 +304,7 @@ namespace ftp {
         getRef(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException)
+                   com::sun::star::uno::RuntimeException, std::exception)
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getRef( columnIndex );
@@ -317,7 +317,7 @@ namespace ftp {
         getBlob(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException)
+                   com::sun::star::uno::RuntimeException, std::exception)
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getBlob( columnIndex );
@@ -330,7 +330,7 @@ namespace ftp {
         getClob(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException)
+                   com::sun::star::uno::RuntimeException, std::exception)
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getClob( columnIndex );
@@ -344,7 +344,7 @@ namespace ftp {
         getArray(
             sal_Int32 columnIndex )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException)
+                   com::sun::star::uno::RuntimeException, std::exception)
         {
             if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
                 return m_aItems[m_nRow]->getArray( columnIndex );
@@ -360,103 +360,103 @@ namespace ftp {
         next(
             void )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException);
+                   com::sun::star::uno::RuntimeException, std::exception);
 
         virtual sal_Bool SAL_CALL
         isBeforeFirst(
             void )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException);
+                   com::sun::star::uno::RuntimeException, std::exception);
 
         virtual sal_Bool SAL_CALL
         isAfterLast(
             void )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException);
+                   com::sun::star::uno::RuntimeException, std::exception);
 
         virtual sal_Bool SAL_CALL
         isFirst(
             void  )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException);
+                   com::sun::star::uno::RuntimeException, std::exception);
 
         virtual sal_Bool SAL_CALL
         isLast(
             void  )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException);
+                   com::sun::star::uno::RuntimeException, std::exception);
 
         virtual void SAL_CALL
         beforeFirst(
             void  )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException);
+                   com::sun::star::uno::RuntimeException, std::exception);
 
         virtual void SAL_CALL
         afterLast(
             void  )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException);
+                   com::sun::star::uno::RuntimeException, std::exception);
 
         virtual sal_Bool SAL_CALL
         first(
             void  )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException);
+                   com::sun::star::uno::RuntimeException, std::exception);
 
         virtual sal_Bool SAL_CALL
         last(
             void  )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException);
+                   com::sun::star::uno::RuntimeException, std::exception);
 
         virtual sal_Int32 SAL_CALL
         getRow(
             void  )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException);
+                   com::sun::star::uno::RuntimeException, std::exception);
 
         virtual sal_Bool SAL_CALL
         absolute(
             sal_Int32 row )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException);
+                   com::sun::star::uno::RuntimeException, std::exception);
 
         virtual sal_Bool SAL_CALL
         relative(
             sal_Int32 rows )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException);
+                   com::sun::star::uno::RuntimeException, std::exception);
 
         virtual sal_Bool SAL_CALL
         previous(
             void  )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException);
+                   com::sun::star::uno::RuntimeException, std::exception);
 
         virtual void SAL_CALL
         refreshRow(
             void  )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException);
+                   com::sun::star::uno::RuntimeException, std::exception);
 
         virtual sal_Bool SAL_CALL
         rowUpdated(
             void )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException);
+                   com::sun::star::uno::RuntimeException, std::exception);
 
         virtual sal_Bool SAL_CALL
         rowInserted(
             void  )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException);
+                   com::sun::star::uno::RuntimeException, std::exception);
 
         virtual sal_Bool SAL_CALL
         rowDeleted(
             void  )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException);
+                   com::sun::star::uno::RuntimeException, std::exception);
 
 
         virtual  com::sun::star::uno::Reference<
@@ -464,7 +464,7 @@ namespace ftp {
         getStatement(
             void  )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException);
+                   com::sun::star::uno::RuntimeException, std::exception);
 
         // XCloseable
 
@@ -472,26 +472,26 @@ namespace ftp {
         close(
             void )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException);
+                   com::sun::star::uno::RuntimeException, std::exception);
 
         // XContentAccess
 
         virtual OUString SAL_CALL
         queryContentIdentifierString(
             void )
-            throw( com::sun::star::uno::RuntimeException );
+            throw( com::sun::star::uno::RuntimeException, std::exception );
 
         virtual com::sun::star::uno::Reference<
         com::sun::star::ucb::XContentIdentifier > SAL_CALL
         queryContentIdentifier(
             void )
-            throw( com::sun::star::uno::RuntimeException );
+            throw( com::sun::star::uno::RuntimeException, std::exception );
 
         virtual com::sun::star::uno::Reference<
         com::sun::star::ucb::XContent > SAL_CALL
         queryContent(
             void )
-            throw( com::sun::star::uno::RuntimeException );
+            throw( com::sun::star::uno::RuntimeException, std::exception );
 
         // XResultSetMetaDataSupplier
         virtual com::sun::star::uno::Reference<
@@ -499,14 +499,14 @@ namespace ftp {
         getMetaData(
             void )
             throw( com::sun::star::sdbc::SQLException,
-                   com::sun::star::uno::RuntimeException);
+                   com::sun::star::uno::RuntimeException, std::exception);
 
 
         // XPropertySet
         virtual com::sun::star::uno::Reference<
         com::sun::star::beans::XPropertySetInfo > SAL_CALL
         getPropertySetInfo()
-            throw( com::sun::star::uno::RuntimeException);
+            throw( com::sun::star::uno::RuntimeException, std::exception);
 
         virtual void SAL_CALL setPropertyValue(
             const OUString& aPropertyName,
@@ -515,14 +515,14 @@ namespace ftp {
                    com::sun::star::beans::PropertyVetoException,
                    com::sun::star::lang::IllegalArgumentException,
                    com::sun::star::lang::WrappedTargetException,
-                   com::sun::star::uno::RuntimeException);
+                   com::sun::star::uno::RuntimeException, std::exception);
 
         virtual com::sun::star::uno::Any SAL_CALL
         getPropertyValue(
             const OUString& PropertyName )
             throw( com::sun::star::beans::UnknownPropertyException,
                    com::sun::star::lang::WrappedTargetException,
-                   com::sun::star::uno::RuntimeException);
+                   com::sun::star::uno::RuntimeException, std::exception);
 
         virtual void SAL_CALL
         addPropertyChangeListener(
@@ -531,7 +531,7 @@ namespace ftp {
             com::sun::star::beans::XPropertyChangeListener >& xListener )
             throw( com::sun::star::beans::UnknownPropertyException,
                    com::sun::star::lang::WrappedTargetException,
-                   com::sun::star::uno::RuntimeException);
+                   com::sun::star::uno::RuntimeException, std::exception);
 
         virtual void SAL_CALL
         removePropertyChangeListener(
@@ -540,7 +540,7 @@ namespace ftp {
             com::sun::star::beans::XPropertyChangeListener >& aListener )
             throw( com::sun::star::beans::UnknownPropertyException,
                    com::sun::star::lang::WrappedTargetException,
-                   com::sun::star::uno::RuntimeException);
+                   com::sun::star::uno::RuntimeException, std::exception);
 
         virtual void SAL_CALL
         addVetoableChangeListener(
@@ -549,7 +549,7 @@ namespace ftp {
             com::sun::star::beans::XVetoableChangeListener >& aListener )
             throw( com::sun::star::beans::UnknownPropertyException,
                    com::sun::star::lang::WrappedTargetException,
-                   com::sun::star::uno::RuntimeException);
+                   com::sun::star::uno::RuntimeException, std::exception);
 
         virtual void SAL_CALL removeVetoableChangeListener(
             const OUString& PropertyName,
@@ -557,7 +557,7 @@ namespace ftp {
             com::sun::star::beans::XVetoableChangeListener >& aListener )
             throw( com::sun::star::beans::UnknownPropertyException,
                    com::sun::star::lang::WrappedTargetException,
-                   com::sun::star::uno::RuntimeException);
+                   com::sun::star::uno::RuntimeException, std::exception);
 
     protected: