cppuhelper: retrofit std::exception into overriding exception specs

Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3

18 files changed, 236 insertions, 236 deletions

diff --git a/ucbhelper/source/client/activedatasink.cxx b/ucbhelper/source/client/activedatasink.cxx
index 11ba985e6170..aed7305e5efe 100644
--- a/ucbhelper/source/client/activedatasink.cxx
+++ b/ucbhelper/source/client/activedatasink.cxx
@@ -67,7 +67,7 @@ XTYPEPROVIDER_IMPL_2( ActiveDataSink,
 // virtual
 void SAL_CALL ActiveDataSink::setInputStream(
                         const uno::Reference< io::XInputStream >& aStream )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     m_xStream = aStream;
 }
@@ -75,7 +75,7 @@ void SAL_CALL ActiveDataSink::setInputStream(
 
 // virtual
 uno::Reference< io::XInputStream > SAL_CALL ActiveDataSink::getInputStream()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     return m_xStream;
 }
diff --git a/ucbhelper/source/client/activedatastreamer.cxx b/ucbhelper/source/client/activedatastreamer.cxx
index 17035c6760da..27ab53a9b4c0 100644
--- a/ucbhelper/source/client/activedatastreamer.cxx
+++ b/ucbhelper/source/client/activedatastreamer.cxx
@@ -66,7 +66,7 @@ XTYPEPROVIDER_IMPL_2( ActiveDataStreamer,
 
 // virtual
 void SAL_CALL ActiveDataStreamer::setStream( const uno::Reference< io::XStream >& xStream )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     m_xStream = xStream;
 }
@@ -74,7 +74,7 @@ void SAL_CALL ActiveDataStreamer::setStream( const uno::Reference< io::XStream >
 
 // virtual
 uno::Reference< io::XStream > SAL_CALL ActiveDataStreamer::getStream()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     return m_xStream;
 }
diff --git a/ucbhelper/source/client/commandenvironment.cxx b/ucbhelper/source/client/commandenvironment.cxx
index ad07f2d73b4a..a8e938cd21c0 100644
--- a/ucbhelper/source/client/commandenvironment.cxx
+++ b/ucbhelper/source/client/commandenvironment.cxx
@@ -110,7 +110,7 @@ XTYPEPROVIDER_IMPL_2( CommandEnvironment,
 // virtual
 Reference< XInteractionHandler > SAL_CALL
 CommandEnvironment::getInteractionHandler()
-    throw ( RuntimeException )
+    throw ( RuntimeException, std::exception )
 {
     return m_pImpl->m_xInteractionHandler;
 }
@@ -119,7 +119,7 @@ CommandEnvironment::getInteractionHandler()
 // virtual
 Reference< XProgressHandler > SAL_CALL
 CommandEnvironment::getProgressHandler()
-    throw ( RuntimeException )
+    throw ( RuntimeException, std::exception )
 {
     return m_pImpl->m_xProgressHandler;
 }
diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx
index ac1bd2d67092..e1ef0bb281bb 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.cxx
@@ -80,21 +80,21 @@ class EmptyInputStream : public ::cppu::WeakImplHelper1< XInputStream >
 public:
     virtual sal_Int32 SAL_CALL readBytes(
         Sequence< sal_Int8 > & data, sal_Int32 nBytesToRead )
-        throw (IOException, RuntimeException);
+        throw (IOException, RuntimeException, std::exception);
     virtual sal_Int32 SAL_CALL readSomeBytes(
         Sequence< sal_Int8 > & data, sal_Int32 nMaxBytesToRead )
-        throw (IOException, RuntimeException);
+        throw (IOException, RuntimeException, std::exception);
     virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
-        throw (IOException, RuntimeException);
+        throw (IOException, RuntimeException, std::exception);
     virtual sal_Int32 SAL_CALL available()
-        throw (IOException, RuntimeException);
+        throw (IOException, RuntimeException, std::exception);
     virtual void SAL_CALL closeInput()
-        throw (IOException, RuntimeException);
+        throw (IOException, RuntimeException, std::exception);
 };
 
 sal_Int32 EmptyInputStream::readBytes(
     Sequence< sal_Int8 > & data, sal_Int32 )
-    throw (IOException, RuntimeException)
+    throw (IOException, RuntimeException, std::exception)
 {
     data.realloc( 0 );
     return 0;
@@ -102,25 +102,25 @@ sal_Int32 EmptyInputStream::readBytes(
 
 sal_Int32 EmptyInputStream::readSomeBytes(
     Sequence< sal_Int8 > & data, sal_Int32 )
-    throw (IOException, RuntimeException)
+    throw (IOException, RuntimeException, std::exception)
 {
     data.realloc( 0 );
     return 0;
 }
 
 void EmptyInputStream::skipBytes( sal_Int32 )
-    throw (IOException, RuntimeException)
+    throw (IOException, RuntimeException, std::exception)
 {
 }
 
 sal_Int32 EmptyInputStream::available()
-    throw (IOException, RuntimeException)
+    throw (IOException, RuntimeException, std::exception)
 {
     return 0;
 }
 
 void EmptyInputStream::closeInput()
-    throw (IOException, RuntimeException)
+    throw (IOException, RuntimeException, std::exception)
 {
 }
 
@@ -147,11 +147,11 @@ public:
 
     // XContentEventListener
     virtual void SAL_CALL contentEvent( const ContentEvent& evt )
-        throw( RuntimeException );
+        throw( RuntimeException, std::exception );
 
     // XEventListener ( base of XContentEventListener )
     virtual void SAL_CALL disposing( const EventObject& Source )
-        throw( RuntimeException );
+        throw( RuntimeException, std::exception );
 };
 
 
@@ -1330,7 +1330,7 @@ XINTERFACE_IMPL_2( ContentEventListener_Impl,
 
 // virtual
 void SAL_CALL ContentEventListener_Impl::contentEvent( const ContentEvent& evt )
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     if ( evt.Source == m_rContent.m_xContent )
     {
@@ -1358,7 +1358,7 @@ void SAL_CALL ContentEventListener_Impl::contentEvent( const ContentEvent& evt )
 
 // virtual
 void SAL_CALL ContentEventListener_Impl::disposing( const EventObject& Source )
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     m_rContent.disposing(Source);
 }
diff --git a/ucbhelper/source/client/interceptedinteraction.cxx b/ucbhelper/source/client/interceptedinteraction.cxx
index f98cc784d29a..6dd1d0a180e8 100644
--- a/ucbhelper/source/client/interceptedinteraction.cxx
+++ b/ucbhelper/source/client/interceptedinteraction.cxx
@@ -63,7 +63,7 @@ css::uno::Reference< css::task::XInteractionContinuation > InterceptedInteractio
 }
 
 void SAL_CALL InterceptedInteraction::handle(const css::uno::Reference< css::task::XInteractionRequest >& xRequest)
-    throw(css::uno::RuntimeException)
+    throw(css::uno::RuntimeException, std::exception)
 {
     impl_handleDefault(xRequest);
 }
diff --git a/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx
index 5bcb5f0f0c32..7652f021e90a 100644
--- a/ucbhelper/source/client/proxydecider.cxx
+++ b/ucbhelper/source/client/proxydecider.cxx
@@ -150,11 +150,11 @@ public:
 
     // XChangesListener
     virtual void SAL_CALL changesOccurred( const util::ChangesEvent& Event )
-        throw( uno::RuntimeException );
+        throw( uno::RuntimeException, std::exception );
 
     // XEventListener ( base of XChangesLisetenr )
     virtual void SAL_CALL disposing( const lang::EventObject& Source )
-        throw( uno::RuntimeException );
+        throw( uno::RuntimeException, std::exception );
 
 private:
     void setNoProxyList( const OUString & rNoProxyList );
@@ -563,7 +563,7 @@ const InternetProxyServer & InternetProxyDecider_Impl::getProxy(
 // virtual
 void SAL_CALL InternetProxyDecider_Impl::changesOccurred(
                                         const util::ChangesEvent& Event )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
 
@@ -659,7 +659,7 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred(
 
 // virtual
 void SAL_CALL InternetProxyDecider_Impl::disposing(const lang::EventObject&)
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     if ( m_xNotifier.is() )
     {
diff --git a/ucbhelper/source/provider/contenthelper.cxx b/ucbhelper/source/provider/contenthelper.cxx
index b19a077313f8..f758b934162a 100644
--- a/ucbhelper/source/provider/contenthelper.cxx
+++ b/ucbhelper/source/provider/contenthelper.cxx
@@ -162,7 +162,7 @@ void SAL_CALL ContentImplHelper::release()
 }
 
 uno::Any SAL_CALL ContentImplHelper::queryInterface( const uno::Type & rType )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     com::sun::star::uno::Any aRet = cppu::queryInterface( rType,
             static_cast< lang::XTypeProvider * >(this),
@@ -193,14 +193,14 @@ XTYPEPROVIDER_IMPL_10( ContentImplHelper,
 // virtual
 sal_Bool SAL_CALL ContentImplHelper::supportsService(
                                             const OUString& ServiceName )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 // virtual
 void SAL_CALL ContentImplHelper::dispose()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -249,7 +249,7 @@ void SAL_CALL ContentImplHelper::dispose()
 // virtual
 void SAL_CALL ContentImplHelper::addEventListener(
         const uno::Reference< lang::XEventListener >& Listener )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -263,7 +263,7 @@ void SAL_CALL ContentImplHelper::addEventListener(
 // virtual
 void SAL_CALL ContentImplHelper::removeEventListener(
         const uno::Reference< lang::XEventListener >& Listener )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -274,7 +274,7 @@ void SAL_CALL ContentImplHelper::removeEventListener(
 // virtual
 uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL
 ContentImplHelper::getIdentifier()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     return m_xIdentifier;
 }
@@ -282,7 +282,7 @@ ContentImplHelper::getIdentifier()
 // virtual
 void SAL_CALL ContentImplHelper::addContentEventListener(
         const uno::Reference< com::sun::star::ucb::XContentEventListener >& Listener )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -296,7 +296,7 @@ void SAL_CALL ContentImplHelper::addContentEventListener(
 // virtual
 void SAL_CALL ContentImplHelper::removeContentEventListener(
         const uno::Reference< com::sun::star::ucb::XContentEventListener >& Listener )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -306,7 +306,7 @@ void SAL_CALL ContentImplHelper::removeContentEventListener(
 
 // virtual
 sal_Int32 SAL_CALL ContentImplHelper::createCommandIdentifier()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -318,7 +318,7 @@ sal_Int32 SAL_CALL ContentImplHelper::createCommandIdentifier()
 void SAL_CALL ContentImplHelper::addPropertiesChangeListener(
         const uno::Sequence< OUString >& PropertyNames,
         const uno::Reference< beans::XPropertiesChangeListener >& Listener )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -351,7 +351,7 @@ void SAL_CALL ContentImplHelper::addPropertiesChangeListener(
 void SAL_CALL ContentImplHelper::removePropertiesChangeListener(
         const uno::Sequence< OUString >& PropertyNames,
         const uno::Reference< beans::XPropertiesChangeListener >& Listener )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -382,7 +382,7 @@ void SAL_CALL ContentImplHelper::removePropertiesChangeListener(
 // virtual
 void SAL_CALL ContentImplHelper::addCommandInfoChangeListener(
         const uno::Reference< com::sun::star::ucb::XCommandInfoChangeListener >& Listener )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -396,7 +396,7 @@ void SAL_CALL ContentImplHelper::addCommandInfoChangeListener(
 // virtual
 void SAL_CALL ContentImplHelper::removeCommandInfoChangeListener(
         const uno::Reference< com::sun::star::ucb::XCommandInfoChangeListener >& Listener )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -412,7 +412,7 @@ void SAL_CALL ContentImplHelper::addProperty(
     throw( beans::PropertyExistException,
            beans::IllegalTypeException,
            lang::IllegalArgumentException,
-           uno::RuntimeException )
+           uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -499,7 +499,7 @@ void SAL_CALL ContentImplHelper::addProperty(
 void SAL_CALL ContentImplHelper::removeProperty( const OUString& Name )
     throw( beans::UnknownPropertyException,
            beans::NotRemoveableException,
-           uno::RuntimeException )
+           uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -597,7 +597,7 @@ void SAL_CALL ContentImplHelper::removeProperty( const OUString& Name )
 // virtual
 void SAL_CALL ContentImplHelper::addPropertySetInfoChangeListener(
         const uno::Reference< beans::XPropertySetInfoChangeListener >& Listener )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -611,7 +611,7 @@ void SAL_CALL ContentImplHelper::addPropertySetInfoChangeListener(
 // virtual
 void SAL_CALL ContentImplHelper::removePropertySetInfoChangeListener(
         const uno::Reference< beans::XPropertySetInfoChangeListener >& Listener )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -621,7 +621,7 @@ void SAL_CALL ContentImplHelper::removePropertySetInfoChangeListener(
 
 // virtual
 uno::Reference< uno::XInterface > SAL_CALL ContentImplHelper::getParent()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     uno::Reference< uno::XInterface > xParent;
     OUString aURL = getParentURL();
@@ -645,7 +645,7 @@ uno::Reference< uno::XInterface > SAL_CALL ContentImplHelper::getParent()
 // virtual
 void SAL_CALL ContentImplHelper::setParent(
                                     const uno::Reference< uno::XInterface >& )
-    throw( lang::NoSupportException, uno::RuntimeException )
+    throw( lang::NoSupportException, uno::RuntimeException, std::exception )
 {
     throw lang::NoSupportException();
 }
diff --git a/ucbhelper/source/provider/contentidentifier.cxx b/ucbhelper/source/provider/contentidentifier.cxx
index 265d639b09b8..387e04deec20 100644
--- a/ucbhelper/source/provider/contentidentifier.cxx
+++ b/ucbhelper/source/provider/contentidentifier.cxx
@@ -116,7 +116,7 @@ void SAL_CALL ContentIdentifier::release() throw()
 // virtual
 Any SAL_CALL
 ContentIdentifier::queryInterface( const Type & rType )
-    throw ( RuntimeException )
+    throw ( RuntimeException, std::exception )
 {
     Any aRet = cppu::queryInterface( rType,
                 static_cast< XTypeProvider * >( this ),
@@ -134,7 +134,7 @@ ContentIdentifier::queryInterface( const Type & rType )
 // virtual
 Sequence< sal_Int8 > SAL_CALL
 ContentIdentifier::getImplementationId()
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     static cppu::OImplementationId* pId = NULL;
       if ( !pId )
@@ -153,7 +153,7 @@ ContentIdentifier::getImplementationId()
 // virtual
 Sequence< com::sun::star::uno::Type > SAL_CALL
 ContentIdentifier::getTypes()
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     static cppu::OTypeCollection* pCollection = NULL;
       if ( !pCollection )
@@ -180,7 +180,7 @@ ContentIdentifier::getTypes()
 
 // virtual
 OUString SAL_CALL ContentIdentifier::getContentIdentifier()
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     return m_pImpl->m_aContentId;
 }
@@ -188,7 +188,7 @@ OUString SAL_CALL ContentIdentifier::getContentIdentifier()
 
 // virtual
 OUString SAL_CALL ContentIdentifier::getContentProviderScheme()
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     return m_pImpl->m_aProviderScheme;
 }
diff --git a/ucbhelper/source/provider/contentinfo.cxx b/ucbhelper/source/provider/contentinfo.cxx
index bb4de6e758f8..b3a20b8e0940 100644
--- a/ucbhelper/source/provider/contentinfo.cxx
+++ b/ucbhelper/source/provider/contentinfo.cxx
@@ -86,7 +86,7 @@ XTYPEPROVIDER_IMPL_2( PropertySetInfo,
 
 // virtual
 uno::Sequence< beans::Property > SAL_CALL PropertySetInfo::getProperties()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     if ( !m_pProps )
     {
@@ -152,7 +152,7 @@ uno::Sequence< beans::Property > SAL_CALL PropertySetInfo::getProperties()
 // virtual
 beans::Property SAL_CALL PropertySetInfo::getPropertyByName(
         const OUString& aName )
-    throw( beans::UnknownPropertyException, uno::RuntimeException )
+    throw( beans::UnknownPropertyException, uno::RuntimeException, std::exception )
 {
     beans::Property aProp;
     if ( queryProperty( aName, aProp ) )
@@ -165,7 +165,7 @@ beans::Property SAL_CALL PropertySetInfo::getPropertyByName(
 // virtual
 sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName(
         const OUString& Name )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     beans::Property aProp;
     return queryProperty( Name, aProp );
@@ -260,7 +260,7 @@ XTYPEPROVIDER_IMPL_2( CommandProcessorInfo,
 // virtual
 uno::Sequence< com::sun::star::ucb::CommandInfo > SAL_CALL
 CommandProcessorInfo::getCommands()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     if ( !m_pCommands )
     {
@@ -300,7 +300,7 @@ com::sun::star::ucb::CommandInfo SAL_CALL
 CommandProcessorInfo::getCommandInfoByName(
         const OUString& Name )
     throw( com::sun::star::ucb::UnsupportedCommandException,
-           uno::RuntimeException )
+           uno::RuntimeException, std::exception )
 {
     com::sun::star::ucb::CommandInfo aInfo;
     if ( queryCommand( Name, aInfo ) )
@@ -314,7 +314,7 @@ CommandProcessorInfo::getCommandInfoByName(
 com::sun::star::ucb::CommandInfo SAL_CALL
 CommandProcessorInfo::getCommandInfoByHandle( sal_Int32 Handle )
     throw( com::sun::star::ucb::UnsupportedCommandException,
-           uno::RuntimeException )
+           uno::RuntimeException, std::exception )
 {
     com::sun::star::ucb::CommandInfo aInfo;
     if ( queryCommand( Handle, aInfo ) )
@@ -327,7 +327,7 @@ CommandProcessorInfo::getCommandInfoByHandle( sal_Int32 Handle )
 // virtual
 sal_Bool SAL_CALL CommandProcessorInfo::hasCommandByName(
        const OUString& Name )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     com::sun::star::ucb::CommandInfo aInfo;
     return queryCommand( Name, aInfo );
@@ -336,7 +336,7 @@ sal_Bool SAL_CALL CommandProcessorInfo::hasCommandByName(
 
 // virtual
 sal_Bool SAL_CALL CommandProcessorInfo::hasCommandByHandle( sal_Int32 Handle )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     com::sun::star::ucb::CommandInfo aInfo;
     return queryCommand( Handle, aInfo );
diff --git a/ucbhelper/source/provider/fd_inputstream.cxx b/ucbhelper/source/provider/fd_inputstream.cxx
index b7857b601e47..2c40d03ad9f8 100644
--- a/ucbhelper/source/provider/fd_inputstream.cxx
+++ b/ucbhelper/source/provider/fd_inputstream.cxx
@@ -57,7 +57,7 @@ namespace ucbhelper
         throw(NotConnectedException,
               BufferSizeExceededException,
               IOException,
-              RuntimeException)
+              RuntimeException, std::exception)
     {
         osl::MutexGuard aGuard(m_aMutex);
 
@@ -85,7 +85,7 @@ namespace ucbhelper
         throw( NotConnectedException,
                BufferSizeExceededException,
                IOException,
-               RuntimeException)
+               RuntimeException, std::exception)
     {
         return readBytes(aData,nMaxBytesToRead);
     }
@@ -96,7 +96,7 @@ namespace ucbhelper
         throw(NotConnectedException,
               BufferSizeExceededException,
               IOException,
-              RuntimeException)
+              RuntimeException, std::exception)
     {
         osl::MutexGuard aGuard(m_aMutex);
         if(!m_tmpfl)
@@ -111,7 +111,7 @@ namespace ucbhelper
     sal_Int32 SAL_CALL FdInputStream::available(void)
         throw(NotConnectedException,
               IOException,
-              RuntimeException)
+              RuntimeException, std::exception)
     {
         return sal::static_int_cast<sal_Int32>(m_nLength - getPosition());
     }
@@ -121,7 +121,7 @@ namespace ucbhelper
     void SAL_CALL FdInputStream::closeInput(void)
         throw(NotConnectedException,
               IOException,
-              RuntimeException)
+              RuntimeException, std::exception)
     {
         osl::MutexGuard aGuard(m_aMutex);
         if(m_tmpfl)
@@ -133,7 +133,7 @@ namespace ucbhelper
     void SAL_CALL FdInputStream::seek(sal_Int64 location)
         throw( IllegalArgumentException,
                IOException,
-               RuntimeException )
+               RuntimeException, std::exception )
     {
         osl::MutexGuard aGuard(m_aMutex);
         if(!m_tmpfl)
@@ -149,7 +149,7 @@ namespace ucbhelper
     FdInputStream::getPosition(
         void )
         throw( IOException,
-               RuntimeException )
+               RuntimeException, std::exception )
     {
         osl::MutexGuard aGuard(m_aMutex);
         if(!m_tmpfl)
@@ -165,7 +165,7 @@ namespace ucbhelper
     sal_Int64 SAL_CALL FdInputStream::getLength(
         void
     ) throw(
-        IOException,RuntimeException
+        IOException,RuntimeException, std::exception
     )
     {
         return m_nLength;
diff --git a/ucbhelper/source/provider/interactionrequest.cxx b/ucbhelper/source/provider/interactionrequest.cxx
index 96df2b6ac470..3521968a1ea4 100644
--- a/ucbhelper/source/provider/interactionrequest.cxx
+++ b/ucbhelper/source/provider/interactionrequest.cxx
@@ -128,7 +128,7 @@ void SAL_CALL InteractionRequest::release()
 // virtual
 uno::Any SAL_CALL
 InteractionRequest::queryInterface( const uno::Type & rType )
-    throw ( uno::RuntimeException )
+    throw ( uno::RuntimeException, std::exception )
 {
     uno::Any aRet = cppu::queryInterface( rType,
                 static_cast< lang::XTypeProvider * >( this ),
@@ -145,7 +145,7 @@ InteractionRequest::queryInterface( const uno::Type & rType )
 
 // virtual
 uno::Sequence< sal_Int8 > SAL_CALL InteractionRequest::getImplementationId()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     static cppu::OImplementationId* pId = NULL;
       if ( !pId )
@@ -163,7 +163,7 @@ uno::Sequence< sal_Int8 > SAL_CALL InteractionRequest::getImplementationId()
 
 // virtual
 uno::Sequence< uno::Type > SAL_CALL InteractionRequest::getTypes()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     static cppu::OTypeCollection* pCollection = 0;
       if ( !pCollection )
@@ -190,7 +190,7 @@ uno::Sequence< uno::Type > SAL_CALL InteractionRequest::getTypes()
 
 // virtual
 uno::Any SAL_CALL InteractionRequest::getRequest()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     return m_pImpl->m_aRequest;
 }
@@ -199,7 +199,7 @@ uno::Any SAL_CALL InteractionRequest::getRequest()
 // virtual
 uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL
 InteractionRequest::getContinuations()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     return m_pImpl->m_aContinuations;
 }
@@ -278,7 +278,7 @@ void SAL_CALL InteractionAbort::release()
 // virtual
 uno::Any SAL_CALL
 InteractionAbort::queryInterface( const uno::Type & rType )
-    throw ( uno::RuntimeException )
+    throw ( uno::RuntimeException, std::exception )
 {
     uno::Any aRet = cppu::queryInterface( rType,
                 static_cast< lang::XTypeProvider * >( this ),
@@ -297,7 +297,7 @@ InteractionAbort::queryInterface( const uno::Type & rType )
 
 // virtual
 uno::Sequence< sal_Int8 > SAL_CALL InteractionAbort::getImplementationId()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     static cppu::OImplementationId* pId = NULL;
       if ( !pId )
@@ -315,7 +315,7 @@ uno::Sequence< sal_Int8 > SAL_CALL InteractionAbort::getImplementationId()
 
 // virtual
 uno::Sequence< uno::Type > SAL_CALL InteractionAbort::getTypes()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     static cppu::OTypeCollection* pCollection = 0;
       if ( !pCollection )
@@ -342,7 +342,7 @@ uno::Sequence< uno::Type > SAL_CALL InteractionAbort::getTypes()
 
 // virtual
 void SAL_CALL InteractionAbort::select()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     recordSelection();
 }
@@ -380,7 +380,7 @@ void SAL_CALL InteractionRetry::release()
 // virtual
 uno::Any SAL_CALL
 InteractionRetry::queryInterface( const uno::Type & rType )
-    throw ( uno::RuntimeException )
+    throw ( uno::RuntimeException, std::exception )
 {
     uno::Any aRet = cppu::queryInterface( rType,
                 static_cast< lang::XTypeProvider * >( this ),
@@ -399,7 +399,7 @@ InteractionRetry::queryInterface( const uno::Type & rType )
 
 // virtual
 uno::Sequence< sal_Int8 > SAL_CALL InteractionRetry::getImplementationId()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     static cppu::OImplementationId* pId = NULL;
       if ( !pId )
@@ -417,7 +417,7 @@ uno::Sequence< sal_Int8 > SAL_CALL InteractionRetry::getImplementationId()
 
 // virtual
 uno::Sequence< uno::Type > SAL_CALL InteractionRetry::getTypes()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     static cppu::OTypeCollection* pCollection = 0;
       if ( !pCollection )
@@ -444,7 +444,7 @@ uno::Sequence< uno::Type > SAL_CALL InteractionRetry::getTypes()
 
 // virtual
 void SAL_CALL InteractionRetry::select()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     recordSelection();
 }
@@ -482,7 +482,7 @@ void SAL_CALL InteractionApprove::release()
 // virtual
 uno::Any SAL_CALL
 InteractionApprove::queryInterface( const uno::Type & rType )
-    throw ( uno::RuntimeException )
+    throw ( uno::RuntimeException, std::exception )
 {
     uno::Any aRet = cppu::queryInterface( rType,
                 static_cast< lang::XTypeProvider * >( this ),
@@ -501,7 +501,7 @@ InteractionApprove::queryInterface( const uno::Type & rType )
 
 // virtual
 uno::Sequence< sal_Int8 > SAL_CALL InteractionApprove::getImplementationId()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     static cppu::OImplementationId* pId = NULL;
       if ( !pId )
@@ -519,7 +519,7 @@ uno::Sequence< sal_Int8 > SAL_CALL InteractionApprove::getImplementationId()
 
 // virtual
 uno::Sequence< uno::Type > SAL_CALL InteractionApprove::getTypes()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     static cppu::OTypeCollection* pCollection = 0;
       if ( !pCollection )
@@ -546,7 +546,7 @@ uno::Sequence< uno::Type > SAL_CALL InteractionApprove::getTypes()
 
 // virtual
 void SAL_CALL InteractionApprove::select()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     recordSelection();
 }
@@ -584,7 +584,7 @@ void SAL_CALL InteractionDisapprove::release()
 // virtual
 uno::Any SAL_CALL
 InteractionDisapprove::queryInterface( const uno::Type & rType )
-    throw ( uno::RuntimeException )
+    throw ( uno::RuntimeException, std::exception )
 {
     uno::Any aRet = cppu::queryInterface( rType,
                 static_cast< lang::XTypeProvider * >( this ),
@@ -603,7 +603,7 @@ InteractionDisapprove::queryInterface( const uno::Type & rType )
 
 // virtual
 uno::Sequence< sal_Int8 > SAL_CALL InteractionDisapprove::getImplementationId()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     static cppu::OImplementationId* pId = NULL;
       if ( !pId )
@@ -621,7 +621,7 @@ uno::Sequence< sal_Int8 > SAL_CALL InteractionDisapprove::getImplementationId()
 
 // virtual
 uno::Sequence< uno::Type > SAL_CALL InteractionDisapprove::getTypes()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     static cppu::OTypeCollection* pCollection = 0;
       if ( !pCollection )
@@ -648,7 +648,7 @@ uno::Sequence< uno::Type > SAL_CALL InteractionDisapprove::getTypes()
 
 // virtual
 void SAL_CALL InteractionDisapprove::select()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     recordSelection();
 }
@@ -686,7 +686,7 @@ void SAL_CALL InteractionSupplyAuthentication::release()
 // virtual
 uno::Any SAL_CALL
 InteractionSupplyAuthentication::queryInterface( const uno::Type & rType )
-    throw ( uno::RuntimeException )
+    throw ( uno::RuntimeException, std::exception )
 {
     uno::Any aRet = cppu::queryInterface( rType,
             static_cast< lang::XTypeProvider * >( this ),
@@ -707,7 +707,7 @@ InteractionSupplyAuthentication::queryInterface( const uno::Type & rType )
 // virtual
 uno::Sequence< sal_Int8 > SAL_CALL
 InteractionSupplyAuthentication::getImplementationId()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     static cppu::OImplementationId* pId = NULL;
       if ( !pId )
@@ -725,7 +725,7 @@ InteractionSupplyAuthentication::getImplementationId()
 
 // virtual
 uno::Sequence< uno::Type > SAL_CALL InteractionSupplyAuthentication::getTypes()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     static cppu::OTypeCollection* pCollection = 0;
       if ( !pCollection )
@@ -753,7 +753,7 @@ uno::Sequence< uno::Type > SAL_CALL InteractionSupplyAuthentication::getTypes()
 
 // virtual
 void SAL_CALL InteractionSupplyAuthentication::select()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     recordSelection();
 }
@@ -767,7 +767,7 @@ void SAL_CALL InteractionSupplyAuthentication::select()
 // virtual
 sal_Bool SAL_CALL
 InteractionSupplyAuthentication::canSetRealm()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     return m_bCanSetRealm;
 }
@@ -776,7 +776,7 @@ InteractionSupplyAuthentication::canSetRealm()
 // virtual
 void SAL_CALL
 InteractionSupplyAuthentication::setRealm( const OUString& Realm )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     OSL_ENSURE( m_bCanSetPassword,
         "InteractionSupplyAuthentication::setRealm - Not supported!" );
@@ -789,7 +789,7 @@ InteractionSupplyAuthentication::setRealm( const OUString& Realm )
 // virtual
 sal_Bool SAL_CALL
 InteractionSupplyAuthentication::canSetUserName()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     return m_bCanSetUserName;
 }
@@ -798,7 +798,7 @@ InteractionSupplyAuthentication::canSetUserName()
 // virtual
 void SAL_CALL
 InteractionSupplyAuthentication::setUserName( const OUString& UserName )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     OSL_ENSURE( m_bCanSetUserName,
         "InteractionSupplyAuthentication::setUserName - Not supported!" );
@@ -811,7 +811,7 @@ InteractionSupplyAuthentication::setUserName( const OUString& UserName )
 // virtual
 sal_Bool SAL_CALL
 InteractionSupplyAuthentication::canSetPassword()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     return m_bCanSetPassword;
 }
@@ -820,7 +820,7 @@ InteractionSupplyAuthentication::canSetPassword()
 // virtual
 void SAL_CALL
 InteractionSupplyAuthentication::setPassword( const OUString& Password )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     OSL_ENSURE( m_bCanSetPassword,
         "InteractionSupplyAuthentication::setPassword - Not supported!" );
@@ -834,7 +834,7 @@ InteractionSupplyAuthentication::setPassword( const OUString& Password )
 uno::Sequence< ucb::RememberAuthentication > SAL_CALL
 InteractionSupplyAuthentication::getRememberPasswordModes(
                                     ucb::RememberAuthentication& Default )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     Default = m_eDefaultRememberPasswordMode;
     return m_aRememberPasswordModes;
@@ -845,7 +845,7 @@ InteractionSupplyAuthentication::getRememberPasswordModes(
 void SAL_CALL
 InteractionSupplyAuthentication::setRememberPassword(
                                     ucb::RememberAuthentication Remember )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     m_eRememberPasswordMode = Remember;
 }
@@ -854,7 +854,7 @@ InteractionSupplyAuthentication::setRememberPassword(
 // virtual
 sal_Bool SAL_CALL
 InteractionSupplyAuthentication::canSetAccount()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     return m_bCanSetAccount;
 }
@@ -863,7 +863,7 @@ InteractionSupplyAuthentication::canSetAccount()
 // virtual
 void SAL_CALL
 InteractionSupplyAuthentication::setAccount( const OUString& Account )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     OSL_ENSURE( m_bCanSetAccount,
         "InteractionSupplyAuthentication::setAccount - Not supported!" );
@@ -877,7 +877,7 @@ InteractionSupplyAuthentication::setAccount( const OUString& Account )
 uno::Sequence< ucb::RememberAuthentication > SAL_CALL
 InteractionSupplyAuthentication::getRememberAccountModes(
                                     ucb::RememberAuthentication& Default )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     Default = m_eDefaultRememberAccountMode;
     return m_aRememberAccountModes;
@@ -887,7 +887,7 @@ InteractionSupplyAuthentication::getRememberAccountModes(
 // virtual
 void SAL_CALL InteractionSupplyAuthentication::setRememberAccount(
                                     ucb::RememberAuthentication Remember )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     m_eRememberAccountMode = Remember;
 }
@@ -902,7 +902,7 @@ void SAL_CALL InteractionSupplyAuthentication::setRememberAccount(
 ::sal_Bool SAL_CALL
 InteractionSupplyAuthentication::canUseSystemCredentials(
         ::sal_Bool& Default )
-    throw ( uno::RuntimeException )
+    throw ( uno::RuntimeException, std::exception )
 {
     Default = m_bDefaultUseSystemCredentials;
     return m_bCanUseSystemCredentials;
@@ -912,7 +912,7 @@ InteractionSupplyAuthentication::canUseSystemCredentials(
 // virtual
 void SAL_CALL InteractionSupplyAuthentication::setUseSystemCredentials(
         ::sal_Bool UseSystemCredentials )
-    throw ( uno::RuntimeException )
+    throw ( uno::RuntimeException, std::exception )
 {
     if ( m_bCanUseSystemCredentials )
         m_bUseSystemCredentials = UseSystemCredentials;
@@ -952,7 +952,7 @@ void SAL_CALL InteractionSupplyName::release()
 // virtual
 uno::Any SAL_CALL
 InteractionSupplyName::queryInterface( const uno::Type & rType )
-    throw ( uno::RuntimeException )
+    throw ( uno::RuntimeException, std::exception )
 {
     uno::Any aRet = cppu::queryInterface( rType,
                 static_cast< lang::XTypeProvider * >( this ),
@@ -971,7 +971,7 @@ InteractionSupplyName::queryInterface( const uno::Type & rType )
 
 // virtual
 uno::Sequence< sal_Int8 > SAL_CALL InteractionSupplyName::getImplementationId()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     static cppu::OImplementationId* pId = NULL;
       if ( !pId )
@@ -989,7 +989,7 @@ uno::Sequence< sal_Int8 > SAL_CALL InteractionSupplyName::getImplementationId()
 
 // virtual
 uno::Sequence< uno::Type > SAL_CALL InteractionSupplyName::getTypes()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     static cppu::OTypeCollection* pCollection = 0;
       if ( !pCollection )
@@ -1016,7 +1016,7 @@ uno::Sequence< uno::Type > SAL_CALL InteractionSupplyName::getTypes()
 
 // virtual
 void SAL_CALL InteractionSupplyName::select()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     recordSelection();
 }
@@ -1030,7 +1030,7 @@ void SAL_CALL InteractionSupplyName::select()
 // virtual
 void SAL_CALL
 InteractionSupplyName::setName( const OUString& Name )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     m_aName = Name;
 }
@@ -1068,7 +1068,7 @@ void SAL_CALL InteractionReplaceExistingData::release()
 // virtual
 uno::Any SAL_CALL
 InteractionReplaceExistingData::queryInterface( const uno::Type & rType )
-    throw ( uno::RuntimeException )
+    throw ( uno::RuntimeException, std::exception )
 {
     uno::Any aRet = cppu::queryInterface( rType,
                 static_cast< lang::XTypeProvider * >( this ),
@@ -1088,7 +1088,7 @@ InteractionReplaceExistingData::queryInterface( const uno::Type & rType )
 // virtual
 uno::Sequence< sal_Int8 > SAL_CALL
 InteractionReplaceExistingData::getImplementationId()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     static cppu::OImplementationId* pId = NULL;
       if ( !pId )
@@ -1106,7 +1106,7 @@ InteractionReplaceExistingData::getImplementationId()
 
 // virtual
 uno::Sequence< uno::Type > SAL_CALL InteractionReplaceExistingData::getTypes()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     static cppu::OTypeCollection* pCollection = 0;
       if ( !pCollection )
@@ -1134,7 +1134,7 @@ uno::Sequence< uno::Type > SAL_CALL InteractionReplaceExistingData::getTypes()
 
 // virtual
 void SAL_CALL InteractionReplaceExistingData::select()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     recordSelection();
 }
diff --git a/ucbhelper/source/provider/propertyvalueset.cxx b/ucbhelper/source/provider/propertyvalueset.cxx
index bdb96324b584..7c77cbe667d9 100644
--- a/ucbhelper/source/provider/propertyvalueset.cxx
+++ b/ucbhelper/source/provider/propertyvalueset.cxx
@@ -298,7 +298,7 @@ XTYPEPROVIDER_IMPL_3( PropertyValueSet,
 
 // virtual
 sal_Bool SAL_CALL PropertyValueSet::wasNull()
-    throw( SQLException, RuntimeException )
+    throw( SQLException, RuntimeException, std::exception )
 {
     // This method can not be implemented correctly!!! Imagine different
     // threads doing a getXYZ - wasNull calling sequence on the same
@@ -309,7 +309,7 @@ sal_Bool SAL_CALL PropertyValueSet::wasNull()
 
 // virtual
 OUString SAL_CALL PropertyValueSet::getString( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException )
+    throw( SQLException, RuntimeException, std::exception )
 {
     GETVALUE_IMPL( OUString, STRING_VALUE_SET, aString );
 }
@@ -317,7 +317,7 @@ OUString SAL_CALL PropertyValueSet::getString( sal_Int32 columnIndex )
 
 // virtual
 sal_Bool SAL_CALL PropertyValueSet::getBoolean( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException )
+    throw( SQLException, RuntimeException, std::exception )
 {
     GETVALUE_IMPL_TYPE(
             bool, BOOLEAN_VALUE_SET, bBoolean, getCppuBooleanType() );
@@ -326,7 +326,7 @@ sal_Bool SAL_CALL PropertyValueSet::getBoolean( sal_Int32 columnIndex )
 
 // virtual
 sal_Int8 SAL_CALL PropertyValueSet::getByte( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException )
+    throw( SQLException, RuntimeException, std::exception )
 {
     GETVALUE_IMPL( sal_Int8, BYTE_VALUE_SET, nByte );
 }
@@ -334,7 +334,7 @@ sal_Int8 SAL_CALL PropertyValueSet::getByte( sal_Int32 columnIndex )
 
 // virtual
 sal_Int16 SAL_CALL PropertyValueSet::getShort( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException )
+    throw( SQLException, RuntimeException, std::exception )
 {
     GETVALUE_IMPL( sal_Int16, SHORT_VALUE_SET, nShort );
 }
@@ -342,7 +342,7 @@ sal_Int16 SAL_CALL PropertyValueSet::getShort( sal_Int32 columnIndex )
 
 // virtual
 sal_Int32 SAL_CALL PropertyValueSet::getInt( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException )
+    throw( SQLException, RuntimeException, std::exception )
 {
     GETVALUE_IMPL( sal_Int32, INT_VALUE_SET, nInt );
 }
@@ -350,7 +350,7 @@ sal_Int32 SAL_CALL PropertyValueSet::getInt( sal_Int32 columnIndex )
 
 // virtual
 sal_Int64 SAL_CALL PropertyValueSet::getLong( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException )
+    throw( SQLException, RuntimeException, std::exception )
 {
     GETVALUE_IMPL( sal_Int64, LONG_VALUE_SET, nLong );
 }
@@ -358,7 +358,7 @@ sal_Int64 SAL_CALL PropertyValueSet::getLong( sal_Int32 columnIndex )
 
 // virtual
 float SAL_CALL PropertyValueSet::getFloat( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException )
+    throw( SQLException, RuntimeException, std::exception )
 {
     GETVALUE_IMPL( float, FLOAT_VALUE_SET, nFloat );
 }
@@ -366,7 +366,7 @@ float SAL_CALL PropertyValueSet::getFloat( sal_Int32 columnIndex )
 
 // virtual
 double SAL_CALL PropertyValueSet::getDouble( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException )
+    throw( SQLException, RuntimeException, std::exception )
 {
     GETVALUE_IMPL( double, DOUBLE_VALUE_SET, nDouble );
 }
@@ -375,7 +375,7 @@ double SAL_CALL PropertyValueSet::getDouble( sal_Int32 columnIndex )
 // virtual
 Sequence< sal_Int8 > SAL_CALL
 PropertyValueSet::getBytes( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException )
+    throw( SQLException, RuntimeException, std::exception )
 {
     GETVALUE_IMPL( Sequence< sal_Int8 >, BYTES_VALUE_SET, aBytes );
 }
@@ -383,7 +383,7 @@ PropertyValueSet::getBytes( sal_Int32 columnIndex )
 
 // virtual
 Date SAL_CALL PropertyValueSet::getDate( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException )
+    throw( SQLException, RuntimeException, std::exception )
 {
     GETVALUE_IMPL( Date, DATE_VALUE_SET, aDate );
 }
@@ -391,7 +391,7 @@ Date SAL_CALL PropertyValueSet::getDate( sal_Int32 columnIndex )
 
 // virtual
 Time SAL_CALL PropertyValueSet::getTime( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException )
+    throw( SQLException, RuntimeException, std::exception )
 {
     GETVALUE_IMPL( Time, TIME_VALUE_SET, aTime );
 }
@@ -399,7 +399,7 @@ Time SAL_CALL PropertyValueSet::getTime( sal_Int32 columnIndex )
 
 // virtual
 DateTime SAL_CALL PropertyValueSet::getTimestamp( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException )
+    throw( SQLException, RuntimeException, std::exception )
 {
     GETVALUE_IMPL( DateTime, TIMESTAMP_VALUE_SET, aTimestamp );
 }
@@ -408,7 +408,7 @@ DateTime SAL_CALL PropertyValueSet::getTimestamp( sal_Int32 columnIndex )
 // virtual
 Reference< XInputStream > SAL_CALL
 PropertyValueSet::getBinaryStream( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException )
+    throw( SQLException, RuntimeException, std::exception )
 {
     GETVALUE_IMPL(
         Reference< XInputStream >, BINARYSTREAM_VALUE_SET, xBinaryStream );
@@ -418,7 +418,7 @@ PropertyValueSet::getBinaryStream( sal_Int32 columnIndex )
 // virtual
 Reference< XInputStream > SAL_CALL
 PropertyValueSet::getCharacterStream( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException )
+    throw( SQLException, RuntimeException, std::exception )
 {
     GETVALUE_IMPL(
         Reference< XInputStream >, CHARACTERSTREAM_VALUE_SET, xCharacterStream );
@@ -429,7 +429,7 @@ PropertyValueSet::getCharacterStream( sal_Int32 columnIndex )
 Any SAL_CALL PropertyValueSet::getObject(
                                     sal_Int32 columnIndex,
                                          const Reference< XNameAccess >& )
-    throw( SQLException, RuntimeException )
+    throw( SQLException, RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -557,7 +557,7 @@ Any SAL_CALL PropertyValueSet::getObject(
 
 // virtual
 Reference< XRef > SAL_CALL PropertyValueSet::getRef( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException )
+    throw( SQLException, RuntimeException, std::exception )
 {
     GETVALUE_IMPL( Reference< XRef >, REF_VALUE_SET, xRef );
 }
@@ -565,7 +565,7 @@ Reference< XRef > SAL_CALL PropertyValueSet::getRef( sal_Int32 columnIndex )
 
 // virtual
 Reference< XBlob > SAL_CALL PropertyValueSet::getBlob( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException )
+    throw( SQLException, RuntimeException, std::exception )
 {
     GETVALUE_IMPL( Reference< XBlob >, BLOB_VALUE_SET, xBlob );
 }
@@ -573,7 +573,7 @@ Reference< XBlob > SAL_CALL PropertyValueSet::getBlob( sal_Int32 columnIndex )
 
 // virtual
 Reference< XClob > SAL_CALL PropertyValueSet::getClob( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException )
+    throw( SQLException, RuntimeException, std::exception )
 {
     GETVALUE_IMPL( Reference< XClob >, CLOB_VALUE_SET, xClob );
 }
@@ -581,7 +581,7 @@ Reference< XClob > SAL_CALL PropertyValueSet::getClob( sal_Int32 columnIndex )
 
 // virtual
 Reference< XArray > SAL_CALL PropertyValueSet::getArray( sal_Int32 columnIndex )
-    throw( SQLException, RuntimeException )
+    throw( SQLException, RuntimeException, std::exception )
 {
     GETVALUE_IMPL( Reference< XArray >, ARRAY_VALUE_SET, xArray );
 }
@@ -594,7 +594,7 @@ Reference< XArray > SAL_CALL PropertyValueSet::getArray( sal_Int32 columnIndex )
 
 // virtual
 sal_Int32 SAL_CALL PropertyValueSet::findColumn( const OUString& columnName )
-    throw( SQLException, RuntimeException )
+    throw( SQLException, RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
diff --git a/ucbhelper/source/provider/providerhelper.cxx b/ucbhelper/source/provider/providerhelper.cxx
index b5b50c255642..2678099b8b35 100644
--- a/ucbhelper/source/provider/providerhelper.cxx
+++ b/ucbhelper/source/provider/providerhelper.cxx
@@ -102,7 +102,7 @@ XTYPEPROVIDER_IMPL_3( ContentProviderImplHelper,
 // virtual
 sal_Bool SAL_CALL ContentProviderImplHelper::supportsService(
                                             const OUString& ServiceName )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, ServiceName);
 }
@@ -111,7 +111,7 @@ sal_Bool SAL_CALL ContentProviderImplHelper::supportsService(
 sal_Int32 SAL_CALL ContentProviderImplHelper::compareContentIds(
         const uno::Reference< com::sun::star::ucb::XContentIdentifier >& Id1,
         const uno::Reference< com::sun::star::ucb::XContentIdentifier >& Id2 )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     // Simply do a string compare.
 
diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx
index 799910351e93..3b8c9073de13 100644
--- a/ucbhelper/source/provider/resultset.cxx
+++ b/ucbhelper/source/provider/resultset.cxx
@@ -106,12 +106,12 @@ public:
 
     // XPropertySetInfo
     virtual uno::Sequence< beans::Property > SAL_CALL getProperties()
-        throw( uno::RuntimeException );
+        throw( uno::RuntimeException, std::exception );
     virtual beans::Property SAL_CALL getPropertyByName(
             const OUString& aName )
-        throw( beans::UnknownPropertyException, uno::RuntimeException );
+        throw( beans::UnknownPropertyException, uno::RuntimeException, std::exception );
     virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name )
-        throw( uno::RuntimeException );
+        throw( uno::RuntimeException, std::exception );
 };
 
 
@@ -291,7 +291,7 @@ XSERVICEINFO_NOFACTORY_IMPL_1( ResultSet,
 
 // virtual
 void SAL_CALL ResultSet::dispose()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_pImpl->m_aMutex );
 
@@ -317,7 +317,7 @@ void SAL_CALL ResultSet::dispose()
 // virtual
 void SAL_CALL ResultSet::addEventListener(
         const uno::Reference< lang::XEventListener >& Listener )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_pImpl->m_aMutex );
 
@@ -332,7 +332,7 @@ void SAL_CALL ResultSet::addEventListener(
 // virtual
 void SAL_CALL ResultSet::removeEventListener(
         const uno::Reference< lang::XEventListener >& Listener )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_pImpl->m_aMutex );
 
@@ -348,7 +348,7 @@ void SAL_CALL ResultSet::removeEventListener(
 
 // virtual
 uno::Reference< sdbc::XResultSetMetaData > SAL_CALL ResultSet::getMetaData()
-    throw( sdbc::SQLException, uno::RuntimeException )
+    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_pImpl->m_aMutex );
 
@@ -367,7 +367,7 @@ uno::Reference< sdbc::XResultSetMetaData > SAL_CALL ResultSet::getMetaData()
 
 // virtual
 sal_Bool SAL_CALL ResultSet::next()
-    throw( sdbc::SQLException, uno::RuntimeException )
+    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     // Note: Cursor is initially positioned before the first row.
     //       First call to 'next()' moves it to first row.
@@ -396,7 +396,7 @@ sal_Bool SAL_CALL ResultSet::next()
 
 // virtual
 sal_Bool SAL_CALL ResultSet::isBeforeFirst()
-    throw( sdbc::SQLException, uno::RuntimeException )
+    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_bAfterLast )
     {
@@ -418,7 +418,7 @@ sal_Bool SAL_CALL ResultSet::isBeforeFirst()
 
 // virtual
 sal_Bool SAL_CALL ResultSet::isAfterLast()
-    throw( sdbc::SQLException, uno::RuntimeException )
+    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     m_pImpl->m_xDataSupplier->validate();
     return m_pImpl->m_bAfterLast;
@@ -427,7 +427,7 @@ sal_Bool SAL_CALL ResultSet::isAfterLast()
 
 // virtual
 sal_Bool SAL_CALL ResultSet::isFirst()
-    throw( sdbc::SQLException, uno::RuntimeException )
+    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_bAfterLast )
     {
@@ -442,7 +442,7 @@ sal_Bool SAL_CALL ResultSet::isFirst()
 
 // virtual
 sal_Bool SAL_CALL ResultSet::isLast()
-    throw( sdbc::SQLException, uno::RuntimeException )
+    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_bAfterLast )
     {
@@ -464,7 +464,7 @@ sal_Bool SAL_CALL ResultSet::isLast()
 
 // virtual
 void SAL_CALL ResultSet::beforeFirst()
-    throw( sdbc::SQLException, uno::RuntimeException )
+    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_pImpl->m_aMutex );
     m_pImpl->m_bAfterLast = false;
@@ -475,7 +475,7 @@ void SAL_CALL ResultSet::beforeFirst()
 
 // virtual
 void SAL_CALL ResultSet::afterLast()
-    throw( sdbc::SQLException, uno::RuntimeException )
+    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_pImpl->m_aMutex );
     m_pImpl->m_bAfterLast = true;
@@ -485,7 +485,7 @@ void SAL_CALL ResultSet::afterLast()
 
 // virtual
 sal_Bool SAL_CALL ResultSet::first()
-    throw( sdbc::SQLException, uno::RuntimeException )
+    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     // getResult works zero-based!
     if ( m_pImpl->m_xDataSupplier->getResult( 0 ) )
@@ -504,7 +504,7 @@ sal_Bool SAL_CALL ResultSet::first()
 
 // virtual
 sal_Bool SAL_CALL ResultSet::last()
-    throw( sdbc::SQLException, uno::RuntimeException )
+    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     sal_Int32 nCount = m_pImpl->m_xDataSupplier->totalCount();
     if ( nCount )
@@ -523,7 +523,7 @@ sal_Bool SAL_CALL ResultSet::last()
 
 // virtual
 sal_Int32 SAL_CALL ResultSet::getRow()
-    throw( sdbc::SQLException, uno::RuntimeException )
+    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_bAfterLast )
     {
@@ -538,7 +538,7 @@ sal_Int32 SAL_CALL ResultSet::getRow()
 
 // virtual
 sal_Bool SAL_CALL ResultSet::absolute( sal_Int32 row )
-    throw( sdbc::SQLException, uno::RuntimeException )
+    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
 /*
     If the row number is positive, the cursor moves to the given row number
@@ -611,7 +611,7 @@ sal_Bool SAL_CALL ResultSet::absolute( sal_Int32 row )
 
 // virtual
 sal_Bool SAL_CALL ResultSet::relative( sal_Int32 rows )
-    throw( sdbc::SQLException, uno::RuntimeException )
+    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
 /*
     Attempting to move beyond the first/last row in the result set
@@ -681,7 +681,7 @@ sal_Bool SAL_CALL ResultSet::relative( sal_Int32 rows )
 
 // virtual
 sal_Bool SAL_CALL ResultSet::previous()
-    throw( sdbc::SQLException, uno::RuntimeException )
+    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
 /*
     previous() is not the same as relative( -1 ) because it makes sense
@@ -711,7 +711,7 @@ sal_Bool SAL_CALL ResultSet::previous()
 
 // virtual
 void SAL_CALL ResultSet::refreshRow()
-    throw( sdbc::SQLException, uno::RuntimeException )
+    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_pImpl->m_aMutex );
     if ( m_pImpl->m_bAfterLast || ( m_pImpl->m_nPos == 0 ) )
@@ -724,7 +724,7 @@ void SAL_CALL ResultSet::refreshRow()
 
 // virtual
 sal_Bool SAL_CALL ResultSet::rowUpdated()
-    throw( sdbc::SQLException, uno::RuntimeException )
+    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     m_pImpl->m_xDataSupplier->validate();
     return sal_False;
@@ -733,7 +733,7 @@ sal_Bool SAL_CALL ResultSet::rowUpdated()
 
 // virtual
 sal_Bool SAL_CALL ResultSet::rowInserted()
-    throw( sdbc::SQLException, uno::RuntimeException )
+    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     m_pImpl->m_xDataSupplier->validate();
     return sal_False;
@@ -742,7 +742,7 @@ sal_Bool SAL_CALL ResultSet::rowInserted()
 
 // virtual
 sal_Bool SAL_CALL ResultSet::rowDeleted()
-    throw( sdbc::SQLException, uno::RuntimeException )
+    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     m_pImpl->m_xDataSupplier->validate();
     return sal_False;
@@ -751,7 +751,7 @@ sal_Bool SAL_CALL ResultSet::rowDeleted()
 
 // virtual
 uno::Reference< uno::XInterface > SAL_CALL ResultSet::getStatement()
-    throw( sdbc::SQLException, uno::RuntimeException )
+    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
 /*
     returns the Statement that produced this ResultSet object. If the
@@ -769,7 +769,7 @@ uno::Reference< uno::XInterface > SAL_CALL ResultSet::getStatement()
 
 // virtual
 sal_Bool SAL_CALL ResultSet::wasNull()
-    throw( sdbc::SQLException, uno::RuntimeException )
+    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     // This method can not be implemented correctly!!! Imagine different
     // threads doing a getXYZ - wasNull calling sequence on the same
@@ -794,7 +794,7 @@ sal_Bool SAL_CALL ResultSet::wasNull()
 
 // virtual
 OUString SAL_CALL ResultSet::getString( sal_Int32 columnIndex )
-    throw( sdbc::SQLException, uno::RuntimeException )
+    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
     {
@@ -817,7 +817,7 @@ OUString SAL_CALL ResultSet::getString( sal_Int32 columnIndex )
 
 // virtual
 sal_Bool SAL_CALL ResultSet::getBoolean( sal_Int32 columnIndex )
-    throw( sdbc::SQLException, uno::RuntimeException )
+    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
     {
@@ -840,7 +840,7 @@ sal_Bool SAL_CALL ResultSet::getBoolean( sal_Int32 columnIndex )
 
 // virtual
 sal_Int8 SAL_CALL ResultSet::getByte( sal_Int32 columnIndex )
-    throw( sdbc::SQLException, uno::RuntimeException )
+    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
     {
@@ -863,7 +863,7 @@ sal_Int8 SAL_CALL ResultSet::getByte( sal_Int32 columnIndex )
 
 // virtual
 sal_Int16 SAL_CALL ResultSet::getShort( sal_Int32 columnIndex )
-    throw( sdbc::SQLException, uno::RuntimeException )
+    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
     {
@@ -886,7 +886,7 @@ sal_Int16 SAL_CALL ResultSet::getShort( sal_Int32 columnIndex )
 
 // virtual
 sal_Int32 SAL_CALL ResultSet::getInt( sal_Int32 columnIndex )
-    throw( sdbc::SQLException, uno::RuntimeException )
+    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
     {
@@ -909,7 +909,7 @@ sal_Int32 SAL_CALL ResultSet::getInt( sal_Int32 columnIndex )
 
 // virtual
 sal_Int64 SAL_CALL ResultSet::getLong( sal_Int32 columnIndex )
-    throw( sdbc::SQLException, uno::RuntimeException )
+    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
     {
@@ -932,7 +932,7 @@ sal_Int64 SAL_CALL ResultSet::getLong( sal_Int32 columnIndex )
 
 // virtual
 float SAL_CALL ResultSet::getFloat( sal_Int32 columnIndex )
-    throw( sdbc::SQLException, uno::RuntimeException )
+    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
     {
@@ -955,7 +955,7 @@ float SAL_CALL ResultSet::getFloat( sal_Int32 columnIndex )
 
 // virtual
 double SAL_CALL ResultSet::getDouble( sal_Int32 columnIndex )
-    throw( sdbc::SQLException, uno::RuntimeException )
+    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
     {
@@ -979,7 +979,7 @@ double SAL_CALL ResultSet::getDouble( sal_Int32 columnIndex )
 // virtual
 uno::Sequence< sal_Int8 > SAL_CALL
 ResultSet::getBytes( sal_Int32 columnIndex )
-    throw( sdbc::SQLException, uno::RuntimeException )
+    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
     {
@@ -1002,7 +1002,7 @@ ResultSet::getBytes( sal_Int32 columnIndex )
 
 // virtual
 util::Date SAL_CALL ResultSet::getDate( sal_Int32 columnIndex )
-    throw( sdbc::SQLException, uno::RuntimeException )
+    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
     {
@@ -1025,7 +1025,7 @@ util::Date SAL_CALL ResultSet::getDate( sal_Int32 columnIndex )
 
 // virtual
 util::Time SAL_CALL ResultSet::getTime( sal_Int32 columnIndex )
-    throw( sdbc::SQLException, uno::RuntimeException )
+    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
     {
@@ -1049,7 +1049,7 @@ util::Time SAL_CALL ResultSet::getTime( sal_Int32 columnIndex )
 // virtual
 util::DateTime SAL_CALL
 ResultSet::getTimestamp( sal_Int32 columnIndex )
-    throw( sdbc::SQLException, uno::RuntimeException )
+    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
     {
@@ -1073,7 +1073,7 @@ ResultSet::getTimestamp( sal_Int32 columnIndex )
 // virtual
 uno::Reference< io::XInputStream > SAL_CALL
 ResultSet::getBinaryStream( sal_Int32 columnIndex )
-    throw( sdbc::SQLException, uno::RuntimeException )
+    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
     {
@@ -1097,7 +1097,7 @@ ResultSet::getBinaryStream( sal_Int32 columnIndex )
 // virtual
 uno::Reference< io::XInputStream > SAL_CALL
 ResultSet::getCharacterStream( sal_Int32 columnIndex )
-    throw( sdbc::SQLException, uno::RuntimeException )
+    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
     {
@@ -1122,7 +1122,7 @@ ResultSet::getCharacterStream( sal_Int32 columnIndex )
 uno::Any SAL_CALL ResultSet::getObject(
         sal_Int32 columnIndex,
         const uno::Reference< container::XNameAccess >& typeMap )
-    throw( sdbc::SQLException, uno::RuntimeException )
+    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
     {
@@ -1146,7 +1146,7 @@ uno::Any SAL_CALL ResultSet::getObject(
 // virtual
 uno::Reference< sdbc::XRef > SAL_CALL
 ResultSet::getRef( sal_Int32 columnIndex )
-    throw( sdbc::SQLException, uno::RuntimeException )
+    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
     {
@@ -1170,7 +1170,7 @@ ResultSet::getRef( sal_Int32 columnIndex )
 // virtual
 uno::Reference< sdbc::XBlob > SAL_CALL
 ResultSet::getBlob( sal_Int32 columnIndex )
-    throw( sdbc::SQLException, uno::RuntimeException )
+    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
     {
@@ -1194,7 +1194,7 @@ ResultSet::getBlob( sal_Int32 columnIndex )
 // virtual
 uno::Reference< sdbc::XClob > SAL_CALL
 ResultSet::getClob( sal_Int32 columnIndex )
-    throw( sdbc::SQLException, uno::RuntimeException )
+    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
     {
@@ -1218,7 +1218,7 @@ ResultSet::getClob( sal_Int32 columnIndex )
 // virtual
 uno::Reference< sdbc::XArray > SAL_CALL
 ResultSet::getArray( sal_Int32 columnIndex )
-    throw( sdbc::SQLException, uno::RuntimeException )
+    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
     {
@@ -1246,7 +1246,7 @@ ResultSet::getArray( sal_Int32 columnIndex )
 
 // virtual
 void SAL_CALL ResultSet::close()
-    throw( sdbc::SQLException, uno::RuntimeException )
+    throw( sdbc::SQLException, uno::RuntimeException, std::exception )
 {
     m_pImpl->m_xDataSupplier->close();
     m_pImpl->m_xDataSupplier->validate();
@@ -1260,7 +1260,7 @@ void SAL_CALL ResultSet::close()
 
 // virtual
 OUString SAL_CALL ResultSet::queryContentIdentifierString()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
         return m_pImpl->m_xDataSupplier->queryContentIdentifierString(
@@ -1273,7 +1273,7 @@ OUString SAL_CALL ResultSet::queryContentIdentifierString()
 // virtual
 uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL
 ResultSet::queryContentIdentifier()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
         return m_pImpl->m_xDataSupplier->queryContentIdentifier(
@@ -1286,7 +1286,7 @@ ResultSet::queryContentIdentifier()
 // virtual
 uno::Reference< com::sun::star::ucb::XContent > SAL_CALL
 ResultSet::queryContent()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     if ( m_pImpl->m_nPos && !m_pImpl->m_bAfterLast )
         return m_pImpl->m_xDataSupplier->queryContent( m_pImpl->m_nPos - 1 );
@@ -1303,7 +1303,7 @@ ResultSet::queryContent()
 // virtual
 uno::Reference< beans::XPropertySetInfo > SAL_CALL
 ResultSet::getPropertySetInfo()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_pImpl->m_aMutex );
 
@@ -1322,7 +1322,7 @@ void SAL_CALL ResultSet::setPropertyValue( const OUString& aPropertyName,
            beans::PropertyVetoException,
            lang::IllegalArgumentException,
            lang::WrappedTargetException,
-           uno::RuntimeException )
+           uno::RuntimeException, std::exception )
 {
     if ( aPropertyName.isEmpty() )
         throw beans::UnknownPropertyException();
@@ -1351,7 +1351,7 @@ uno::Any SAL_CALL ResultSet::getPropertyValue(
         const OUString& PropertyName )
     throw( beans::UnknownPropertyException,
            lang::WrappedTargetException,
-           uno::RuntimeException )
+           uno::RuntimeException, std::exception )
 {
     if ( PropertyName.isEmpty() )
         throw beans::UnknownPropertyException();
@@ -1383,7 +1383,7 @@ void SAL_CALL ResultSet::addPropertyChangeListener(
         const uno::Reference< beans::XPropertyChangeListener >& xListener )
     throw( beans::UnknownPropertyException,
            lang::WrappedTargetException,
-           uno::RuntimeException )
+           uno::RuntimeException, std::exception )
 {
     // Note: An empty property name means a listener for "all" properties.
 
@@ -1411,7 +1411,7 @@ void SAL_CALL ResultSet::removePropertyChangeListener(
         const uno::Reference< beans::XPropertyChangeListener >& xListener )
     throw( beans::UnknownPropertyException,
            lang::WrappedTargetException,
-           uno::RuntimeException )
+           uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_pImpl->m_aMutex );
 
@@ -1435,7 +1435,7 @@ void SAL_CALL ResultSet::addVetoableChangeListener(
         const uno::Reference< beans::XVetoableChangeListener >& )
     throw( beans::UnknownPropertyException,
            lang::WrappedTargetException,
-           uno::RuntimeException )
+           uno::RuntimeException, std::exception )
 {
     //  No constrained props, at the moment.
 }
@@ -1447,7 +1447,7 @@ void SAL_CALL ResultSet::removeVetoableChangeListener(
         const uno::Reference< beans::XVetoableChangeListener >& )
     throw( beans::UnknownPropertyException,
            lang::WrappedTargetException,
-           uno::RuntimeException )
+           uno::RuntimeException, std::exception )
 {
     //  No constrained props, at the moment.
 }
@@ -1614,7 +1614,7 @@ XTYPEPROVIDER_IMPL_2( PropertySetInfo,
 
 // virtual
 uno::Sequence< beans::Property > SAL_CALL PropertySetInfo::getProperties()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     return uno::Sequence< beans::Property >( *m_pProps );
 }
@@ -1623,7 +1623,7 @@ uno::Sequence< beans::Property > SAL_CALL PropertySetInfo::getProperties()
 // virtual
 beans::Property SAL_CALL PropertySetInfo::getPropertyByName(
         const OUString& aName )
-    throw( beans::UnknownPropertyException, uno::RuntimeException )
+    throw( beans::UnknownPropertyException, uno::RuntimeException, std::exception )
 {
     beans::Property aProp;
     if ( queryProperty( aName, aProp ) )
@@ -1636,7 +1636,7 @@ beans::Property SAL_CALL PropertySetInfo::getPropertyByName(
 // virtual
 sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName(
         const OUString& Name )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     beans::Property aProp;
     return queryProperty( Name, aProp );
diff --git a/ucbhelper/source/provider/resultsethelper.cxx b/ucbhelper/source/provider/resultsethelper.cxx
index 3ca28b621592..4fcd0e10e622 100644
--- a/ucbhelper/source/provider/resultsethelper.cxx
+++ b/ucbhelper/source/provider/resultsethelper.cxx
@@ -110,7 +110,7 @@ XSERVICEINFO_NOFACTORY_IMPL_1( ResultSetImplHelper,
 
 // virtual
 void SAL_CALL ResultSetImplHelper::dispose()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -126,7 +126,7 @@ void SAL_CALL ResultSetImplHelper::dispose()
 // virtual
 void SAL_CALL ResultSetImplHelper::addEventListener(
         const uno::Reference< lang::XEventListener >& Listener )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -141,7 +141,7 @@ void SAL_CALL ResultSetImplHelper::addEventListener(
 // virtual
 void SAL_CALL ResultSetImplHelper::removeEventListener(
         const uno::Reference< lang::XEventListener >& Listener )
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -159,7 +159,7 @@ void SAL_CALL ResultSetImplHelper::removeEventListener(
 uno::Reference< sdbc::XResultSet > SAL_CALL
 ResultSetImplHelper::getStaticResultSet()
     throw( com::sun::star::ucb::ListenerAlreadySetException,
-           uno::RuntimeException )
+           uno::RuntimeException, std::exception )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -176,7 +176,7 @@ void SAL_CALL ResultSetImplHelper::setListener(
         const uno::Reference< com::sun::star::ucb::XDynamicResultSetListener >&
             Listener )
     throw( com::sun::star::ucb::ListenerAlreadySetException,
-           uno::RuntimeException )
+           uno::RuntimeException, std::exception )
 {
     osl::ClearableMutexGuard aGuard( m_aMutex );
 
@@ -218,7 +218,7 @@ void SAL_CALL ResultSetImplHelper::setListener(
 
 // virtual
 sal_Int16 SAL_CALL ResultSetImplHelper::getCapabilities()
-    throw( uno::RuntimeException )
+    throw( uno::RuntimeException, std::exception )
 {
     // ! com::sun::star::ucb::ContentResultSetCapability::SORTED
     return 0;
@@ -232,7 +232,7 @@ void SAL_CALL ResultSetImplHelper::connectToCache(
     throw( com::sun::star::ucb::ListenerAlreadySetException,
            com::sun::star::ucb::AlreadyInitializedException,
            com::sun::star::ucb::ServiceNotFoundException,
-           uno::RuntimeException )
+           uno::RuntimeException, std::exception )
 {
     if ( m_xListener.is() )
         throw com::sun::star::ucb::ListenerAlreadySetException();
diff --git a/ucbhelper/source/provider/resultsetmetadata.cxx b/ucbhelper/source/provider/resultsetmetadata.cxx
index 3bfe80d47ae4..1bea9ae8a34e 100644
--- a/ucbhelper/source/provider/resultsetmetadata.cxx
+++ b/ucbhelper/source/provider/resultsetmetadata.cxx
@@ -142,7 +142,7 @@ XTYPEPROVIDER_IMPL_2( ResultSetMetaData,
 
 // virtual
 sal_Int32 SAL_CALL ResultSetMetaData::getColumnCount()
-    throw( SQLException, RuntimeException )
+    throw( SQLException, RuntimeException, std::exception )
 {
     return m_aProps.getLength();
 }
@@ -150,7 +150,7 @@ sal_Int32 SAL_CALL ResultSetMetaData::getColumnCount()
 
 // virtual
 sal_Bool SAL_CALL ResultSetMetaData::isAutoIncrement( sal_Int32 column )
-    throw( SQLException, RuntimeException )
+    throw( SQLException, RuntimeException, std::exception )
 {
     /*
         Checks whether column is automatically numbered, which makes it
@@ -166,7 +166,7 @@ sal_Bool SAL_CALL ResultSetMetaData::isAutoIncrement( sal_Int32 column )
 
 // virtual
 sal_Bool SAL_CALL ResultSetMetaData::isCaseSensitive( sal_Int32 column )
-    throw( SQLException, RuntimeException )
+    throw( SQLException, RuntimeException, std::exception )
 {
     if ( ( column < 1 ) || ( column > m_aProps.getLength() ) )
         return sal_False;
@@ -177,7 +177,7 @@ sal_Bool SAL_CALL ResultSetMetaData::isCaseSensitive( sal_Int32 column )
 
 // virtual
 sal_Bool SAL_CALL ResultSetMetaData::isSearchable( sal_Int32 column )
-    throw( SQLException, RuntimeException )
+    throw( SQLException, RuntimeException, std::exception )
 {
     /*
         Checks whether the value stored in column can be used in a
@@ -193,7 +193,7 @@ sal_Bool SAL_CALL ResultSetMetaData::isSearchable( sal_Int32 column )
 
 // virtual
 sal_Bool SAL_CALL ResultSetMetaData::isCurrency( sal_Int32 column )
-    throw( SQLException, RuntimeException )
+    throw( SQLException, RuntimeException, std::exception )
 {
     /*
         Checks whether column is a cash value.
@@ -208,7 +208,7 @@ sal_Bool SAL_CALL ResultSetMetaData::isCurrency( sal_Int32 column )
 
 // virtual
 sal_Int32 SAL_CALL ResultSetMetaData::isNullable( sal_Int32 column )
-    throw( SQLException, RuntimeException )
+    throw( SQLException, RuntimeException, std::exception )
 {
     /*
         Checks whether a NULL can be stored in column.
@@ -224,7 +224,7 @@ sal_Int32 SAL_CALL ResultSetMetaData::isNullable( sal_Int32 column )
 
 // virtual
 sal_Bool SAL_CALL ResultSetMetaData::isSigned( sal_Int32 column )
-    throw( SQLException, RuntimeException )
+    throw( SQLException, RuntimeException, std::exception )
 {
     /*
         Checks whether the value stored in column is a signed number.
@@ -239,7 +239,7 @@ sal_Bool SAL_CALL ResultSetMetaData::isSigned( sal_Int32 column )
 
 // virtual
 sal_Int32 SAL_CALL ResultSetMetaData::getColumnDisplaySize( sal_Int32 column )
-    throw( SQLException, RuntimeException )
+    throw( SQLException, RuntimeException, std::exception )
 {
     /*
         Gets the normal maximum width in characters for column.
@@ -254,7 +254,7 @@ sal_Int32 SAL_CALL ResultSetMetaData::getColumnDisplaySize( sal_Int32 column )
 
 // virtual
 OUString SAL_CALL ResultSetMetaData::getColumnLabel( sal_Int32 column )
-    throw( SQLException, RuntimeException )
+    throw( SQLException, RuntimeException, std::exception )
 {
     /*
         Gets the suggested column title for column, to be used in print-
@@ -274,7 +274,7 @@ OUString SAL_CALL ResultSetMetaData::getColumnLabel( sal_Int32 column )
 
 // virtual
 OUString SAL_CALL ResultSetMetaData::getColumnName( sal_Int32 column )
-    throw( SQLException, RuntimeException )
+    throw( SQLException, RuntimeException, std::exception )
 {
     /*
         Gets the name of column.
@@ -289,7 +289,7 @@ OUString SAL_CALL ResultSetMetaData::getColumnName( sal_Int32 column )
 
 // virtual
 OUString SAL_CALL ResultSetMetaData::getSchemaName( sal_Int32 column )
-    throw( SQLException, RuntimeException )
+    throw( SQLException, RuntimeException, std::exception )
 {
     /*
         Gets the schema name for the table from which column of this
@@ -307,7 +307,7 @@ OUString SAL_CALL ResultSetMetaData::getSchemaName( sal_Int32 column )
 
 // virtual
 sal_Int32 SAL_CALL ResultSetMetaData::getPrecision( sal_Int32 column )
-    throw( SQLException, RuntimeException )
+    throw( SQLException, RuntimeException, std::exception )
 {
     /*
         For number types, getprecision gets the number of decimal digits
@@ -326,7 +326,7 @@ sal_Int32 SAL_CALL ResultSetMetaData::getPrecision( sal_Int32 column )
 
 // virtual
 sal_Int32 SAL_CALL ResultSetMetaData::getScale( sal_Int32 column )
-    throw( SQLException, RuntimeException )
+    throw( SQLException, RuntimeException, std::exception )
 {
     /*
         Gets the number of digits to the right of the decimal point for
@@ -342,7 +342,7 @@ sal_Int32 SAL_CALL ResultSetMetaData::getScale( sal_Int32 column )
 
 // virtual
 OUString SAL_CALL ResultSetMetaData::getTableName( sal_Int32 column )
-    throw( SQLException, RuntimeException )
+    throw( SQLException, RuntimeException, std::exception )
 {
     /*
         Gets the name of the table from which column of this result set
@@ -360,7 +360,7 @@ OUString SAL_CALL ResultSetMetaData::getTableName( sal_Int32 column )
 
 // virtual
 OUString SAL_CALL ResultSetMetaData::getCatalogName( sal_Int32 column )
-    throw( SQLException, RuntimeException )
+    throw( SQLException, RuntimeException, std::exception )
 {
     /*
         Gets the catalog name for the table from which column of this
@@ -378,7 +378,7 @@ OUString SAL_CALL ResultSetMetaData::getCatalogName( sal_Int32 column )
 
 // virtual
 sal_Int32 SAL_CALL ResultSetMetaData::getColumnType( sal_Int32 column )
-    throw( SQLException, RuntimeException )
+    throw( SQLException, RuntimeException, std::exception )
 {
     /*
         Gets the JDBC type for the value stored in column. ... The STRUCT
@@ -486,7 +486,7 @@ sal_Int32 SAL_CALL ResultSetMetaData::getColumnType( sal_Int32 column )
 
 // virtual
 OUString SAL_CALL ResultSetMetaData::getColumnTypeName( sal_Int32 column )
-    throw( SQLException, RuntimeException )
+    throw( SQLException, RuntimeException, std::exception )
 {
     /*
         Gets the type name used by this particular data source for the
@@ -504,7 +504,7 @@ OUString SAL_CALL ResultSetMetaData::getColumnTypeName( sal_Int32 column )
 
 // virtual
 sal_Bool SAL_CALL ResultSetMetaData::isReadOnly( sal_Int32 column )
-    throw( SQLException, RuntimeException )
+    throw( SQLException, RuntimeException, std::exception )
 {
     if ( m_pImpl->m_bGlobalReadOnlyValue )
         return m_bReadOnly;
@@ -520,7 +520,7 @@ sal_Bool SAL_CALL ResultSetMetaData::isReadOnly( sal_Int32 column )
 
 // virtual
 sal_Bool SAL_CALL ResultSetMetaData::isWritable( sal_Int32 column )
-    throw( SQLException, RuntimeException )
+    throw( SQLException, RuntimeException, std::exception )
 {
     if ( m_pImpl->m_bGlobalReadOnlyValue )
         return !m_bReadOnly;
@@ -534,7 +534,7 @@ sal_Bool SAL_CALL ResultSetMetaData::isWritable( sal_Int32 column )
 
 // virtual
 sal_Bool SAL_CALL ResultSetMetaData::isDefinitelyWritable( sal_Int32 column )
-    throw( SQLException, RuntimeException )
+    throw( SQLException, RuntimeException, std::exception )
 {
     if ( m_pImpl->m_bGlobalReadOnlyValue )
         return !m_bReadOnly;
@@ -548,7 +548,7 @@ sal_Bool SAL_CALL ResultSetMetaData::isDefinitelyWritable( sal_Int32 column )
 
 // virtual
 OUString SAL_CALL ResultSetMetaData::getColumnServiceName( sal_Int32 column )
-    throw( SQLException, RuntimeException )
+    throw( SQLException, RuntimeException, std::exception )
 {
     /*
           Returns the fully-qualified name of the service whose instances
diff --git a/ucbhelper/source/provider/std_inputstream.cxx b/ucbhelper/source/provider/std_inputstream.cxx
index 45867cbde1f7..172e284a99fd 100644
--- a/ucbhelper/source/provider/std_inputstream.cxx
+++ b/ucbhelper/source/provider/std_inputstream.cxx
@@ -33,7 +33,7 @@ namespace ucbhelper
     {
     }
 
-    uno::Any SAL_CALL StdInputStream::queryInterface( const uno::Type& rType ) throw ( uno::RuntimeException )
+    uno::Any SAL_CALL StdInputStream::queryInterface( const uno::Type& rType ) throw ( uno::RuntimeException, std::exception )
     {
         uno::Any aRet = ::cppu::queryInterface( rType,
                                           ( static_cast< XInputStream* >( this ) ),
@@ -54,7 +54,7 @@ namespace ucbhelper
 
     sal_Int32 SAL_CALL StdInputStream::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
         throw( io::NotConnectedException, io::BufferSizeExceededException,
-               io::IOException, uno::RuntimeException)
+               io::IOException, uno::RuntimeException, std::exception)
     {
         osl::MutexGuard aGuard( m_aMutex );
 
@@ -82,7 +82,7 @@ namespace ucbhelper
     sal_Int32 SAL_CALL StdInputStream::readSomeBytes( uno::Sequence< sal_Int8 >& aData,
             sal_Int32 nMaxBytesToRead )
         throw( io::NotConnectedException, io::BufferSizeExceededException,
-               io::IOException, uno::RuntimeException)
+               io::IOException, uno::RuntimeException, std::exception)
     {
         osl::MutexGuard aGuard( m_aMutex );
 
@@ -107,7 +107,7 @@ namespace ucbhelper
 
     void SAL_CALL StdInputStream::skipBytes( sal_Int32 nBytesToSkip )
         throw( io::NotConnectedException, io::BufferSizeExceededException,
-               io::IOException, uno::RuntimeException )
+               io::IOException, uno::RuntimeException, std::exception )
     {
         osl::MutexGuard aGuard( m_aMutex );
 
@@ -126,19 +126,19 @@ namespace ucbhelper
     }
 
     sal_Int32 SAL_CALL StdInputStream::available( )
-        throw(io::NotConnectedException, io::IOException, uno::RuntimeException )
+        throw(io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception )
     {
         return sal::static_int_cast< sal_Int32 >( m_nLength - getPosition() );
     }
 
     void SAL_CALL StdInputStream::closeInput( )
-        throw( io::NotConnectedException, io::IOException, uno::RuntimeException)
+        throw( io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception)
     {
         // No need to implement this for an istream
     }
 
     void SAL_CALL StdInputStream::seek( sal_Int64 location )
-        throw( lang::IllegalArgumentException, io::IOException, uno::RuntimeException )
+        throw( lang::IllegalArgumentException, io::IOException, uno::RuntimeException, std::exception )
     {
         osl::MutexGuard aGuard( m_aMutex );
 
@@ -163,7 +163,7 @@ namespace ucbhelper
     }
 
     sal_Int64 SAL_CALL StdInputStream::getPosition( )
-        throw( io::IOException, uno::RuntimeException )
+        throw( io::IOException, uno::RuntimeException, std::exception )
     {
         osl::MutexGuard aGuard( m_aMutex );
 
@@ -178,7 +178,7 @@ namespace ucbhelper
     }
 
     sal_Int64 SAL_CALL StdInputStream::getLength( )
-        throw ( io::IOException, uno::RuntimeException )
+        throw ( io::IOException, uno::RuntimeException, std::exception )
     {
         return m_nLength;
     }
diff --git a/ucbhelper/source/provider/std_outputstream.cxx b/ucbhelper/source/provider/std_outputstream.cxx
index 81de9969dae7..2f6ca9968eba 100644
--- a/ucbhelper/source/provider/std_outputstream.cxx
+++ b/ucbhelper/source/provider/std_outputstream.cxx
@@ -25,7 +25,7 @@ namespace ucbhelper
             m_pStream->setstate( ios::eofbit );
     }
 
-    uno::Any SAL_CALL StdOutputStream::queryInterface( const uno::Type& rType ) throw ( uno::RuntimeException )
+    uno::Any SAL_CALL StdOutputStream::queryInterface( const uno::Type& rType ) throw ( uno::RuntimeException, std::exception )
     {
         uno::Any aRet = ::cppu::queryInterface( rType, ( static_cast< XOutputStream* >( this ) ) );
 
@@ -44,7 +44,7 @@ namespace ucbhelper
 
     void SAL_CALL StdOutputStream::writeBytes ( const uno::Sequence< sal_Int8 >& aData )
         throw ( io::NotConnectedException, io::BufferSizeExceededException,
-                io::IOException, uno::RuntimeException )
+                io::IOException, uno::RuntimeException, std::exception )
     {
         osl::MutexGuard aGuard( m_aMutex );
 
@@ -64,7 +64,7 @@ namespace ucbhelper
 
     void SAL_CALL StdOutputStream::flush ( )
         throw ( io::NotConnectedException, io::BufferSizeExceededException,
-                io::IOException, uno::RuntimeException )
+                io::IOException, uno::RuntimeException, std::exception )
     {
         osl::MutexGuard aGuard( m_aMutex );
 
@@ -84,7 +84,7 @@ namespace ucbhelper
 
     void SAL_CALL StdOutputStream::closeOutput ( )
         throw ( io::NotConnectedException, io::BufferSizeExceededException,
-                io::IOException, uno::RuntimeException )
+                io::IOException, uno::RuntimeException, std::exception )
     {
         osl::MutexGuard aGuard( m_aMutex );