cppuhelper: retrofit std::exception into overriding exception specs

Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3

17 files changed, 231 insertions, 231 deletions

diff --git a/include/ucbhelper/activedatasink.hxx b/include/ucbhelper/activedatasink.hxx
index 2a375cf36f65..cfbf6bb6b4b4 100644
--- a/include/ucbhelper/activedatasink.hxx
+++ b/include/ucbhelper/activedatasink.hxx
@@ -55,11 +55,11 @@ public:
     virtual void SAL_CALL
     setInputStream( const com::sun::star::uno::Reference<
                             com::sun::star::io::XInputStream >& aStream )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
     virtual com::sun::star::uno::Reference<
         com::sun::star::io::XInputStream > SAL_CALL
     getInputStream()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 };
 
 } /* namespace ucbhelper */
diff --git a/include/ucbhelper/activedatastreamer.hxx b/include/ucbhelper/activedatastreamer.hxx
index 621428d7197f..eabfa659c0c8 100644
--- a/include/ucbhelper/activedatastreamer.hxx
+++ b/include/ucbhelper/activedatastreamer.hxx
@@ -52,9 +52,9 @@ public:
 
     // XActiveDataStreamer methods.
     virtual void SAL_CALL setStream( const com::sun::star::uno::Reference< com::sun::star::io::XStream >& xStream )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
     virtual com::sun::star::uno::Reference< com::sun::star::io::XStream > SAL_CALL getStream()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 };
 
 } /* namespace ucbhelper */
diff --git a/include/ucbhelper/commandenvironment.hxx b/include/ucbhelper/commandenvironment.hxx
index 97ba46e094d6..a2b5397c1c86 100644
--- a/include/ucbhelper/commandenvironment.hxx
+++ b/include/ucbhelper/commandenvironment.hxx
@@ -79,12 +79,12 @@ public:
     virtual com::sun::star::uno::Reference<
                 com::sun::star::task::XInteractionHandler > SAL_CALL
     getInteractionHandler()
-        throw ( com::sun::star::uno::RuntimeException );
+        throw ( com::sun::star::uno::RuntimeException, std::exception );
 
     virtual com::sun::star::uno::Reference<
                 com::sun::star::ucb::XProgressHandler > SAL_CALL
     getProgressHandler()
-        throw ( com::sun::star::uno::RuntimeException );
+        throw ( com::sun::star::uno::RuntimeException, std::exception );
 };
 
 } /* namespace ucbhelper */
diff --git a/include/ucbhelper/contenthelper.hxx b/include/ucbhelper/contenthelper.hxx
index 3f9e31221485..17091db95803 100644
--- a/include/ucbhelper/contenthelper.hxx
+++ b/include/ucbhelper/contenthelper.hxx
@@ -332,50 +332,50 @@ public:
     // XServiceInfo
     virtual OUString SAL_CALL
     getImplementationName()
-        throw( ::com::sun::star::uno::RuntimeException ) = 0;
+        throw( ::com::sun::star::uno::RuntimeException, std::exception ) = 0;
     virtual sal_Bool SAL_CALL
     supportsService( const OUString& ServiceName )
-        throw( ::com::sun::star::uno::RuntimeException );
+        throw( ::com::sun::star::uno::RuntimeException, std::exception );
     virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
     getSupportedServiceNames()
-        throw( ::com::sun::star::uno::RuntimeException ) = 0;
+        throw( ::com::sun::star::uno::RuntimeException, std::exception ) = 0;
 
     // XComponent
     virtual void SAL_CALL
     dispose()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
     virtual void SAL_CALL
     addEventListener( const com::sun::star::uno::Reference<
                         com::sun::star::lang::XEventListener >& 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 );
 
     // XContent
     virtual com::sun::star::uno::Reference<
                 com::sun::star::ucb::XContentIdentifier > SAL_CALL
     getIdentifier()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
     virtual OUString SAL_CALL
     getContentType()
-        throw( com::sun::star::uno::RuntimeException ) = 0;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) = 0;
     virtual void SAL_CALL
     addContentEventListener(
         const com::sun::star::uno::Reference<
             com::sun::star::ucb::XContentEventListener >& Listener )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
     virtual void SAL_CALL
     removeContentEventListener(
         const com::sun::star::uno::Reference<
             com::sun::star::ucb::XContentEventListener >& Listener )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
     // XCommandProcessor
     virtual sal_Int32 SAL_CALL
     createCommandIdentifier()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
     virtual com::sun::star::uno::Any SAL_CALL
     execute( const com::sun::star::ucb::Command& aCommand,
              sal_Int32 CommandId,
@@ -383,10 +383,10 @@ public:
                  com::sun::star::ucb::XCommandEnvironment >& Environment )
         throw( com::sun::star::uno::Exception,
                com::sun::star::ucb::CommandAbortedException,
-               com::sun::star::uno::RuntimeException ) = 0;
+               com::sun::star::uno::RuntimeException, std::exception ) = 0;
     virtual void SAL_CALL
     abort( sal_Int32 CommandId )
-        throw( com::sun::star::uno::RuntimeException ) = 0;
+        throw( com::sun::star::uno::RuntimeException, std::exception ) = 0;
 
     // XPropertiesChangeNotifier
     virtual void SAL_CALL
@@ -394,25 +394,25 @@ public:
         const com::sun::star::uno::Sequence< OUString >& PropertyNames,
          const com::sun::star::uno::Reference<
             com::sun::star::beans::XPropertiesChangeListener >& Listener )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
     virtual void SAL_CALL
     removePropertiesChangeListener(
         const com::sun::star::uno::Sequence< OUString >& PropertyNames,
         const com::sun::star::uno::Reference<
             com::sun::star::beans::XPropertiesChangeListener >& Listener )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
     // XCommandInfoChangeNotifier
     virtual void SAL_CALL
     addCommandInfoChangeListener(
         const com::sun::star::uno::Reference<
             com::sun::star::ucb::XCommandInfoChangeListener >& Listener )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
     virtual void SAL_CALL
     removeCommandInfoChangeListener(
         const com::sun::star::uno::Reference<
             ::com::sun::star::ucb::XCommandInfoChangeListener >& Listener )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
     // XPropertyContainer
 
@@ -433,7 +433,7 @@ public:
         throw( com::sun::star::beans::PropertyExistException,
                com::sun::star::beans::IllegalTypeException,
                com::sun::star::lang::IllegalArgumentException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
     /**
       * This method removes a property from the content according to the
@@ -449,19 +449,19 @@ public:
     removeProperty( const OUString& Name )
         throw( com::sun::star::beans::UnknownPropertyException,
                com::sun::star::beans::NotRemoveableException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
     // XPropertySetInfoChangeNotifier
     virtual void SAL_CALL
     addPropertySetInfoChangeListener(
         const com::sun::star::uno::Reference<
             com::sun::star::beans::XPropertySetInfoChangeListener >& Listener )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
     virtual void SAL_CALL
     removePropertySetInfoChangeListener(
         const com::sun::star::uno::Reference<
             com::sun::star::beans::XPropertySetInfoChangeListener >& Listener )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
     // XChild
 
@@ -473,7 +473,7 @@ public:
     virtual com::sun::star::uno::Reference<
                 com::sun::star::uno::XInterface > SAL_CALL
     getParent()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
     /**
       * The implementation of this method always throws a NoSupportException.
@@ -482,7 +482,7 @@ public:
     setParent( const com::sun::star::uno::Reference<
                         com::sun::star::uno::XInterface >& Parent )
         throw( com::sun::star::lang::NoSupportException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
     //////////////////////////////////////////////////////////////////////
     // Non-interface methods.
diff --git a/include/ucbhelper/contentidentifier.hxx b/include/ucbhelper/contentidentifier.hxx
index 7f95634578ed..6203a20d9777 100644
--- a/include/ucbhelper/contentidentifier.hxx
+++ b/include/ucbhelper/contentidentifier.hxx
@@ -51,7 +51,7 @@ 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 );
     virtual void SAL_CALL
     acquire() throw();
     virtual void SAL_CALL
@@ -60,18 +60,18 @@ public:
     // XTypeProvider
     virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
     getImplementationId()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
     virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
     getTypes()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
     // XContentIdentifier
     virtual OUString SAL_CALL
     getContentIdentifier()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
     virtual OUString SAL_CALL
     getContentProviderScheme()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
 private:
     ContentIdentifier_Impl* m_pImpl;
diff --git a/include/ucbhelper/contentinfo.hxx b/include/ucbhelper/contentinfo.hxx
index 5665c32be59e..dcb5bc3a4c76 100644
--- a/include/ucbhelper/contentinfo.hxx
+++ b/include/ucbhelper/contentinfo.hxx
@@ -77,14 +77,14 @@ public:
     virtual com::sun::star::uno::Sequence<
                 com::sun::star::beans::Property > SAL_CALL
     getProperties()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
     virtual com::sun::star::beans::Property SAL_CALL
     getPropertyByName( const OUString& aName )
         throw( com::sun::star::beans::UnknownPropertyException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
     virtual sal_Bool SAL_CALL
     hasPropertyByName( const OUString& Name )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
     // Non-Interface methods.
     void reset();
@@ -135,21 +135,21 @@ public:
     virtual com::sun::star::uno::Sequence<
                 com::sun::star::ucb::CommandInfo > SAL_CALL
     getCommands()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
     virtual com::sun::star::ucb::CommandInfo SAL_CALL
     getCommandInfoByName( const OUString& Name )
         throw( com::sun::star::ucb::UnsupportedCommandException,
-        com::sun::star::uno::RuntimeException );
+        com::sun::star::uno::RuntimeException, std::exception );
     virtual com::sun::star::ucb::CommandInfo SAL_CALL
     getCommandInfoByHandle( sal_Int32 Handle )
         throw( com::sun::star::ucb::UnsupportedCommandException,
-        com::sun::star::uno::RuntimeException );
+        com::sun::star::uno::RuntimeException, std::exception );
     virtual sal_Bool SAL_CALL
     hasCommandByName( const OUString& Name )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
     virtual sal_Bool SAL_CALL
     hasCommandByHandle( sal_Int32 Handle )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
     // Non-Interface methods.
     void reset();
diff --git a/include/ucbhelper/fd_inputstream.hxx b/include/ucbhelper/fd_inputstream.hxx
index c3f4ca5e704a..f5d0057fd0d0 100644
--- a/include/ucbhelper/fd_inputstream.hxx
+++ b/include/ucbhelper/fd_inputstream.hxx
@@ -59,7 +59,7 @@ namespace ucbhelper
             throw( css::io::NotConnectedException,
                    css::io::BufferSizeExceededException,
                    css::io::IOException,
-                   css::uno::RuntimeException);
+                   css::uno::RuntimeException, std::exception);
 
         virtual sal_Int32 SAL_CALL
         readSomeBytes(css::uno::Sequence< sal_Int8 >& aData,
@@ -67,26 +67,26 @@ namespace ucbhelper
             throw( css::io::NotConnectedException,
                    css::io::BufferSizeExceededException,
                    css::io::IOException,
-                   css::uno::RuntimeException);
+                   css::uno::RuntimeException, std::exception);
 
         virtual void SAL_CALL
         skipBytes(sal_Int32 nBytesToSkip)
             throw(css::io::NotConnectedException,
                   css::io::BufferSizeExceededException,
                   css::io::IOException,
-                  css::uno::RuntimeException );
+                  css::uno::RuntimeException, std::exception );
 
         virtual sal_Int32 SAL_CALL
         available(void)
             throw(css::io::NotConnectedException,
                   css::io::IOException,
-                  css::uno::RuntimeException );
+                  css::uno::RuntimeException, std::exception );
 
         virtual void SAL_CALL
         closeInput(void)
             throw(css::io::NotConnectedException,
                   css::io::IOException,
-                  css::uno::RuntimeException);
+                  css::uno::RuntimeException, std::exception);
 
 
         /** XSeekable
@@ -96,19 +96,19 @@ namespace ucbhelper
         seek(sal_Int64 location)
             throw(css::lang::IllegalArgumentException,
                   css::io::IOException,
-                  css::uno::RuntimeException);
+                  css::uno::RuntimeException, std::exception);
 
 
         virtual sal_Int64 SAL_CALL
         getPosition(void)
             throw(css::io::IOException,
-                  css::uno::RuntimeException);
+                  css::uno::RuntimeException, std::exception);
 
 
         virtual sal_Int64 SAL_CALL
         getLength(void)
             throw(css::io::IOException,
-                  css::uno::RuntimeException);
+                  css::uno::RuntimeException, std::exception);
 
     private:
         oslFileHandle m_tmpfl;
diff --git a/include/ucbhelper/interactionrequest.hxx b/include/ucbhelper/interactionrequest.hxx
index 9abd5df481fe..3326953f90ff 100644
--- a/include/ucbhelper/interactionrequest.hxx
+++ b/include/ucbhelper/interactionrequest.hxx
@@ -93,7 +93,7 @@ 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 );
     virtual void SAL_CALL acquire()
         throw();
     virtual void SAL_CALL release()
@@ -102,20 +102,20 @@ public:
     // XTypeProvider
     virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
     getTypes()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
     virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
     getImplementationId()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
     // XInteractionRequest
     virtual com::sun::star::uno::Any SAL_CALL
     getRequest()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
     virtual com::sun::star::uno::Sequence<
                 com::sun::star::uno::Reference<
                     com::sun::star::task::XInteractionContinuation > > SAL_CALL
     getContinuations()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
     // Non-interface methods.
 
@@ -191,7 +191,7 @@ 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 );
     virtual void SAL_CALL acquire()
         throw();
     virtual void SAL_CALL release()
@@ -200,14 +200,14 @@ public:
     // XTypeProvider
     virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
     getTypes()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
     virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
     getImplementationId()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
     // XInteractionContinuation
     virtual void SAL_CALL select()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 };
 
 //============================================================================
@@ -228,7 +228,7 @@ 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 );
     virtual void SAL_CALL acquire()
         throw();
     virtual void SAL_CALL release()
@@ -237,14 +237,14 @@ public:
     // XTypeProvider
     virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
     getTypes()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
     virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
     getImplementationId()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
     // XInteractionContinuation
     virtual void SAL_CALL select()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 };
 
 //============================================================================
@@ -265,7 +265,7 @@ 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 );
     virtual void SAL_CALL acquire()
         throw();
     virtual void SAL_CALL release()
@@ -274,14 +274,14 @@ public:
     // XTypeProvider
     virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
     getTypes()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
     virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
     getImplementationId()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
     // XInteractionContinuation
     virtual void SAL_CALL select()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 };
 
 //============================================================================
@@ -302,7 +302,7 @@ 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 );
     virtual void SAL_CALL acquire()
         throw();
     virtual void SAL_CALL release()
@@ -311,14 +311,14 @@ public:
     // XTypeProvider
     virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
     getTypes()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
     virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
     getImplementationId()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
     // XInteractionContinuation
     virtual void SAL_CALL select()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 };
 
 //============================================================================
@@ -431,7 +431,7 @@ 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 );
     virtual void SAL_CALL acquire()
         throw();
     virtual void SAL_CALL release()
@@ -440,67 +440,67 @@ public:
     // XTypeProvider
     virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
     getTypes()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
     virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
     getImplementationId()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
     // XInteractionContinuation
     virtual void SAL_CALL select()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
     // XInteractionSupplyAuthentication
     virtual sal_Bool SAL_CALL
     canSetRealm()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
     virtual void SAL_CALL
     setRealm( const OUString& Realm )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
     virtual sal_Bool SAL_CALL
     canSetUserName()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
     virtual void SAL_CALL
     setUserName( const OUString& UserName )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
     virtual sal_Bool SAL_CALL
     canSetPassword()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
     virtual void SAL_CALL
     setPassword( const OUString& Password )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
     virtual com::sun::star::uno::Sequence<
                 com::sun::star::ucb::RememberAuthentication > SAL_CALL
     getRememberPasswordModes(
             com::sun::star::ucb::RememberAuthentication& Default )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
     virtual void SAL_CALL
     setRememberPassword( com::sun::star::ucb::RememberAuthentication Remember )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
     virtual sal_Bool SAL_CALL
     canSetAccount()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
     virtual void SAL_CALL
     setAccount( const OUString& Account )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
     virtual com::sun::star::uno::Sequence<
                 com::sun::star::ucb::RememberAuthentication > SAL_CALL
     getRememberAccountModes(
             com::sun::star::ucb::RememberAuthentication& Default )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
     virtual void SAL_CALL
     setRememberAccount( com::sun::star::ucb::RememberAuthentication Remember )
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
     // XInteractionSupplyAuthentication2
     virtual ::sal_Bool SAL_CALL canUseSystemCredentials( ::sal_Bool& Default )
-        throw ( ::com::sun::star::uno::RuntimeException );
+        throw ( ::com::sun::star::uno::RuntimeException, std::exception );
     virtual void SAL_CALL setUseSystemCredentials( ::sal_Bool UseSystemCredentials )
-        throw ( ::com::sun::star::uno::RuntimeException );
+        throw ( ::com::sun::star::uno::RuntimeException, std::exception );
 
     // Non-interface methods.
 
@@ -643,7 +643,7 @@ 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 );
     virtual void SAL_CALL acquire()
         throw();
     virtual void SAL_CALL release()
@@ -652,18 +652,18 @@ public:
     // XTypeProvider
     virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
     getTypes()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
     virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
     getImplementationId()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
     // XInteractionContinuation
     virtual void SAL_CALL select()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
     // XInteractionSupplyName
     virtual void SAL_CALL setName( const OUString& Name )
-        throw ( com::sun::star::uno::RuntimeException );
+        throw ( com::sun::star::uno::RuntimeException, std::exception );
 
     // Non-interface methods.
 
@@ -695,7 +695,7 @@ 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 );
     virtual void SAL_CALL acquire()
         throw();
     virtual void SAL_CALL release()
@@ -704,14 +704,14 @@ public:
     // XTypeProvider
     virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
     getTypes()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
     virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
     getImplementationId()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
     // XInteractionContinuation
     virtual void SAL_CALL select()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 };
 
 } // namespace ucbhelper
diff --git a/include/ucbhelper/interceptedinteraction.hxx b/include/ucbhelper/interceptedinteraction.hxx
index bc36ff5a1dda..1c0a38028d58 100644
--- a/include/ucbhelper/interceptedinteraction.hxx
+++ b/include/ucbhelper/interceptedinteraction.hxx
@@ -294,7 +294,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
                     the interaction request, which should be intercepted.
          */
         virtual void SAL_CALL handle(const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& xRequest)
-            throw(::com::sun::star::uno::RuntimeException);
+            throw(::com::sun::star::uno::RuntimeException, std::exception);
 
     //-------------------------------------------
     // helper
diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx
index 760b0d845e95..356369fa7b31 100644
--- a/include/ucbhelper/macros.hxx
+++ b/include/ucbhelper/macros.hxx
@@ -43,7 +43,7 @@
 #define XINTERFACE_DECL()                                                   \
     virtual com::sun::star::uno::Any SAL_CALL                               \
     queryInterface( const com::sun::star::uno::Type & rType )               \
-        throw( com::sun::star::uno::RuntimeException );                     \
+        throw( com::sun::star::uno::RuntimeException, std::exception );     \
     virtual void SAL_CALL                                                   \
     acquire()                                                               \
         throw();                                                            \
@@ -73,7 +73,7 @@ void SAL_CALL Class::release()                                              \
 #define QUERYINTERFACE_IMPL_START( Class )                                  \
 com::sun::star::uno::Any SAL_CALL Class::queryInterface(                    \
                                 const com::sun::star::uno::Type & rType )   \
-    throw( com::sun::star::uno::RuntimeException )                          \
+    throw( com::sun::star::uno::RuntimeException, std::exception )          \
 {                                                                           \
     com::sun::star::uno::Any aRet = cppu::queryInterface( rType,
 
@@ -307,10 +307,10 @@ QUERYINTERFACE_IMPL_END
 #define XTYPEPROVIDER_DECL()                                                \
     virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL              \
     getImplementationId()                                                   \
-        throw( com::sun::star::uno::RuntimeException );                     \
+        throw( com::sun::star::uno::RuntimeException, std::exception );     \
     virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL \
     getTypes()                                                              \
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
 //=========================================================================
 //
@@ -321,7 +321,7 @@ QUERYINTERFACE_IMPL_END
 #define XTYPEPROVIDER_COMMON_IMPL( Class )                                  \
 com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL                          \
 Class::getImplementationId()                                                \
-    throw( com::sun::star::uno::RuntimeException )                          \
+    throw( com::sun::star::uno::RuntimeException, std::exception )          \
 {                                                                           \
     static cppu::OImplementationId* pId = NULL;                             \
       if ( !pId )                                                             \
@@ -339,7 +339,7 @@ Class::getImplementationId()                                                \
 #define GETTYPES_IMPL_START( Class )                                        \
 com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL         \
 Class::getTypes()                                                           \
-    throw( com::sun::star::uno::RuntimeException )                          \
+    throw( com::sun::star::uno::RuntimeException, std::exception )          \
 {                                                                           \
     static cppu::OTypeCollection* pCollection = NULL;                       \
       if ( !pCollection )                                                     \
@@ -582,13 +582,13 @@ GETTYPES_IMPL_END
 #define XSERVICEINFO_NOFACTORY_DECL()                                       \
     virtual OUString SAL_CALL                                          \
     getImplementationName()                                                 \
-        throw( com::sun::star::uno::RuntimeException );                     \
+        throw( com::sun::star::uno::RuntimeException, std::exception );     \
     virtual sal_Bool SAL_CALL                                               \
     supportsService( const OUString& ServiceName )                     \
-        throw( com::sun::star::uno::RuntimeException );                     \
+        throw( com::sun::star::uno::RuntimeException, std::exception );     \
     virtual com::sun::star::uno::Sequence< OUString > SAL_CALL         \
     getSupportedServiceNames()                                              \
-        throw( com::sun::star::uno::RuntimeException );                     \
+        throw( com::sun::star::uno::RuntimeException, std::exception );     \
                                                                             \
     static OUString                                                    \
     getImplementationName_Static();                                         \
@@ -611,7 +611,7 @@ GETTYPES_IMPL_END
 
 #define XSERVICEINFO_COMMOM_IMPL( Class, ImplName )                         \
 OUString SAL_CALL Class::getImplementationName()                       \
-    throw( com::sun::star::uno::RuntimeException )                          \
+    throw( com::sun::star::uno::RuntimeException, std::exception )          \
 {                                                                           \
     return getImplementationName_Static();                                  \
 }                                                                           \
@@ -623,7 +623,7 @@ OUString Class::getImplementationName_Static()                         \
                                                                             \
 sal_Bool SAL_CALL                                                           \
 Class::supportsService( const OUString& ServiceName )                  \
-    throw( com::sun::star::uno::RuntimeException )                          \
+    throw( com::sun::star::uno::RuntimeException, std::exception )          \
 {                                                                           \
     com::sun::star::uno::Sequence< OUString > aSNL =                   \
                                         getSupportedServiceNames();         \
@@ -639,7 +639,7 @@ Class::supportsService( const OUString& ServiceName )                  \
                                                                             \
 com::sun::star::uno::Sequence< OUString > SAL_CALL                     \
 Class::getSupportedServiceNames()                                           \
-    throw( com::sun::star::uno::RuntimeException )                          \
+    throw( com::sun::star::uno::RuntimeException, std::exception )          \
 {                                                                           \
     return getSupportedServiceNames_Static();                               \
 }
diff --git a/include/ucbhelper/propertyvalueset.hxx b/include/ucbhelper/propertyvalueset.hxx
index 18663e332e08..56c0561d8602 100644
--- a/include/ucbhelper/propertyvalueset.hxx
+++ b/include/ucbhelper/propertyvalueset.hxx
@@ -88,97 +88,97 @@ 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 );
 
     // XColumnLocate
     virtual sal_Int32 SAL_CALL
     findColumn( const OUString& columnName )
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException );
+               ::com::sun::star::uno::RuntimeException, std::exception );
 
     //////////////////////////////////////////////////////////////////////
     // Non-interface methods
diff --git a/include/ucbhelper/providerhelper.hxx b/include/ucbhelper/providerhelper.hxx
index f8fade48877e..f6f68040aeeb 100644
--- a/include/ucbhelper/providerhelper.hxx
+++ b/include/ucbhelper/providerhelper.hxx
@@ -158,13 +158,13 @@ public:
 
     virtual OUString SAL_CALL
     getImplementationName()
-        throw( ::com::sun::star::uno::RuntimeException ) = 0;
+        throw( ::com::sun::star::uno::RuntimeException, std::exception ) = 0;
     virtual sal_Bool SAL_CALL
     supportsService( const OUString& ServiceName )
-        throw( ::com::sun::star::uno::RuntimeException );
+        throw( ::com::sun::star::uno::RuntimeException, std::exception );
     virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
     getSupportedServiceNames()
-        throw( ::com::sun::star::uno::RuntimeException ) = 0;
+        throw( ::com::sun::star::uno::RuntimeException, std::exception ) = 0;
 
     //////////////////////////////////////////////////////////////////////
     // XContentProvider
@@ -186,13 +186,13 @@ public:
     queryContent( const ::com::sun::star::uno::Reference<
                     ::com::sun::star::ucb::XContentIdentifier >& Identifier )
         throw( ::com::sun::star::ucb::IllegalIdentifierException,
-               ::com::sun::star::uno::RuntimeException ) = 0;
+               ::com::sun::star::uno::RuntimeException, std::exception ) = 0;
     virtual sal_Int32 SAL_CALL
     compareContentIds( const ::com::sun::star::uno::Reference<
                             ::com::sun::star::ucb::XContentIdentifier >& Id1,
                        const ::com::sun::star::uno::Reference<
                                ::com::sun::star::ucb::XContentIdentifier >& Id2 )
-        throw( ::com::sun::star::uno::RuntimeException );
+        throw( ::com::sun::star::uno::RuntimeException, std::exception );
 
     //////////////////////////////////////////////////////////////////////
     // Non-interface methods.
diff --git a/include/ucbhelper/resultset.hxx b/include/ucbhelper/resultset.hxx
index 668a85e5d706..0e9801641714 100644
--- a/include/ucbhelper/resultset.hxx
+++ b/include/ucbhelper/resultset.hxx
@@ -119,212 +119,212 @@ public:
     // XComponent
     virtual void SAL_CALL
     dispose()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
     virtual void SAL_CALL
     addEventListener( const com::sun::star::uno::Reference<
                             com::sun::star::lang::XEventListener >& 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 );
 
     // XContentAccess
     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 );
 
     // XResultSetMetaDataSupplier
     virtual com::sun::star::uno::Reference<
                 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 );
 
     // XResultSet
     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
     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 );
 
     // XCloseable
     virtual void SAL_CALL
     close()
         throw( com::sun::star::sdbc::SQLException,
-               com::sun::star::uno::RuntimeException );
+               com::sun::star::uno::RuntimeException, std::exception );
 
     // XPropertySet
     virtual com::sun::star::uno::Reference<
                 com::sun::star::beans::XPropertySetInfo > SAL_CALL
     getPropertySetInfo()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
     virtual void SAL_CALL
     setPropertyValue( const OUString& aPropertyName,
                       const com::sun::star::uno::Any& aValue )
@@ -332,40 +332,40 @@ 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,
                                const com::sun::star::uno::Reference<
                                        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,
                                   const com::sun::star::uno::Reference<
                                       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,
                                const com::sun::star::uno::Reference<
                                        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,
                                   const com::sun::star::uno::Reference<
                                       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 );
 
     /////////////////////////////////////////////////////////////////////
     // Non-interface methods.
diff --git a/include/ucbhelper/resultsethelper.hxx b/include/ucbhelper/resultsethelper.hxx
index 2d070115b60d..d16899931cf5 100644
--- a/include/ucbhelper/resultsethelper.hxx
+++ b/include/ucbhelper/resultsethelper.hxx
@@ -146,34 +146,34 @@ public:
     // XComponent ( base class of XDynamicResultSet )
     virtual void SAL_CALL
     dispose()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
     virtual void SAL_CALL
     addEventListener( const com::sun::star::uno::Reference<
                             com::sun::star::lang::XEventListener >& 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 );
 
     // 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<
                         com::sun::star::ucb::XDynamicResultSet > & xCache )
         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 );
 
     /**
       * The implementation of this method always returns 0. Override this
@@ -181,7 +181,7 @@ public:
       */
     virtual sal_Int16 SAL_CALL
     getCapabilities()
-        throw( com::sun::star::uno::RuntimeException );
+        throw( com::sun::star::uno::RuntimeException, std::exception );
 
     //////////////////////////////////////////////////////////////////////
     // Non-interface methods.
diff --git a/include/ucbhelper/resultsetmetadata.hxx b/include/ucbhelper/resultsetmetadata.hxx
index 91fee4531069..461fec670b82 100644
--- a/include/ucbhelper/resultsetmetadata.hxx
+++ b/include/ucbhelper/resultsetmetadata.hxx
@@ -209,7 +209,7 @@ public:
     virtual sal_Int32 SAL_CALL
     getColumnCount()
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException );
+               ::com::sun::star::uno::RuntimeException, std::exception );
     /**
       * Checks whether column is automatically numbered, which makes it
       * read-only.
@@ -221,7 +221,7 @@ public:
     virtual sal_Bool SAL_CALL
     isAutoIncrement( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException );
+               ::com::sun::star::uno::RuntimeException, std::exception );
     /**
       * Checks whether column is case sensitive.
       *
@@ -232,7 +232,7 @@ public:
     virtual sal_Bool SAL_CALL
     isCaseSensitive( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException );
+               ::com::sun::star::uno::RuntimeException, std::exception );
     /**
       * Checks whether the value stored in column can be used in a
       * WHERE clause.
@@ -244,7 +244,7 @@ public:
     virtual sal_Bool SAL_CALL
     isSearchable( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException );
+               ::com::sun::star::uno::RuntimeException, std::exception );
     /**
       * Checks whether column is a cash value.
       *
@@ -255,7 +255,7 @@ public:
     virtual sal_Bool SAL_CALL
     isCurrency( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException );
+               ::com::sun::star::uno::RuntimeException, std::exception );
     /**
       * Checks whether a NULL can be stored in column.
       *
@@ -269,7 +269,7 @@ public:
     virtual sal_Int32 SAL_CALL
     isNullable( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException );
+               ::com::sun::star::uno::RuntimeException, std::exception );
     /**
       * Checks whether the value stored in column is a signed number.
       *
@@ -280,7 +280,7 @@ public:
     virtual sal_Bool SAL_CALL
     isSigned( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException );
+               ::com::sun::star::uno::RuntimeException, std::exception );
     /**
       * Gets the normal maximum width in characters for column.
       *
@@ -291,7 +291,7 @@ public:
     virtual sal_Int32 SAL_CALL
     getColumnDisplaySize( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException );
+               ::com::sun::star::uno::RuntimeException, std::exception );
     /**
       * Gets the suggested column title for column, to be used in print-
       * outs and displays.
@@ -303,7 +303,7 @@ public:
     virtual OUString SAL_CALL
     getColumnLabel( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException );
+               ::com::sun::star::uno::RuntimeException, std::exception );
     /**
       * Gets the name of column.
       *
@@ -314,7 +314,7 @@ public:
     virtual OUString SAL_CALL
     getColumnName( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException );
+               ::com::sun::star::uno::RuntimeException, std::exception );
     /**
       * Gets the schema name for the table from which column of this
       * result set was derived.
@@ -328,7 +328,7 @@ public:
     virtual OUString SAL_CALL
     getSchemaName( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException );
+               ::com::sun::star::uno::RuntimeException, std::exception );
     /**
       * For number types, getprecision gets the number of decimal digits
       * in column.
@@ -343,7 +343,7 @@ public:
     virtual sal_Int32 SAL_CALL
     getPrecision( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException );
+               ::com::sun::star::uno::RuntimeException, std::exception );
     /**
       * Gets the number of digits to the right of the decimal point for
       * values in column.
@@ -355,7 +355,7 @@ public:
     virtual sal_Int32 SAL_CALL
     getScale( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException );
+               ::com::sun::star::uno::RuntimeException, std::exception );
     /**
       * Gets the name of the table from which column of this result set
       * was derived or "" if there is none (for example, for a join).
@@ -369,7 +369,7 @@ public:
     virtual OUString SAL_CALL
     getTableName( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException );
+               ::com::sun::star::uno::RuntimeException, std::exception );
     virtual OUString SAL_CALL
     /**
       * Gets the catalog name for the table from which column of this
@@ -383,7 +383,7 @@ public:
       */
     getCatalogName( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException );
+               ::com::sun::star::uno::RuntimeException, std::exception );
     /**
       * Gets the JDBC type for the value stored in column. ... The STRUCT
       * and DISTINCT type codes are always returned for structured and
@@ -398,7 +398,7 @@ public:
     virtual sal_Int32 SAL_CALL
     getColumnType( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException );
+               ::com::sun::star::uno::RuntimeException, std::exception );
     /**
       * Gets the type name used by this particular data source for the
       * values stored in column. If the type code for the type of value
@@ -412,7 +412,7 @@ public:
     virtual OUString SAL_CALL
     getColumnTypeName( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException );
+               ::com::sun::star::uno::RuntimeException, std::exception );
     /**
       * Indicates whether a column is definitely not writable.
       *
@@ -423,7 +423,7 @@ public:
     virtual sal_Bool SAL_CALL
     isReadOnly( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException );
+               ::com::sun::star::uno::RuntimeException, std::exception );
     /**
       * Indicates whether it is possible for a write on the column to succeed.
       *
@@ -434,7 +434,7 @@ public:
     virtual sal_Bool SAL_CALL
     isWritable( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException );
+               ::com::sun::star::uno::RuntimeException, std::exception );
     /**
       * Indicates whether a write on the column will definitely succeed.
       *
@@ -445,7 +445,7 @@ public:
     virtual sal_Bool SAL_CALL
     isDefinitelyWritable( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException );
+               ::com::sun::star::uno::RuntimeException, std::exception );
     /**
       * Returns the fully-qualified name of the service whose instances
       * are manufactured if the method
@@ -460,7 +460,7 @@ public:
     virtual OUString SAL_CALL
     getColumnServiceName( sal_Int32 column )
         throw( ::com::sun::star::sdbc::SQLException,
-               ::com::sun::star::uno::RuntimeException );
+               ::com::sun::star::uno::RuntimeException, std::exception );
 };
 
 } // namespace ucbhelper
diff --git a/include/ucbhelper/std_inputstream.hxx b/include/ucbhelper/std_inputstream.hxx
index 85b19434e251..c0b09854dd36 100644
--- a/include/ucbhelper/std_inputstream.hxx
+++ b/include/ucbhelper/std_inputstream.hxx
@@ -39,7 +39,7 @@ namespace ucbhelper
             ~StdInputStream();
 
             virtual css::uno::Any SAL_CALL queryInterface ( const css::uno::Type& rType )
-                throw ( css::uno::RuntimeException );
+                throw ( css::uno::RuntimeException, std::exception );
 
             virtual void SAL_CALL acquire( ) throw ( );
 
@@ -51,7 +51,7 @@ namespace ucbhelper
                 throw ( css::io::NotConnectedException,
                         css::io::BufferSizeExceededException,
                         css::io::IOException,
-                        css::uno::RuntimeException );
+                        css::uno::RuntimeException, std::exception );
 
             virtual sal_Int32 SAL_CALL
             readSomeBytes ( css::uno::Sequence< sal_Int8 >& aData,
@@ -59,26 +59,26 @@ namespace ucbhelper
                 throw ( css::io::NotConnectedException,
                         css::io::BufferSizeExceededException,
                         css::io::IOException,
-                        css::uno::RuntimeException );
+                        css::uno::RuntimeException, std::exception );
 
             virtual void SAL_CALL
             skipBytes ( sal_Int32 nBytesToSkip )
                 throw ( css::io::NotConnectedException,
                         css::io::BufferSizeExceededException,
                         css::io::IOException,
-                        css::uno::RuntimeException );
+                        css::uno::RuntimeException, std::exception );
 
             virtual sal_Int32 SAL_CALL
             available ( )
                 throw ( css::io::NotConnectedException,
                         css::io::IOException,
-                        css::uno::RuntimeException );
+                        css::uno::RuntimeException, std::exception );
 
             virtual void SAL_CALL
             closeInput ( )
                 throw ( css::io::NotConnectedException,
                         css::io::IOException,
-                        css::uno::RuntimeException );
+                        css::uno::RuntimeException, std::exception );
 
 
             /** XSeekable
@@ -88,18 +88,18 @@ namespace ucbhelper
             seek ( sal_Int64 location )
                 throw ( css::lang::IllegalArgumentException,
                         css::io::IOException,
-                        css::uno::RuntimeException );
+                        css::uno::RuntimeException, std::exception );
 
 
             virtual sal_Int64 SAL_CALL
             getPosition ( )
-                throw ( css::io::IOException, css::uno::RuntimeException );
+                throw ( css::io::IOException, css::uno::RuntimeException, std::exception );
 
 
             virtual sal_Int64 SAL_CALL
             getLength ( )
                 throw ( css::io::IOException,
-                        css::uno::RuntimeException );
+                        css::uno::RuntimeException, std::exception );
 
         private:
 
diff --git a/include/ucbhelper/std_outputstream.hxx b/include/ucbhelper/std_outputstream.hxx
index 76ee31a68a74..9706bf861182 100644
--- a/include/ucbhelper/std_outputstream.hxx
+++ b/include/ucbhelper/std_outputstream.hxx
@@ -35,7 +35,7 @@ namespace ucbhelper
             ~StdOutputStream( );
 
             virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType )
-                throw ( css::uno::RuntimeException );
+                throw ( css::uno::RuntimeException, std::exception );
 
             virtual void SAL_CALL acquire ( ) throw ( );
 
@@ -45,19 +45,19 @@ namespace ucbhelper
                 throw ( css::io::NotConnectedException,
                         css::io::BufferSizeExceededException,
                         css::io::IOException,
-                        css::uno::RuntimeException );
+                        css::uno::RuntimeException, std::exception );
 
             virtual void SAL_CALL flush ( )
                 throw ( css::io::NotConnectedException,
                         css::io::BufferSizeExceededException,
                         css::io::IOException,
-                        css::uno::RuntimeException );
+                        css::uno::RuntimeException, std::exception );
 
             virtual void SAL_CALL closeOutput ( )
                 throw ( css::io::NotConnectedException,
                         css::io::BufferSizeExceededException,
                         css::io::IOException,
-                        css::uno::RuntimeException );
+                        css::uno::RuntimeException, std::exception );
 
         private: