cppuhelper: retrofit std::exception into overriding exception specs

Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3

12 files changed, 249 insertions, 249 deletions

diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index 2bfcf9bcfc87..37cb74e5c373 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -419,15 +419,15 @@ public:
     // XPropertySetInfo
     virtual Sequence< com::sun::star::beans::Property > SAL_CALL
     getProperties()
-        throw( RuntimeException );
+        throw( RuntimeException, std::exception );
 
     virtual com::sun::star::beans::Property SAL_CALL
     getPropertyByName( const OUString& aName )
-        throw( com::sun::star::beans::UnknownPropertyException, RuntimeException );
+        throw( com::sun::star::beans::UnknownPropertyException, RuntimeException, std::exception );
 
     virtual sal_Bool SAL_CALL
     hasPropertyByName( const OUString& Name )
-        throw( RuntimeException );
+        throw( RuntimeException, std::exception );
 };
 
 OUString    CCRS_PropertySetInfo::m_aPropertyNameForCount( "RowCount" );
@@ -535,7 +535,7 @@ XTYPEPROVIDER_IMPL_2( CCRS_PropertySetInfo
 
 //virtual
 Sequence< Property > SAL_CALL CCRS_PropertySetInfo
-    ::getProperties() throw( RuntimeException )
+    ::getProperties() throw( RuntimeException, std::exception )
 {
     return *m_pProperties;
 }
@@ -543,7 +543,7 @@ Sequence< Property > SAL_CALL CCRS_PropertySetInfo
 //virtual
 Property SAL_CALL CCRS_PropertySetInfo
     ::getPropertyByName( const OUString& aName )
-        throw( UnknownPropertyException, RuntimeException )
+        throw( UnknownPropertyException, RuntimeException, std::exception )
 {
     if ( aName.isEmpty() )
         throw UnknownPropertyException();
@@ -558,7 +558,7 @@ Property SAL_CALL CCRS_PropertySetInfo
 //virtual
 sal_Bool SAL_CALL CCRS_PropertySetInfo
     ::hasPropertyByName( const OUString& Name )
-        throw( RuntimeException )
+        throw( RuntimeException, std::exception )
 {
     return ( impl_getPos( Name ) != -1 );
 }
@@ -918,7 +918,7 @@ XINTERFACE_COMMON_IMPL( CachedContentResultSet )
 
 Any SAL_CALL CachedContentResultSet
     ::queryInterface( const Type&  rType )
-    throw ( RuntimeException )
+    throw ( RuntimeException, std::exception )
 {
     //list all interfaces inclusive baseclasses of interfaces
 
@@ -974,7 +974,7 @@ void SAL_CALL CachedContentResultSet
            PropertyVetoException,
            IllegalArgumentException,
            WrappedTargetException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1085,7 +1085,7 @@ Any SAL_CALL CachedContentResultSet
     ::getPropertyValue( const OUString& rPropertyName )
     throw( UnknownPropertyException,
            WrappedTargetException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1281,7 +1281,7 @@ return m_aCache##XXX.get##XXX( nRow );
 // virtual
 OUString SAL_CALL CachedContentResultSet
     ::queryContentIdentifierString()
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     XCONTENTACCESS_queryXXX( queryContentIdentifierString, ContentIdentifierString, OUString )
 }
@@ -1290,7 +1290,7 @@ OUString SAL_CALL CachedContentResultSet
 // virtual
 Reference< XContentIdentifier > SAL_CALL CachedContentResultSet
     ::queryContentIdentifier()
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     XCONTENTACCESS_queryXXX( queryContentIdentifier, ContentIdentifier, Reference< XContentIdentifier > )
 }
@@ -1299,7 +1299,7 @@ Reference< XContentIdentifier > SAL_CALL CachedContentResultSet
 // virtual
 Reference< XContent > SAL_CALL CachedContentResultSet
     ::queryContent()
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     XCONTENTACCESS_queryXXX( queryContent, Content, Reference< XContent > )
 }
@@ -1312,7 +1312,7 @@ Reference< XContent > SAL_CALL CachedContentResultSet
 sal_Bool SAL_CALL CachedContentResultSet
     ::next()
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1353,7 +1353,7 @@ sal_Bool SAL_CALL CachedContentResultSet
 sal_Bool SAL_CALL CachedContentResultSet
     ::previous()
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1394,7 +1394,7 @@ sal_Bool SAL_CALL CachedContentResultSet
 sal_Bool SAL_CALL CachedContentResultSet
     ::absolute( sal_Int32 row )
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1513,7 +1513,7 @@ sal_Bool SAL_CALL CachedContentResultSet
 sal_Bool SAL_CALL CachedContentResultSet
     ::relative( sal_Int32 rows )
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1568,7 +1568,7 @@ sal_Bool SAL_CALL CachedContentResultSet
 sal_Bool SAL_CALL CachedContentResultSet
     ::first()
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1603,7 +1603,7 @@ sal_Bool SAL_CALL CachedContentResultSet
 sal_Bool SAL_CALL CachedContentResultSet
     ::last()
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1652,7 +1652,7 @@ sal_Bool SAL_CALL CachedContentResultSet
 void SAL_CALL CachedContentResultSet
     ::beforeFirst()
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1668,7 +1668,7 @@ void SAL_CALL CachedContentResultSet
 void SAL_CALL CachedContentResultSet
     ::afterLast()
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1684,7 +1684,7 @@ void SAL_CALL CachedContentResultSet
 sal_Bool SAL_CALL CachedContentResultSet
     ::isAfterLast()
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1717,7 +1717,7 @@ sal_Bool SAL_CALL CachedContentResultSet
 sal_Bool SAL_CALL CachedContentResultSet
     ::isBeforeFirst()
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1753,7 +1753,7 @@ sal_Bool SAL_CALL CachedContentResultSet
 sal_Bool SAL_CALL CachedContentResultSet
     ::isFirst()
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1788,7 +1788,7 @@ sal_Bool SAL_CALL CachedContentResultSet
 sal_Bool SAL_CALL CachedContentResultSet
     ::isLast()
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1821,7 +1821,7 @@ sal_Bool SAL_CALL CachedContentResultSet
 sal_Int32 SAL_CALL CachedContentResultSet
     ::getRow()
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1835,7 +1835,7 @@ sal_Int32 SAL_CALL CachedContentResultSet
 void SAL_CALL CachedContentResultSet
     ::refreshRow()
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1847,7 +1847,7 @@ void SAL_CALL CachedContentResultSet
 sal_Bool SAL_CALL CachedContentResultSet
     ::rowUpdated()
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1858,7 +1858,7 @@ sal_Bool SAL_CALL CachedContentResultSet
 sal_Bool SAL_CALL CachedContentResultSet
     ::rowInserted()
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1870,7 +1870,7 @@ sal_Bool SAL_CALL CachedContentResultSet
 sal_Bool SAL_CALL CachedContentResultSet
     ::rowDeleted()
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1882,7 +1882,7 @@ sal_Bool SAL_CALL CachedContentResultSet
 Reference< XInterface > SAL_CALL CachedContentResultSet
     ::getStatement()
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
     //@todo ?return anything
@@ -1897,7 +1897,7 @@ Reference< XInterface > SAL_CALL CachedContentResultSet
 sal_Bool SAL_CALL CachedContentResultSet
     ::wasNull()
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
     impl_init_xRowOrigin();
@@ -1918,7 +1918,7 @@ sal_Bool SAL_CALL CachedContentResultSet
 OUString SAL_CALL CachedContentResultSet
     ::getString( sal_Int32 columnIndex )
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     return rowOriginGet<OUString>(&css::sdbc::XRow::getString, columnIndex);
 }
@@ -1927,7 +1927,7 @@ OUString SAL_CALL CachedContentResultSet
 sal_Bool SAL_CALL CachedContentResultSet
     ::getBoolean( sal_Int32 columnIndex )
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     return rowOriginGet<sal_Bool>(&css::sdbc::XRow::getBoolean, columnIndex);
 }
@@ -1936,7 +1936,7 @@ sal_Bool SAL_CALL CachedContentResultSet
 sal_Int8 SAL_CALL CachedContentResultSet
     ::getByte( sal_Int32 columnIndex )
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     return rowOriginGet<sal_Int8>(&css::sdbc::XRow::getByte, columnIndex);
 }
@@ -1945,7 +1945,7 @@ sal_Int8 SAL_CALL CachedContentResultSet
 sal_Int16 SAL_CALL CachedContentResultSet
     ::getShort( sal_Int32 columnIndex )
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     return rowOriginGet<sal_Int16>(&css::sdbc::XRow::getShort, columnIndex);
 }
@@ -1954,7 +1954,7 @@ sal_Int16 SAL_CALL CachedContentResultSet
 sal_Int32 SAL_CALL CachedContentResultSet
     ::getInt( sal_Int32 columnIndex )
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     return rowOriginGet<sal_Int32>(&css::sdbc::XRow::getInt, columnIndex);
 }
@@ -1963,7 +1963,7 @@ sal_Int32 SAL_CALL CachedContentResultSet
 sal_Int64 SAL_CALL CachedContentResultSet
     ::getLong( sal_Int32 columnIndex )
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     return rowOriginGet<sal_Int64>(&css::sdbc::XRow::getLong, columnIndex);
 }
@@ -1972,7 +1972,7 @@ sal_Int64 SAL_CALL CachedContentResultSet
 float SAL_CALL CachedContentResultSet
     ::getFloat( sal_Int32 columnIndex )
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     return rowOriginGet<float>(&css::sdbc::XRow::getFloat, columnIndex);
 }
@@ -1981,7 +1981,7 @@ float SAL_CALL CachedContentResultSet
 double SAL_CALL CachedContentResultSet
     ::getDouble( sal_Int32 columnIndex )
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     return rowOriginGet<double>(&css::sdbc::XRow::getDouble, columnIndex);
 }
@@ -1990,7 +1990,7 @@ double SAL_CALL CachedContentResultSet
 Sequence< sal_Int8 > SAL_CALL CachedContentResultSet
     ::getBytes( sal_Int32 columnIndex )
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     return rowOriginGet< css::uno::Sequence<sal_Int8> >(
         &css::sdbc::XRow::getBytes, columnIndex);
@@ -2000,7 +2000,7 @@ Sequence< sal_Int8 > SAL_CALL CachedContentResultSet
 Date SAL_CALL CachedContentResultSet
     ::getDate( sal_Int32 columnIndex )
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     return rowOriginGet<css::util::Date>(
         &css::sdbc::XRow::getDate, columnIndex);
@@ -2010,7 +2010,7 @@ Date SAL_CALL CachedContentResultSet
 Time SAL_CALL CachedContentResultSet
     ::getTime( sal_Int32 columnIndex )
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     return rowOriginGet<css::util::Time>(
         &css::sdbc::XRow::getTime, columnIndex);
@@ -2020,7 +2020,7 @@ Time SAL_CALL CachedContentResultSet
 DateTime SAL_CALL CachedContentResultSet
     ::getTimestamp( sal_Int32 columnIndex )
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     return rowOriginGet<css::util::DateTime>(
         &css::sdbc::XRow::getTimestamp, columnIndex);
@@ -2031,7 +2031,7 @@ Reference< com::sun::star::io::XInputStream >
     SAL_CALL CachedContentResultSet
     ::getBinaryStream( sal_Int32 columnIndex )
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     return rowOriginGet< css::uno::Reference<css::io::XInputStream> >(
         &css::sdbc::XRow::getBinaryStream, columnIndex);
@@ -2042,7 +2042,7 @@ Reference< com::sun::star::io::XInputStream >
     SAL_CALL CachedContentResultSet
     ::getCharacterStream( sal_Int32 columnIndex )
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     return rowOriginGet< css::uno::Reference<css::io::XInputStream> >(
         &css::sdbc::XRow::getCharacterStream, columnIndex);
@@ -2054,7 +2054,7 @@ Any SAL_CALL CachedContentResultSet
            const Reference<
             com::sun::star::container::XNameAccess >& typeMap )
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     //if you change this function please pay attention to
     //function template rowOriginGet, where this is similar implemented
@@ -2098,7 +2098,7 @@ Any SAL_CALL CachedContentResultSet
 Reference< XRef > SAL_CALL CachedContentResultSet
     ::getRef( sal_Int32 columnIndex )
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     return rowOriginGet< css::uno::Reference<css::sdbc::XRef> >(
         &css::sdbc::XRow::getRef, columnIndex);
@@ -2108,7 +2108,7 @@ Reference< XRef > SAL_CALL CachedContentResultSet
 Reference< XBlob > SAL_CALL CachedContentResultSet
     ::getBlob( sal_Int32 columnIndex )
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     return rowOriginGet< css::uno::Reference<css::sdbc::XBlob> >(
         &css::sdbc::XRow::getBlob, columnIndex);
@@ -2118,7 +2118,7 @@ Reference< XBlob > SAL_CALL CachedContentResultSet
 Reference< XClob > SAL_CALL CachedContentResultSet
     ::getClob( sal_Int32 columnIndex )
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     return rowOriginGet< css::uno::Reference<css::sdbc::XClob> >(
         &css::sdbc::XRow::getClob, columnIndex);
@@ -2128,7 +2128,7 @@ Reference< XClob > SAL_CALL CachedContentResultSet
 Reference< XArray > SAL_CALL CachedContentResultSet
     ::getArray( sal_Int32 columnIndex )
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     return rowOriginGet< css::uno::Reference<css::sdbc::XArray> >(
         &css::sdbc::XRow::getArray, columnIndex);
@@ -2211,7 +2211,7 @@ Reference< XResultSet > SAL_CALL CachedContentResultSetFactory
     ::createCachedContentResultSet(
             const Reference< XResultSet > & xSource,
             const Reference< XContentIdentifierMapping > & xMapping )
-            throw( com::sun::star::uno::RuntimeException )
+            throw( com::sun::star::uno::RuntimeException, std::exception )
 {
     Reference< XResultSet > xRet;
     xRet = new CachedContentResultSet( m_xContext, xSource, xMapping );
diff --git a/ucb/source/cacher/cachedcontentresultset.hxx b/ucb/source/cacher/cachedcontentresultset.hxx
index 73fbc8dc4b7d..a18a688450e7 100644
--- a/ucb/source/cacher/cachedcontentresultset.hxx
+++ b/ucb/source/cacher/cachedcontentresultset.hxx
@@ -222,13 +222,13 @@ public:
                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 );
 
 
     // own inherited
@@ -251,17 +251,17 @@ public:
 
     virtual OUString SAL_CALL
     queryContentIdentifierString()
-        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()
-        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()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
 
     // XResultSet inherited
@@ -269,76 +269,76 @@ public:
     virtual sal_Bool SAL_CALL
     next()
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
     virtual sal_Bool SAL_CALL
     isBeforeFirst()
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
     virtual sal_Bool SAL_CALL
     isAfterLast()
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
     virtual sal_Bool SAL_CALL
     isFirst()
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
     virtual sal_Bool SAL_CALL
     isLast()
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
     virtual void SAL_CALL
     beforeFirst()
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
     virtual void SAL_CALL
     afterLast()
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
     virtual sal_Bool SAL_CALL
     first()
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
     virtual sal_Bool SAL_CALL
     last()
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
     virtual sal_Int32 SAL_CALL
     getRow()
         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()
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
     virtual void SAL_CALL
     refreshRow()
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
     virtual sal_Bool SAL_CALL
     rowUpdated()
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
     virtual sal_Bool SAL_CALL
     rowInserted()
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
     virtual sal_Bool SAL_CALL
     rowDeleted()
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
     virtual com::sun::star::uno::Reference<
                 com::sun::star::uno::XInterface > SAL_CALL
     getStatement()
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
 
     // XRow inherited
@@ -346,110 +346,110 @@ public:
     virtual sal_Bool SAL_CALL
     wasNull()
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
     virtual OUString SAL_CALL
     getString( sal_Int32 columnIndex )
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
     virtual sal_Bool SAL_CALL
     getBoolean( sal_Int32 columnIndex )
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
     virtual sal_Int8 SAL_CALL
     getByte( sal_Int32 columnIndex )
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
     virtual sal_Int16 SAL_CALL
     getShort( sal_Int32 columnIndex )
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
     virtual sal_Int32 SAL_CALL
     getInt( sal_Int32 columnIndex )
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
     virtual sal_Int64 SAL_CALL
     getLong( sal_Int32 columnIndex )
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
     virtual float SAL_CALL
     getFloat( sal_Int32 columnIndex )
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
     virtual double SAL_CALL
     getDouble( sal_Int32 columnIndex )
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
     virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
     getBytes( sal_Int32 columnIndex )
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
     virtual com::sun::star::util::Date SAL_CALL
     getDate( sal_Int32 columnIndex )
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
     virtual com::sun::star::util::Time SAL_CALL
     getTime( sal_Int32 columnIndex )
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
     virtual com::sun::star::util::DateTime SAL_CALL
     getTimestamp( sal_Int32 columnIndex )
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
     virtual com::sun::star::uno::Reference<
                 com::sun::star::io::XInputStream > SAL_CALL
     getBinaryStream( sal_Int32 columnIndex )
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
     virtual com::sun::star::uno::Reference<
                 com::sun::star::io::XInputStream > SAL_CALL
     getCharacterStream( sal_Int32 columnIndex )
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
     virtual com::sun::star::uno::Any SAL_CALL
     getObject( sal_Int32 columnIndex,
                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 );
 
     virtual com::sun::star::uno::Reference<
                 com::sun::star::sdbc::XRef > SAL_CALL
     getRef( sal_Int32 columnIndex )
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
     virtual com::sun::star::uno::Reference<
                 com::sun::star::sdbc::XBlob > SAL_CALL
     getBlob( sal_Int32 columnIndex )
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
     virtual com::sun::star::uno::Reference<
                 com::sun::star::sdbc::XClob > SAL_CALL
     getClob( sal_Int32 columnIndex )
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
     virtual com::sun::star::uno::Reference<
                 com::sun::star::sdbc::XArray > SAL_CALL
     getArray( sal_Int32 columnIndex )
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
 
     // Type Converter support
@@ -509,7 +509,7 @@ public:
                 com::sun::star::sdbc::XResultSet > & xSource,
             const com::sun::star::uno::Reference<
                 com::sun::star::ucb::XContentIdentifierMapping > & xMapping )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 };
 
 #endif
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx
index 719973099d9e..dd3d896a9f83 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.cxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx
@@ -58,7 +58,7 @@ XINTERFACE_COMMON_IMPL( CachedContentResultSetStub )
 
 Any SAL_CALL CachedContentResultSetStub
     ::queryInterface( const Type&  rType )
-    throw ( RuntimeException )
+    throw ( RuntimeException, std::exception )
 {
     //list all interfaces inclusive baseclasses of interfaces
 
@@ -130,7 +130,7 @@ XTYPEPROVIDER_COMMON_IMPL( CachedContentResultSetStub )
 //list all interfaces exclusive baseclasses
 Sequence< Type > SAL_CALL CachedContentResultSetStub
     ::getTypes()
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     static Sequence< Type >* pTypes = NULL;
     if( !pTypes )
@@ -285,7 +285,7 @@ return aRet;
 FetchResult SAL_CALL CachedContentResultSetStub
     ::fetch( sal_Int32 nRowStartPosition
     , sal_Int32 nRowCount, sal_Bool bDirection )
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     impl_init_xRowOrigin();
     FETCH_XXX( impl_getCurrentRowContent, m_xRowOrigin );
@@ -454,7 +454,7 @@ void SAL_CALL CachedContentResultSetStub
 FetchResult SAL_CALL CachedContentResultSetStub
     ::fetchContentIdentifierStrings( sal_Int32 nRowStartPosition
         , sal_Int32 nRowCount, sal_Bool bDirection )
-        throw( com::sun::star::uno::RuntimeException )
+        throw( com::sun::star::uno::RuntimeException, std::exception )
 {
     impl_init_xContentAccessOrigin();
     FETCH_XXX( impl_getCurrentContentIdentifierString, m_xContentAccessOrigin );
@@ -464,7 +464,7 @@ FetchResult SAL_CALL CachedContentResultSetStub
 FetchResult SAL_CALL CachedContentResultSetStub
     ::fetchContentIdentifiers( sal_Int32 nRowStartPosition
         , sal_Int32 nRowCount, sal_Bool bDirection )
-        throw( com::sun::star::uno::RuntimeException )
+        throw( com::sun::star::uno::RuntimeException, std::exception )
 {
     impl_init_xContentAccessOrigin();
     FETCH_XXX( impl_getCurrentContentIdentifier, m_xContentAccessOrigin );
@@ -474,7 +474,7 @@ FetchResult SAL_CALL CachedContentResultSetStub
 FetchResult SAL_CALL CachedContentResultSetStub
     ::fetchContents( sal_Int32 nRowStartPosition
         , sal_Int32 nRowCount, sal_Bool bDirection )
-        throw( com::sun::star::uno::RuntimeException )
+        throw( com::sun::star::uno::RuntimeException, std::exception )
 {
     impl_init_xContentAccessOrigin();
     FETCH_XXX( impl_getCurrentContent, m_xContentAccessOrigin );
@@ -536,7 +536,7 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( CachedContentResultSetStubFactory );
 Reference< XResultSet > SAL_CALL CachedContentResultSetStubFactory
     ::createCachedContentResultSetStub(
             const Reference< XResultSet > & xSource )
-            throw( RuntimeException )
+            throw( RuntimeException, std::exception )
 {
     if( xSource.is() )
     {
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.hxx b/ucb/source/cacher/cachedcontentresultsetstub.hxx
index b42fb8caa1c3..70fe3e3977b8 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.hxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.hxx
@@ -126,7 +126,7 @@ public:
     virtual com::sun::star::ucb::FetchResult SAL_CALL
     fetch( sal_Int32 nRowStartPosition
         , sal_Int32 nRowCount, sal_Bool bDirection )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
 
     // XFetchProviderForContentAccess
@@ -134,17 +134,17 @@ public:
     virtual com::sun::star::ucb::FetchResult SAL_CALL
          fetchContentIdentifierStrings( sal_Int32 nRowStartPosition
         , sal_Int32 nRowCount, sal_Bool bDirection )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
     virtual com::sun::star::ucb::FetchResult SAL_CALL
          fetchContentIdentifiers( sal_Int32 nRowStartPosition
         , sal_Int32 nRowCount, sal_Bool bDirection )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
     virtual com::sun::star::ucb::FetchResult SAL_CALL
          fetchContents( sal_Int32 nRowStartPosition
         , sal_Int32 nRowCount, sal_Bool bDirection )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 };
 
 
@@ -187,7 +187,7 @@ public:
     createCachedContentResultSetStub(
                 const com::sun::star::uno::Reference<
                     com::sun::star::sdbc::XResultSet > & xSource )
-            throw( com::sun::star::uno::RuntimeException );
+            throw( com::sun::star::uno::RuntimeException, std::exception );
 };
 
 #endif
diff --git a/ucb/source/cacher/cacheddynamicresultset.cxx b/ucb/source/cacher/cacheddynamicresultset.cxx
index ab9467825fd7..917a6f692c18 100644
--- a/ucb/source/cacher/cacheddynamicresultset.cxx
+++ b/ucb/source/cacher/cacheddynamicresultset.cxx
@@ -80,7 +80,7 @@ XINTERFACE_COMMON_IMPL( CachedDynamicResultSet )
 
 Any SAL_CALL CachedDynamicResultSet
     ::queryInterface( const Type&  rType )
-    throw ( RuntimeException )
+    throw ( RuntimeException, std::exception )
 {
     //list all interfaces inclusive baseclasses of interfaces
 
@@ -183,7 +183,7 @@ Reference< XDynamicResultSet > SAL_CALL CachedDynamicResultSetFactory
     ::createCachedDynamicResultSet(
           const Reference< XDynamicResultSet > & SourceStub
         , const Reference< XContentIdentifierMapping > & ContentIdentifierMapping )
-        throw( RuntimeException )
+        throw( RuntimeException, std::exception )
 {
     Reference< XDynamicResultSet > xRet;
     xRet = new CachedDynamicResultSet( SourceStub, ContentIdentifierMapping, m_xContext );
diff --git a/ucb/source/cacher/cacheddynamicresultset.hxx b/ucb/source/cacher/cacheddynamicresultset.hxx
index f6eb0a1ff34c..93c4fa0804e1 100644
--- a/ucb/source/cacher/cacheddynamicresultset.hxx
+++ b/ucb/source/cacher/cacheddynamicresultset.hxx
@@ -122,7 +122,7 @@ public:
                     com::sun::star::ucb::XContentIdentifierMapping > &
                         ContentIdentifierMapping
                 )
-            throw( com::sun::star::uno::RuntimeException );
+            throw( com::sun::star::uno::RuntimeException, std::exception );
 };
 
 #endif
diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.cxx b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
index fb7dbe5daa02..efbb359edf6d 100644
--- a/ucb/source/cacher/cacheddynamicresultsetstub.cxx
+++ b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
@@ -81,7 +81,7 @@ XINTERFACE_COMMON_IMPL( CachedDynamicResultSetStub )
 
 Any SAL_CALL CachedDynamicResultSetStub
     ::queryInterface( const Type&  rType )
-    throw ( RuntimeException )
+    throw ( RuntimeException, std::exception )
 {
     //list all interfaces inclusive baseclasses of interfaces
 
@@ -172,7 +172,7 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( CachedDynamicResultSetStubFactory );
 Reference< XDynamicResultSet > SAL_CALL CachedDynamicResultSetStubFactory
     ::createCachedDynamicResultSetStub(
             const Reference< XDynamicResultSet > & Source )
-            throw( RuntimeException )
+            throw( RuntimeException, std::exception )
 {
     Reference< XDynamicResultSet > xRet;
     xRet = new CachedDynamicResultSetStub( Source, m_xContext );
@@ -189,7 +189,7 @@ void SAL_CALL CachedDynamicResultSetStubFactory
             )
             throw (  ListenerAlreadySetException
             , AlreadyInitializedException
-            , RuntimeException )
+            , RuntimeException, std::exception )
 {
     OSL_ENSURE( Source.is(), "a Source is needed" );
     OSL_ENSURE( TargetCache.is(), "a TargetCache is needed" );
diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.hxx b/ucb/source/cacher/cacheddynamicresultsetstub.hxx
index bc4f420dd705..f7777ad6902e 100644
--- a/ucb/source/cacher/cacheddynamicresultsetstub.hxx
+++ b/ucb/source/cacher/cacheddynamicresultsetstub.hxx
@@ -104,7 +104,7 @@ public:
     createCachedDynamicResultSetStub(
                 const com::sun::star::uno::Reference<
                     com::sun::star::ucb::XDynamicResultSet > & Source )
-                throw( com::sun::star::uno::RuntimeException );
+                throw( com::sun::star::uno::RuntimeException, std::exception );
 
 
     virtual void SAL_CALL connectToCache(
@@ -120,7 +120,7 @@ public:
                 throw (
                   com::sun::star::ucb::ListenerAlreadySetException
                 , com::sun::star::ucb::AlreadyInitializedException
-                , com::sun::star::uno::RuntimeException
+                , com::sun::star::uno::RuntimeException, std::exception
                  );
 };
 
diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx
index 4a00bceac909..516b719eebdd 100644
--- a/ucb/source/cacher/contentresultsetwrapper.cxx
+++ b/ucb/source/cacher/contentresultsetwrapper.cxx
@@ -357,7 +357,7 @@ QUERYINTERFACE_IMPL_END
 
 // virtual
 void SAL_CALL ContentResultSetWrapper
-    ::dispose() throw( RuntimeException )
+    ::dispose() throw( RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -432,7 +432,7 @@ void SAL_CALL ContentResultSetWrapper
 // virtual
 void SAL_CALL ContentResultSetWrapper
     ::addEventListener( const Reference< XEventListener >& Listener )
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
@@ -448,7 +448,7 @@ void SAL_CALL ContentResultSetWrapper
 // virtual
 void SAL_CALL ContentResultSetWrapper
     ::removeEventListener( const Reference< XEventListener >& Listener )
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
@@ -464,7 +464,7 @@ void SAL_CALL ContentResultSetWrapper
 void SAL_CALL ContentResultSetWrapper
     ::close()
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
     dispose();
@@ -477,7 +477,7 @@ void SAL_CALL ContentResultSetWrapper
 Reference< XResultSetMetaData > SAL_CALL ContentResultSetWrapper
     ::getMetaData()
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -508,7 +508,7 @@ Reference< XResultSetMetaData > SAL_CALL ContentResultSetWrapper
 
 // virtual
 Reference< XPropertySetInfo > SAL_CALL ContentResultSetWrapper
-    ::getPropertySetInfo() throw( RuntimeException )
+    ::getPropertySetInfo() throw( RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
     {
@@ -527,7 +527,7 @@ void SAL_CALL ContentResultSetWrapper
            PropertyVetoException,
            IllegalArgumentException,
            WrappedTargetException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
     impl_init_xPropertySetOrigin();
@@ -545,7 +545,7 @@ Any SAL_CALL ContentResultSetWrapper
     ::getPropertyValue( const OUString& rPropertyName )
     throw( UnknownPropertyException,
            WrappedTargetException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
     impl_init_xPropertySetOrigin();
@@ -565,7 +565,7 @@ void SAL_CALL ContentResultSetWrapper
             const Reference< XPropertyChangeListener >& xListener )
     throw( UnknownPropertyException,
            WrappedTargetException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -617,7 +617,7 @@ void SAL_CALL ContentResultSetWrapper
             const Reference< XVetoableChangeListener >& xListener )
     throw( UnknownPropertyException,
            WrappedTargetException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -668,7 +668,7 @@ void SAL_CALL ContentResultSetWrapper
             const Reference< XPropertyChangeListener >& xListener )
     throw( UnknownPropertyException,
            WrappedTargetException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -727,7 +727,7 @@ void SAL_CALL ContentResultSetWrapper
             const Reference< XVetoableChangeListener >& xListener )
     throw( UnknownPropertyException,
            WrappedTargetException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -842,7 +842,7 @@ void SAL_CALL ContentResultSetWrapper
 // virtual
 OUString SAL_CALL ContentResultSetWrapper
     ::queryContentIdentifierString()
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
     impl_init_xContentAccessOrigin();
@@ -858,7 +858,7 @@ OUString SAL_CALL ContentResultSetWrapper
 // virtual
 Reference< XContentIdentifier > SAL_CALL ContentResultSetWrapper
     ::queryContentIdentifier()
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
     impl_init_xContentAccessOrigin();
@@ -874,7 +874,7 @@ Reference< XContentIdentifier > SAL_CALL ContentResultSetWrapper
 // virtual
 Reference< XContent > SAL_CALL ContentResultSetWrapper
     ::queryContent()
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
     impl_init_xContentAccessOrigin();
@@ -894,7 +894,7 @@ Reference< XContent > SAL_CALL ContentResultSetWrapper
 sal_Bool SAL_CALL ContentResultSetWrapper
     ::next()
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -910,7 +910,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper
 sal_Bool SAL_CALL ContentResultSetWrapper
     ::previous()
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -926,7 +926,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper
 sal_Bool SAL_CALL ContentResultSetWrapper
     ::absolute( sal_Int32 row )
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -942,7 +942,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper
 sal_Bool SAL_CALL ContentResultSetWrapper
     ::relative( sal_Int32 rows )
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -959,7 +959,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper
 sal_Bool SAL_CALL ContentResultSetWrapper
     ::first()
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -975,7 +975,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper
 sal_Bool SAL_CALL ContentResultSetWrapper
     ::last()
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -991,7 +991,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper
 void SAL_CALL ContentResultSetWrapper
     ::beforeFirst()
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1007,7 +1007,7 @@ void SAL_CALL ContentResultSetWrapper
 void SAL_CALL ContentResultSetWrapper
     ::afterLast()
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1023,7 +1023,7 @@ void SAL_CALL ContentResultSetWrapper
 sal_Bool SAL_CALL ContentResultSetWrapper
     ::isAfterLast()
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1039,7 +1039,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper
 sal_Bool SAL_CALL ContentResultSetWrapper
     ::isBeforeFirst()
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1055,7 +1055,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper
 sal_Bool SAL_CALL ContentResultSetWrapper
     ::isFirst()
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1071,7 +1071,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper
 sal_Bool SAL_CALL ContentResultSetWrapper
     ::isLast()
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1088,7 +1088,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper
 sal_Int32 SAL_CALL ContentResultSetWrapper
     ::getRow()
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1104,7 +1104,7 @@ sal_Int32 SAL_CALL ContentResultSetWrapper
 void SAL_CALL ContentResultSetWrapper
     ::refreshRow()
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1120,7 +1120,7 @@ void SAL_CALL ContentResultSetWrapper
 sal_Bool SAL_CALL ContentResultSetWrapper
     ::rowUpdated()
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1135,7 +1135,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper
 sal_Bool SAL_CALL ContentResultSetWrapper
     ::rowInserted()
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1151,7 +1151,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper
 sal_Bool SAL_CALL ContentResultSetWrapper
     ::rowDeleted()
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -1167,7 +1167,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper
 Reference< XInterface > SAL_CALL ContentResultSetWrapper
     ::getStatement()
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
     //@todo ?return anything
@@ -1192,7 +1192,7 @@ return m_xRowOrigin->getXXX( columnIndex );
 sal_Bool SAL_CALL ContentResultSetWrapper
     ::wasNull()
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
     impl_init_xRowOrigin();
@@ -1208,7 +1208,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper
 OUString SAL_CALL ContentResultSetWrapper
     ::getString( sal_Int32 columnIndex )
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     XROW_GETXXX( getString );
 }
@@ -1217,7 +1217,7 @@ OUString SAL_CALL ContentResultSetWrapper
 sal_Bool SAL_CALL ContentResultSetWrapper
     ::getBoolean( sal_Int32 columnIndex )
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     XROW_GETXXX( getBoolean );
 }
@@ -1226,7 +1226,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper
 sal_Int8 SAL_CALL ContentResultSetWrapper
     ::getByte( sal_Int32 columnIndex )
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     XROW_GETXXX( getByte );
 }
@@ -1235,7 +1235,7 @@ sal_Int8 SAL_CALL ContentResultSetWrapper
 sal_Int16 SAL_CALL ContentResultSetWrapper
     ::getShort( sal_Int32 columnIndex )
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     XROW_GETXXX( getShort );
 }
@@ -1244,7 +1244,7 @@ sal_Int16 SAL_CALL ContentResultSetWrapper
 sal_Int32 SAL_CALL ContentResultSetWrapper
     ::getInt( sal_Int32 columnIndex )
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     XROW_GETXXX( getInt );
 }
@@ -1253,7 +1253,7 @@ sal_Int32 SAL_CALL ContentResultSetWrapper
 sal_Int64 SAL_CALL ContentResultSetWrapper
     ::getLong( sal_Int32 columnIndex )
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     XROW_GETXXX( getLong );
 }
@@ -1262,7 +1262,7 @@ sal_Int64 SAL_CALL ContentResultSetWrapper
 float SAL_CALL ContentResultSetWrapper
     ::getFloat( sal_Int32 columnIndex )
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     XROW_GETXXX( getFloat );
 }
@@ -1271,7 +1271,7 @@ float SAL_CALL ContentResultSetWrapper
 double SAL_CALL ContentResultSetWrapper
     ::getDouble( sal_Int32 columnIndex )
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     XROW_GETXXX( getDouble );
 }
@@ -1280,7 +1280,7 @@ double SAL_CALL ContentResultSetWrapper
 Sequence< sal_Int8 > SAL_CALL ContentResultSetWrapper
     ::getBytes( sal_Int32 columnIndex )
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     XROW_GETXXX( getBytes );
 }
@@ -1289,7 +1289,7 @@ Sequence< sal_Int8 > SAL_CALL ContentResultSetWrapper
 Date SAL_CALL ContentResultSetWrapper
     ::getDate( sal_Int32 columnIndex )
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     XROW_GETXXX( getDate );
 }
@@ -1298,7 +1298,7 @@ Date SAL_CALL ContentResultSetWrapper
 Time SAL_CALL ContentResultSetWrapper
     ::getTime( sal_Int32 columnIndex )
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     XROW_GETXXX( getTime );
 }
@@ -1307,7 +1307,7 @@ Time SAL_CALL ContentResultSetWrapper
 DateTime SAL_CALL ContentResultSetWrapper
     ::getTimestamp( sal_Int32 columnIndex )
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     XROW_GETXXX( getTimestamp );
 }
@@ -1317,7 +1317,7 @@ Reference< com::sun::star::io::XInputStream >
     SAL_CALL ContentResultSetWrapper
     ::getBinaryStream( sal_Int32 columnIndex )
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     XROW_GETXXX( getBinaryStream );
 }
@@ -1327,7 +1327,7 @@ Reference< com::sun::star::io::XInputStream >
     SAL_CALL ContentResultSetWrapper
     ::getCharacterStream( sal_Int32 columnIndex )
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     XROW_GETXXX( getCharacterStream );
 }
@@ -1338,7 +1338,7 @@ Any SAL_CALL ContentResultSetWrapper
            const Reference<
             com::sun::star::container::XNameAccess >& typeMap )
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     //if you change this macro please pay attention to
     //define XROW_GETXXX, where this is similar implemented
@@ -1357,7 +1357,7 @@ Any SAL_CALL ContentResultSetWrapper
 Reference< XRef > SAL_CALL ContentResultSetWrapper
     ::getRef( sal_Int32 columnIndex )
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     XROW_GETXXX( getRef );
 }
@@ -1366,7 +1366,7 @@ Reference< XRef > SAL_CALL ContentResultSetWrapper
 Reference< XBlob > SAL_CALL ContentResultSetWrapper
     ::getBlob( sal_Int32 columnIndex )
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     XROW_GETXXX( getBlob );
 }
@@ -1375,7 +1375,7 @@ Reference< XBlob > SAL_CALL ContentResultSetWrapper
 Reference< XClob > SAL_CALL ContentResultSetWrapper
     ::getClob( sal_Int32 columnIndex )
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     XROW_GETXXX( getClob );
 }
@@ -1384,7 +1384,7 @@ Reference< XClob > SAL_CALL ContentResultSetWrapper
 Reference< XArray > SAL_CALL ContentResultSetWrapper
     ::getArray( sal_Int32 columnIndex )
     throw( SQLException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     XROW_GETXXX( getArray );
 }
@@ -1427,7 +1427,7 @@ QUERYINTERFACE_IMPL_END
 //virtual
 void SAL_CALL ContentResultSetWrapperListener
     ::disposing( const EventObject& rEventObject )
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     if( m_pOwner )
         m_pOwner->impl_disposing( rEventObject );
@@ -1440,7 +1440,7 @@ void SAL_CALL ContentResultSetWrapperListener
 //virtual
 void SAL_CALL ContentResultSetWrapperListener
     ::propertyChange( const PropertyChangeEvent& rEvt )
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     if( m_pOwner )
         m_pOwner->impl_propertyChange( rEvt );
@@ -1453,7 +1453,7 @@ void SAL_CALL ContentResultSetWrapperListener
 void SAL_CALL ContentResultSetWrapperListener
     ::vetoableChange( const PropertyChangeEvent& rEvt )
     throw( PropertyVetoException,
-           RuntimeException )
+           RuntimeException, std::exception )
 {
     if( m_pOwner )
         m_pOwner->impl_vetoableChange( rEvt );
diff --git a/ucb/source/cacher/contentresultsetwrapper.hxx b/ucb/source/cacher/contentresultsetwrapper.hxx
index 9f7f409ceb8e..143a9639dce6 100644
--- a/ucb/source/cacher/contentresultsetwrapper.hxx
+++ b/ucb/source/cacher/contentresultsetwrapper.hxx
@@ -200,23 +200,23 @@ public:
 
     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 );
 
 
     // XComponent
 
     virtual void SAL_CALL
-    dispose() throw( com::sun::star::uno::RuntimeException );
+    dispose() throw( com::sun::star::uno::RuntimeException, std::exception );
 
     virtual void SAL_CALL
     addEventListener( const com::sun::star::uno::Reference<
         com::sun::star::lang::XEventListener >& Listener )
-            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 >& Listener )
-            throw( com::sun::star::uno::RuntimeException );
+            throw( com::sun::star::uno::RuntimeException, std::exception );
 
 
     //XCloseable
@@ -224,7 +224,7 @@ public:
     virtual void SAL_CALL
     close()
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
 
     //XResultSetMetaDataSupplier
@@ -233,7 +233,7 @@ public:
                 com::sun::star::sdbc::XResultSetMetaData > SAL_CALL
     getMetaData()
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
 
     // XPropertySet
@@ -241,7 +241,7 @@ public:
     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,
@@ -250,13 +250,13 @@ public:
                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( const OUString& aPropertyName,
@@ -264,7 +264,7 @@ public:
                                        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( const OUString& aPropertyName,
@@ -272,7 +272,7 @@ public:
                                       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( const OUString& PropertyName,
@@ -280,7 +280,7 @@ public:
                                        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,
@@ -288,7 +288,7 @@ public:
                                       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 );
 
 
     // own methods
@@ -311,17 +311,17 @@ public:
 
     virtual OUString SAL_CALL
     queryContentIdentifierString()
-        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()
-        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()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
 
     // XResultSet
@@ -329,76 +329,76 @@ public:
     virtual sal_Bool SAL_CALL
     next()
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
     virtual sal_Bool SAL_CALL
     isBeforeFirst()
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
     virtual sal_Bool SAL_CALL
     isAfterLast()
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
     virtual sal_Bool SAL_CALL
     isFirst()
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
     virtual sal_Bool SAL_CALL
     isLast()
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
     virtual void SAL_CALL
     beforeFirst()
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
     virtual void SAL_CALL
     afterLast()
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
     virtual sal_Bool SAL_CALL
     first()
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
     virtual sal_Bool SAL_CALL
     last()
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
     virtual sal_Int32 SAL_CALL
     getRow()
         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()
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
     virtual void SAL_CALL
     refreshRow()
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
     virtual sal_Bool SAL_CALL
     rowUpdated()
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
     virtual sal_Bool SAL_CALL
     rowInserted()
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
     virtual sal_Bool SAL_CALL
     rowDeleted()
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
     virtual com::sun::star::uno::Reference<
                 com::sun::star::uno::XInterface > SAL_CALL
     getStatement()
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
 
     // XRow
@@ -406,110 +406,110 @@ public:
     virtual sal_Bool SAL_CALL
     wasNull()
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
     virtual OUString SAL_CALL
     getString( sal_Int32 columnIndex )
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
     virtual sal_Bool SAL_CALL
     getBoolean( sal_Int32 columnIndex )
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
     virtual sal_Int8 SAL_CALL
     getByte( sal_Int32 columnIndex )
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
     virtual sal_Int16 SAL_CALL
     getShort( sal_Int32 columnIndex )
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
     virtual sal_Int32 SAL_CALL
     getInt( sal_Int32 columnIndex )
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
     virtual sal_Int64 SAL_CALL
     getLong( sal_Int32 columnIndex )
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
     virtual float SAL_CALL
     getFloat( sal_Int32 columnIndex )
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
     virtual double SAL_CALL
     getDouble( sal_Int32 columnIndex )
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
     virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
     getBytes( sal_Int32 columnIndex )
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
     virtual com::sun::star::util::Date SAL_CALL
     getDate( sal_Int32 columnIndex )
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
     virtual com::sun::star::util::Time SAL_CALL
     getTime( sal_Int32 columnIndex )
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
     virtual com::sun::star::util::DateTime SAL_CALL
     getTimestamp( sal_Int32 columnIndex )
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
     virtual com::sun::star::uno::Reference<
                 com::sun::star::io::XInputStream > SAL_CALL
     getBinaryStream( sal_Int32 columnIndex )
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
     virtual com::sun::star::uno::Reference<
                 com::sun::star::io::XInputStream > SAL_CALL
     getCharacterStream( sal_Int32 columnIndex )
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
     virtual com::sun::star::uno::Any SAL_CALL
     getObject( sal_Int32 columnIndex,
                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 );
 
     virtual com::sun::star::uno::Reference<
                 com::sun::star::sdbc::XRef > SAL_CALL
     getRef( sal_Int32 columnIndex )
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
     virtual com::sun::star::uno::Reference<
                 com::sun::star::sdbc::XBlob > SAL_CALL
     getBlob( sal_Int32 columnIndex )
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
     virtual com::sun::star::uno::Reference<
                 com::sun::star::sdbc::XClob > SAL_CALL
     getClob( sal_Int32 columnIndex )
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
     virtual com::sun::star::uno::Reference<
                 com::sun::star::sdbc::XArray > SAL_CALL
     getArray( sal_Int32 columnIndex )
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 };
 
 
@@ -537,14 +537,14 @@ public:
 
     virtual void SAL_CALL
         disposing( const com::sun::star::lang::EventObject& Source )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
 
     //XPropertyChangeListener
 
     virtual void SAL_CALL
     propertyChange( const com::sun::star::beans::PropertyChangeEvent& evt )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
 
     //XVetoableChangeListener
@@ -552,7 +552,7 @@ public:
     virtual void SAL_CALL
     vetoableChange( const com::sun::star::beans::PropertyChangeEvent& aEvent )
         throw( com::sun::star::beans::PropertyVetoException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
 
     // own methods:
diff --git a/ucb/source/cacher/dynamicresultsetwrapper.cxx b/ucb/source/cacher/dynamicresultsetwrapper.cxx
index f99e23704d33..3e777ca9abe0 100644
--- a/ucb/source/cacher/dynamicresultsetwrapper.cxx
+++ b/ucb/source/cacher/dynamicresultsetwrapper.cxx
@@ -136,7 +136,7 @@ QUERYINTERFACE_IMPL_END
 
 // virtual
 void SAL_CALL DynamicResultSetWrapper
-    ::dispose() throw( RuntimeException )
+    ::dispose() throw( RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -173,7 +173,7 @@ void SAL_CALL DynamicResultSetWrapper
 // virtual
 void SAL_CALL DynamicResultSetWrapper
     ::addEventListener( const Reference< XEventListener >& Listener )
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
@@ -189,7 +189,7 @@ void SAL_CALL DynamicResultSetWrapper
 // virtual
 void SAL_CALL DynamicResultSetWrapper
     ::removeEventListener( const Reference< XEventListener >& Listener )
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
@@ -293,7 +293,7 @@ void SAL_CALL DynamicResultSetWrapper
 //virtual
 void SAL_CALL DynamicResultSetWrapper
     ::setSource( const Reference< XInterface > & Source )
-    throw( AlreadyInitializedException, RuntimeException )
+    throw( AlreadyInitializedException, RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
     {
@@ -335,7 +335,7 @@ void SAL_CALL DynamicResultSetWrapper
 //virtual
 Reference< XResultSet > SAL_CALL DynamicResultSetWrapper
     ::getStaticResultSet()
-    throw( ListenerAlreadySetException, RuntimeException )
+    throw( ListenerAlreadySetException, RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -368,7 +368,7 @@ Reference< XResultSet > SAL_CALL DynamicResultSetWrapper
 void SAL_CALL DynamicResultSetWrapper
     ::setListener( const Reference<
     XDynamicResultSetListener > & Listener )
-    throw( ListenerAlreadySetException, RuntimeException )
+    throw( ListenerAlreadySetException, RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -396,7 +396,7 @@ void SAL_CALL DynamicResultSetWrapper
 //virtual
 void SAL_CALL DynamicResultSetWrapper
     ::connectToCache( const Reference< XDynamicResultSet > & xCache )
-    throw( ListenerAlreadySetException, AlreadyInitializedException, ServiceNotFoundException, RuntimeException )
+    throw( ListenerAlreadySetException, AlreadyInitializedException, ServiceNotFoundException, RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -434,7 +434,7 @@ void SAL_CALL DynamicResultSetWrapper
 //virtual
 sal_Int16 SAL_CALL DynamicResultSetWrapper
     ::getCapabilities()
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     impl_EnsureNotDisposed();
 
@@ -480,7 +480,7 @@ XINTERFACE_IMPL_2( DynamicResultSetWrapperListener
 //virtual
 void SAL_CALL DynamicResultSetWrapperListener
     ::disposing( const EventObject& rEventObject )
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
@@ -491,7 +491,7 @@ void SAL_CALL DynamicResultSetWrapperListener
 //virtual
 void SAL_CALL DynamicResultSetWrapperListener
     ::notify( const ListEvent& Changes )
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
diff --git a/ucb/source/cacher/dynamicresultsetwrapper.hxx b/ucb/source/cacher/dynamicresultsetwrapper.hxx
index f4d09d801a1b..a5c695c532fb 100644
--- a/ucb/source/cacher/dynamicresultsetwrapper.hxx
+++ b/ucb/source/cacher/dynamicresultsetwrapper.hxx
@@ -115,20 +115,20 @@ public:
     // XInterface
     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 );
 
 
     // XDynamicResultSet
     virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSet > SAL_CALL
     getStaticResultSet()
         throw( com::sun::star::ucb::ListenerAlreadySetException
-        , com::sun::star::uno::RuntimeException );
+        , com::sun::star::uno::RuntimeException, std::exception );
 
     virtual void SAL_CALL
     setListener( const com::sun::star::uno::Reference<
         com::sun::star::ucb::XDynamicResultSetListener > & Listener )
         throw( com::sun::star::ucb::ListenerAlreadySetException
-            , com::sun::star::uno::RuntimeException );
+            , com::sun::star::uno::RuntimeException, std::exception );
 
     virtual void SAL_CALL
     connectToCache( const com::sun::star::uno::Reference<
@@ -136,25 +136,25 @@ public:
         throw( com::sun::star::ucb::ListenerAlreadySetException
             , com::sun::star::ucb::AlreadyInitializedException
             , com::sun::star::ucb::ServiceNotFoundException
-            , com::sun::star::uno::RuntimeException );
+            , com::sun::star::uno::RuntimeException, std::exception );
 
     virtual sal_Int16 SAL_CALL
-    getCapabilities() throw( com::sun::star::uno::RuntimeException );
+    getCapabilities() throw( com::sun::star::uno::RuntimeException, std::exception );
 
 
     // XComponent ( base of XDynamicResultSet )
     virtual void SAL_CALL
-    dispose() throw( com::sun::star::uno::RuntimeException );
+    dispose() throw( com::sun::star::uno::RuntimeException, std::exception );
 
     virtual void SAL_CALL
     addEventListener( const com::sun::star::uno::Reference<
         com::sun::star::lang::XEventListener >& Listener )
-            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 >& Listener )
-            throw( com::sun::star::uno::RuntimeException );
+            throw( com::sun::star::uno::RuntimeException, std::exception );
 
 
     // XSourceInitialization
@@ -163,7 +163,7 @@ public:
     setSource(  const com::sun::star::uno::Reference<
         com::sun::star::uno::XInterface > & Source )
          throw( com::sun::star::ucb::AlreadyInitializedException
-                , com::sun::star::uno::RuntimeException );
+                , com::sun::star::uno::RuntimeException, std::exception );
 
 
     // own methods:
@@ -201,12 +201,12 @@ public:
 
     virtual void SAL_CALL
     disposing( const com::sun::star::lang::EventObject& Source )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
     // XDynamicResultSetListener
     virtual void SAL_CALL
     notify( const ::com::sun::star::ucb::ListEvent& Changes )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
 
     // own methods: