cppuhelper: retrofit std::exception into overriding exception specs

Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3

18 files changed, 172 insertions, 172 deletions

diff --git a/unotools/source/accessibility/accessiblerelationsethelper.cxx b/unotools/source/accessibility/accessiblerelationsethelper.cxx
index df2f6a3cf77d..e3ae2a0d0854 100644
--- a/unotools/source/accessibility/accessiblerelationsethelper.cxx
+++ b/unotools/source/accessibility/accessiblerelationsethelper.cxx
@@ -153,7 +153,7 @@ AccessibleRelationSetHelper::~AccessibleRelationSetHelper(void)
     */
 sal_Int32 SAL_CALL
     AccessibleRelationSetHelper::getRelationCount(  )
-        throw (uno::RuntimeException)
+        throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard (maMutex);
     return mpHelperImpl->getRelationCount();
@@ -175,7 +175,7 @@ sal_Int32 SAL_CALL
  AccessibleRelation SAL_CALL
         AccessibleRelationSetHelper::getRelation( sal_Int32 nIndex )
             throw (lang::IndexOutOfBoundsException,
-                    uno::RuntimeException)
+                    uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard (maMutex);
     return mpHelperImpl->getRelation(nIndex);
@@ -195,7 +195,7 @@ sal_Int32 SAL_CALL
     */
 sal_Bool SAL_CALL
     AccessibleRelationSetHelper::containsRelation( sal_Int16 aRelationType )
-        throw (uno::RuntimeException)
+        throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard (maMutex);
     return mpHelperImpl->containsRelation(aRelationType);
@@ -214,7 +214,7 @@ sal_Bool SAL_CALL
     */
 AccessibleRelation SAL_CALL
         AccessibleRelationSetHelper::getRelationByType( sal_Int16 aRelationType )
-            throw (uno::RuntimeException)
+            throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard (maMutex);
     return mpHelperImpl->getRelationByType(aRelationType);
@@ -231,7 +231,7 @@ void AccessibleRelationSetHelper::AddRelation(const AccessibleRelation& rRelatio
 
 uno::Sequence< ::com::sun::star::uno::Type>
     AccessibleRelationSetHelper::getTypes (void)
-    throw (::com::sun::star::uno::RuntimeException)
+    throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard (maMutex);
     const ::com::sun::star::uno::Type aTypeList[] = {
@@ -252,7 +252,7 @@ namespace
 
 uno::Sequence<sal_Int8> SAL_CALL
     AccessibleRelationSetHelper::getImplementationId (void)
-    throw (::com::sun::star::uno::RuntimeException)
+    throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
     return theAccessibleRelationSetHelperUnoTunnelId::get().getSeq();
 }
diff --git a/unotools/source/accessibility/accessiblestatesethelper.cxx b/unotools/source/accessibility/accessiblestatesethelper.cxx
index f0318fdf5c84..457a84a4bd8f 100644
--- a/unotools/source/accessibility/accessiblestatesethelper.cxx
+++ b/unotools/source/accessibility/accessiblestatesethelper.cxx
@@ -163,7 +163,7 @@ AccessibleStateSetHelper::~AccessibleStateSetHelper(void)
             <FALSE/> if there is at least one state set in it.
     */
 sal_Bool SAL_CALL AccessibleStateSetHelper::isEmpty ()
-    throw (uno::RuntimeException)
+    throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard (maMutex);
     return mpHelperImpl->IsEmpty();
@@ -181,7 +181,7 @@ sal_Bool SAL_CALL AccessibleStateSetHelper::isEmpty ()
             state set and <FALSE/> otherwise.
     */
 sal_Bool SAL_CALL AccessibleStateSetHelper::contains (sal_Int16 aState)
-    throw (uno::RuntimeException)
+    throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard (maMutex);
     return mpHelperImpl->Contains(aState);
@@ -204,7 +204,7 @@ sal_Bool SAL_CALL AccessibleStateSetHelper::contains (sal_Int16 aState)
     */
 sal_Bool SAL_CALL AccessibleStateSetHelper::containsAll
     (const uno::Sequence<sal_Int16>& rStateSet)
-    throw (uno::RuntimeException)
+    throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard (maMutex);
     sal_Int32 nCount(rStateSet.getLength());
@@ -220,7 +220,7 @@ sal_Bool SAL_CALL AccessibleStateSetHelper::containsAll
 }
 
 uno::Sequence<sal_Int16> SAL_CALL AccessibleStateSetHelper::getStates()
-    throw (uno::RuntimeException)
+    throw (uno::RuntimeException, std::exception)
 {
     osl::MutexGuard aGuard(maMutex);
     return mpHelperImpl->GetStates();
@@ -244,7 +244,7 @@ void AccessibleStateSetHelper::RemoveState(sal_Int16 aState)
 
 uno::Sequence< ::com::sun::star::uno::Type>
     AccessibleStateSetHelper::getTypes (void)
-    throw (::com::sun::star::uno::RuntimeException)
+    throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
     const ::com::sun::star::uno::Type aTypeList[] = {
         ::getCppuType((const uno::Reference<
@@ -264,7 +264,7 @@ namespace
 
 uno::Sequence<sal_Int8> SAL_CALL
     AccessibleStateSetHelper::getImplementationId (void)
-    throw (::com::sun::star::uno::RuntimeException)
+    throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
     return theAccessibleStateSetHelperUnoTunnelId::get().getSeq();
 }
diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx
index e2494560779d..5fa5ab134348 100644
--- a/unotools/source/config/configitem.cxx
+++ b/unotools/source/config/configitem.cxx
@@ -86,10 +86,10 @@ namespace utl{
             ~ConfigChangeListener_Impl();
 
         //XChangesListener
-        virtual void SAL_CALL changesOccurred( const ChangesEvent& Event ) throw(RuntimeException);
+        virtual void SAL_CALL changesOccurred( const ChangesEvent& Event ) throw(RuntimeException, std::exception);
 
         //XEventListener
-        virtual void SAL_CALL disposing( const EventObject& Source ) throw(RuntimeException);
+        virtual void SAL_CALL disposing( const EventObject& Source ) throw(RuntimeException, std::exception);
     };
 }
 
@@ -131,7 +131,7 @@ static bool lcl_Find(
     return false;
 }
 
-void ConfigChangeListener_Impl::changesOccurred( const ChangesEvent& rEvent ) throw(RuntimeException)
+void ConfigChangeListener_Impl::changesOccurred( const ChangesEvent& rEvent ) throw(RuntimeException, std::exception)
 {
     const ElementChange* pElementChanges = rEvent.Changes.getConstArray();
 
@@ -160,7 +160,7 @@ void ConfigChangeListener_Impl::changesOccurred( const ChangesEvent& rEvent ) th
 }
 
 
-void ConfigChangeListener_Impl::disposing( const EventObject& /*rSource*/ ) throw(RuntimeException)
+void ConfigChangeListener_Impl::disposing( const EventObject& /*rSource*/ ) throw(RuntimeException, std::exception)
 {
     pParent->RemoveChangesListener();
 }
diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx
index 850578f5cd28..09b763a95472 100644
--- a/unotools/source/config/eventcfg.cxx
+++ b/unotools/source/config/eventcfg.cxx
@@ -345,39 +345,39 @@ GlobalEventConfig::~GlobalEventConfig()
     }
 }
 
-Reference< container::XNameReplace > SAL_CALL GlobalEventConfig::getEvents() throw (::com::sun::star::uno::RuntimeException)
+Reference< container::XNameReplace > SAL_CALL GlobalEventConfig::getEvents() throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     Reference< container::XNameReplace > ret(this);
     return ret;
 }
 
-void SAL_CALL GlobalEventConfig::replaceByName( const OUString& aName, const Any& aElement ) throw (lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, RuntimeException)
+void SAL_CALL GlobalEventConfig::replaceByName( const OUString& aName, const Any& aElement ) throw (lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, RuntimeException, std::exception)
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     m_pImpl->replaceByName( aName, aElement );
 }
-Any SAL_CALL GlobalEventConfig::getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, RuntimeException)
+Any SAL_CALL GlobalEventConfig::getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, RuntimeException, std::exception)
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pImpl->getByName( aName );
 }
-Sequence< OUString > SAL_CALL GlobalEventConfig::getElementNames(  ) throw (RuntimeException)
+Sequence< OUString > SAL_CALL GlobalEventConfig::getElementNames(  ) throw (RuntimeException, std::exception)
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pImpl->getElementNames( );
 }
-sal_Bool SAL_CALL GlobalEventConfig::hasByName( const OUString& aName ) throw (RuntimeException)
+sal_Bool SAL_CALL GlobalEventConfig::hasByName( const OUString& aName ) throw (RuntimeException, std::exception)
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pImpl->hasByName( aName );
 }
-Type SAL_CALL GlobalEventConfig::getElementType(  ) throw (RuntimeException)
+Type SAL_CALL GlobalEventConfig::getElementType(  ) throw (RuntimeException, std::exception)
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pImpl->getElementType( );
 }
-sal_Bool SAL_CALL GlobalEventConfig::hasElements(  ) throw (RuntimeException)
+sal_Bool SAL_CALL GlobalEventConfig::hasElements(  ) throw (RuntimeException, std::exception)
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pImpl->hasElements( );
diff --git a/unotools/source/config/itemholder1.cxx b/unotools/source/config/itemholder1.cxx
index da36d669ffd3..493df843c3a1 100644
--- a/unotools/source/config/itemholder1.cxx
+++ b/unotools/source/config/itemholder1.cxx
@@ -95,7 +95,7 @@ void ItemHolder1::holdConfigItem(EItem eItem)
 
 
 void SAL_CALL ItemHolder1::disposing(const css::lang::EventObject&)
-    throw(css::uno::RuntimeException)
+    throw(css::uno::RuntimeException, std::exception)
 {
     css::uno::Reference< css::uno::XInterface > xSelfHold(static_cast< css::lang::XEventListener* >(this), css::uno::UNO_QUERY);
     impl_releaseAllItems();
diff --git a/unotools/source/config/itemholder1.hxx b/unotools/source/config/itemholder1.hxx
index c5c41ede523a..db1cc261b3e7 100644
--- a/unotools/source/config/itemholder1.hxx
+++ b/unotools/source/config/itemholder1.hxx
@@ -46,7 +46,7 @@ class ItemHolder1 : private ItemHolderMutexBase
     public:
 
         virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent)
-            throw(css::uno::RuntimeException);
+            throw(css::uno::RuntimeException, std::exception);
 
 
     // helper
diff --git a/unotools/source/config/useroptions.cxx b/unotools/source/config/useroptions.cxx
index 5f17b08f4e99..e4c9a1924899 100644
--- a/unotools/source/config/useroptions.cxx
+++ b/unotools/source/config/useroptions.cxx
@@ -79,9 +79,9 @@ public:
     ChangeListener (Impl& rParent): m_rParent(rParent) { }
 
     // XChangesListener
-    virtual void SAL_CALL changesOccurred (util::ChangesEvent const& Event) throw(uno::RuntimeException);
+    virtual void SAL_CALL changesOccurred (util::ChangesEvent const& Event) throw(uno::RuntimeException, std::exception);
     // XEventListener
-    virtual void SAL_CALL disposing (lang::EventObject const& Source) throw(uno::RuntimeException);
+    virtual void SAL_CALL disposing (lang::EventObject const& Source) throw(uno::RuntimeException, std::exception);
 
 private:
     Impl& m_rParent;
@@ -105,13 +105,13 @@ private:
     uno::Reference<beans::XPropertySet>    m_xData;
 };
 
-void SvtUserOptions::ChangeListener::changesOccurred (util::ChangesEvent const& rEvent) throw(uno::RuntimeException)
+void SvtUserOptions::ChangeListener::changesOccurred (util::ChangesEvent const& rEvent) throw(uno::RuntimeException, std::exception)
 {
     if (rEvent.Changes.getLength())
         m_rParent.Notify();
 }
 
-void SvtUserOptions::ChangeListener::disposing (lang::EventObject const& rSource) throw(uno::RuntimeException)
+void SvtUserOptions::ChangeListener::disposing (lang::EventObject const& rSource) throw(uno::RuntimeException, std::exception)
 {
     try
     {
diff --git a/unotools/source/config/xmlaccelcfg.cxx b/unotools/source/config/xmlaccelcfg.cxx
index a63f7956ef05..86c9e54add1d 100644
--- a/unotools/source/config/xmlaccelcfg.cxx
+++ b/unotools/source/config/xmlaccelcfg.cxx
@@ -35,7 +35,7 @@ using namespace com::sun::star::xml::sax;
 #define ATTRIBUTE_MODIFIER          "modifier"
 #define ATTRIBUTE_URL               "url"
 
-Any SAL_CALL OReadAccelatorDocumentHandler::queryInterface( const Type & rType ) throw( RuntimeException )
+Any SAL_CALL OReadAccelatorDocumentHandler::queryInterface( const Type & rType ) throw( RuntimeException, std::exception )
 {
     Any a = ::cppu::queryInterface( rType ,(static_cast< XDocumentHandler* >(this)));
     if ( a.hasValue() )
@@ -46,19 +46,19 @@ Any SAL_CALL OReadAccelatorDocumentHandler::queryInterface( const Type & rType )
 
 void SAL_CALL OReadAccelatorDocumentHandler::ignorableWhitespace(
     const OUString& )
-throw( SAXException, RuntimeException )
+throw( SAXException, RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL OReadAccelatorDocumentHandler::processingInstruction(
     const OUString&, const OUString& )
-throw( SAXException, RuntimeException )
+throw( SAXException, RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL OReadAccelatorDocumentHandler::setDocumentLocator(
     const Reference< XLocator > &xLocator)
-throw(  SAXException, RuntimeException )
+throw(  SAXException, RuntimeException, std::exception )
 {
     m_xLocator = xLocator;
 }
@@ -76,12 +76,12 @@ OUString OReadAccelatorDocumentHandler::getErrorLineString()
 }
 
 void SAL_CALL OReadAccelatorDocumentHandler::startDocument(void)
-    throw ( SAXException, RuntimeException )
+    throw ( SAXException, RuntimeException, std::exception )
 {
 }
 
 void SAL_CALL OReadAccelatorDocumentHandler::endDocument(void)
-    throw( SAXException, RuntimeException )
+    throw( SAXException, RuntimeException, std::exception )
 {
     if ( m_nElementDepth > 0 )
     {
@@ -94,7 +94,7 @@ void SAL_CALL OReadAccelatorDocumentHandler::endDocument(void)
 
 void SAL_CALL OReadAccelatorDocumentHandler::startElement(
     const OUString& aElementName, const Reference< XAttributeList > &xAttrList )
-throw( SAXException, RuntimeException )
+throw( SAXException, RuntimeException, std::exception )
 {
     m_nElementDepth++;
 
@@ -153,13 +153,13 @@ throw( SAXException, RuntimeException )
 
 
 void SAL_CALL OReadAccelatorDocumentHandler::characters(const OUString&)
-throw(  SAXException, RuntimeException )
+throw(  SAXException, RuntimeException, std::exception )
 {
 }
 
 
 void SAL_CALL OReadAccelatorDocumentHandler::endElement( const OUString& aName )
-    throw( SAXException, RuntimeException )
+    throw( SAXException, RuntimeException, std::exception )
 {
     m_nElementDepth--;
 
diff --git a/unotools/source/misc/closeveto.cxx b/unotools/source/misc/closeveto.cxx
index b59c45342532..6f2adc340b35 100644
--- a/unotools/source/misc/closeveto.cxx
+++ b/unotools/source/misc/closeveto.cxx
@@ -60,11 +60,11 @@ namespace utl
         }
 
         // XCloseListener
-        virtual void SAL_CALL queryClosing( const EventObject& Source, ::sal_Bool GetsOwnership ) throw (CloseVetoException, RuntimeException);
-        virtual void SAL_CALL notifyClosing( const EventObject& Source ) throw (RuntimeException);
+        virtual void SAL_CALL queryClosing( const EventObject& Source, ::sal_Bool GetsOwnership ) throw (CloseVetoException, RuntimeException, std::exception);
+        virtual void SAL_CALL notifyClosing( const EventObject& Source ) throw (RuntimeException, std::exception);
 
         // XEventListener
-        virtual void SAL_CALL disposing( const EventObject& Source) throw (RuntimeException);
+        virtual void SAL_CALL disposing( const EventObject& Source) throw (RuntimeException, std::exception);
 
         bool hasOwnership() const { return m_bHasOwnership; }
 
@@ -78,7 +78,7 @@ namespace utl
     };
 
 
-    void SAL_CALL CloseListener_Impl::queryClosing( const EventObject& i_source, ::sal_Bool i_deliverOwnership ) throw (CloseVetoException, RuntimeException)
+    void SAL_CALL CloseListener_Impl::queryClosing( const EventObject& i_source, ::sal_Bool i_deliverOwnership ) throw (CloseVetoException, RuntimeException, std::exception)
     {
         (void)i_source;
 
@@ -89,13 +89,13 @@ namespace utl
     }
 
 
-    void SAL_CALL CloseListener_Impl::notifyClosing( const EventObject& i_source ) throw (RuntimeException)
+    void SAL_CALL CloseListener_Impl::notifyClosing( const EventObject& i_source ) throw (RuntimeException, std::exception)
     {
         (void)i_source;
     }
 
 
-    void SAL_CALL CloseListener_Impl::disposing( const EventObject& i_source ) throw (RuntimeException)
+    void SAL_CALL CloseListener_Impl::disposing( const EventObject& i_source ) throw (RuntimeException, std::exception)
     {
         (void)i_source;
     }
diff --git a/unotools/source/misc/desktopterminationobserver.cxx b/unotools/source/misc/desktopterminationobserver.cxx
index a6432f172371..b71652b5e508 100644
--- a/unotools/source/misc/desktopterminationobserver.cxx
+++ b/unotools/source/misc/desktopterminationobserver.cxx
@@ -70,11 +70,11 @@ namespace utl
 
         private:
             // XTerminateListener
-            virtual void SAL_CALL queryTermination( const EventObject& Event ) throw (TerminationVetoException, RuntimeException);
-            virtual void SAL_CALL notifyTermination( const EventObject& Event ) throw (RuntimeException);
+            virtual void SAL_CALL queryTermination( const EventObject& Event ) throw (TerminationVetoException, RuntimeException, std::exception);
+            virtual void SAL_CALL notifyTermination( const EventObject& Event ) throw (RuntimeException, std::exception);
 
             // XEventListener
-            virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception);
         };
 
 
@@ -112,7 +112,7 @@ namespace utl
         }
 
 
-        void SAL_CALL OObserverImpl::queryTermination( const EventObject& /*Event*/ ) throw (TerminationVetoException, RuntimeException)
+        void SAL_CALL OObserverImpl::queryTermination( const EventObject& /*Event*/ ) throw (TerminationVetoException, RuntimeException, std::exception)
         {
             Listeners aToNotify;
             {
@@ -131,7 +131,7 @@ namespace utl
         }
 
 
-        void SAL_CALL OObserverImpl::notifyTermination( const EventObject& /*Event*/ ) throw (RuntimeException)
+        void SAL_CALL OObserverImpl::notifyTermination( const EventObject& /*Event*/ ) throw (RuntimeException, std::exception)
         {
             // get the listeners
             Listeners aToNotify;
@@ -159,7 +159,7 @@ namespace utl
         }
 
 
-        void SAL_CALL OObserverImpl::disposing( const EventObject& /*Event*/ ) throw (RuntimeException)
+        void SAL_CALL OObserverImpl::disposing( const EventObject& /*Event*/ ) throw (RuntimeException, std::exception)
         {
 #if OSL_DEBUG_LEVEL > 0
             ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
diff --git a/unotools/source/misc/eventlisteneradapter.cxx b/unotools/source/misc/eventlisteneradapter.cxx
index 10308d2dc73f..91973c5e6c64 100644
--- a/unotools/source/misc/eventlisteneradapter.cxx
+++ b/unotools/source/misc/eventlisteneradapter.cxx
@@ -52,7 +52,7 @@ namespace utl
         const Reference< XComponent >&  getComponent() const { return m_xComponent; }
 
     protected:
-        virtual void SAL_CALL disposing( const EventObject& _rSource ) throw (RuntimeException);
+        virtual void SAL_CALL disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception);
     };
 
 
@@ -84,7 +84,7 @@ namespace utl
     }
 
 
-    void SAL_CALL OEventListenerImpl::disposing( const EventObject& _rSource ) throw (RuntimeException)
+    void SAL_CALL OEventListenerImpl::disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception)
     {
         Reference< XEventListener > xDeleteUponLeaving = m_xKeepMeAlive;
         m_xKeepMeAlive.clear();
diff --git a/unotools/source/misc/sharedunocomponent.cxx b/unotools/source/misc/sharedunocomponent.cxx
index b4d95ad3d5c4..70d61bd229da 100644
--- a/unotools/source/misc/sharedunocomponent.cxx
+++ b/unotools/source/misc/sharedunocomponent.cxx
@@ -90,11 +90,11 @@ namespace utl
         virtual ~CloseableComponentImpl();
 
         // XCloseListener overridables
-        virtual void SAL_CALL queryClosing( const EventObject& Source, ::sal_Bool GetsOwnership ) throw (CloseVetoException, RuntimeException);
-        virtual void SAL_CALL notifyClosing( const EventObject& Source ) throw (RuntimeException);
+        virtual void SAL_CALL queryClosing( const EventObject& Source, ::sal_Bool GetsOwnership ) throw (CloseVetoException, RuntimeException, std::exception);
+        virtual void SAL_CALL notifyClosing( const EventObject& Source ) throw (RuntimeException, std::exception);
 
         // XEventListener overridables
-        virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception);
 
     private:
         /** starts or stops being a CloseListener at the component
@@ -177,7 +177,7 @@ namespace utl
     #ifdef DBG_UTIL
     Source
     #endif
-    , ::sal_Bool /*GetsOwnership*/ ) throw (CloseVetoException, RuntimeException)
+    , ::sal_Bool /*GetsOwnership*/ ) throw (CloseVetoException, RuntimeException, std::exception)
     {
         // as long as we live, somebody wants to keep the object alive. So, veto the
         // closing
@@ -190,7 +190,7 @@ namespace utl
     #ifdef DBG_UTIL
     Source
     #endif
-    ) throw (RuntimeException)
+    ) throw (RuntimeException, std::exception)
     {
         DBG_ASSERT( Source.Source == m_xCloseable, "CloseableComponentImpl::notifyClosing: where did this come from?" );
 
@@ -205,7 +205,7 @@ namespace utl
     #ifdef DBG_UTIL
     Source
     #endif
-    ) throw (RuntimeException)
+    ) throw (RuntimeException, std::exception)
     {
         DBG_ASSERT( Source.Source == m_xCloseable, "CloseableComponentImpl::disposing: where did this come from?" );
         OSL_FAIL( "CloseableComponentImpl::disposing: unreachable!" );
diff --git a/unotools/source/streaming/streamhelper.cxx b/unotools/source/streaming/streamhelper.cxx
index 1fc0329507d0..519e6c7455ad 100644
--- a/unotools/source/streaming/streamhelper.cxx
+++ b/unotools/source/streaming/streamhelper.cxx
@@ -36,7 +36,7 @@ void SAL_CALL OInputStreamHelper::release() throw ()
 
 
 sal_Int32 SAL_CALL OInputStreamHelper::readBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
-    throw(stario::NotConnectedException, stario::BufferSizeExceededException, stario::IOException, staruno::RuntimeException)
+    throw(stario::NotConnectedException, stario::BufferSizeExceededException, stario::IOException, staruno::RuntimeException, std::exception)
 {
     if (!m_xLockBytes.Is())
         throw stario::NotConnectedException(OUString(), static_cast<staruno::XWeak*>(this));
@@ -62,7 +62,7 @@ sal_Int32 SAL_CALL OInputStreamHelper::readBytes(staruno::Sequence< sal_Int8 >&
     return nRead;
 }
 
-void SAL_CALL OInputStreamHelper::seek( sal_Int64 location ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException)
+void SAL_CALL OInputStreamHelper::seek( sal_Int64 location ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     // cast is truncating, but position would be truncated as soon as
@@ -70,12 +70,12 @@ void SAL_CALL OInputStreamHelper::seek( sal_Int64 location ) throw(::com::sun::s
     m_nActPos = sal::static_int_cast<sal_uInt32>(location);
 }
 
-sal_Int64 SAL_CALL OInputStreamHelper::getPosition(  ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException)
+sal_Int64 SAL_CALL OInputStreamHelper::getPosition(  ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception)
 {
     return m_nActPos;
 }
 
-sal_Int64 SAL_CALL OInputStreamHelper::getLength(  ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException)
+sal_Int64 SAL_CALL OInputStreamHelper::getLength(  ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception)
 {
     if (!m_xLockBytes.Is())
         return 0;
@@ -89,7 +89,7 @@ sal_Int64 SAL_CALL OInputStreamHelper::getLength(  ) throw(::com::sun::star::io:
 
 sal_Int32 SAL_CALL OInputStreamHelper::readSomeBytes(staruno::Sequence< sal_Int8 >& aData,
                                                      sal_Int32 nMaxBytesToRead)
-    throw (stario::NotConnectedException, stario::BufferSizeExceededException, stario::IOException, staruno::RuntimeException)
+    throw (stario::NotConnectedException, stario::BufferSizeExceededException, stario::IOException, staruno::RuntimeException, std::exception)
 {
     // read all data desired
     return readBytes(aData, nMaxBytesToRead);
@@ -97,7 +97,7 @@ sal_Int32 SAL_CALL OInputStreamHelper::readSomeBytes(staruno::Sequence< sal_Int8
 
 
 void SAL_CALL OInputStreamHelper::skipBytes(sal_Int32 nBytesToSkip)
-    throw (stario::NotConnectedException, stario::BufferSizeExceededException, stario::IOException, staruno::RuntimeException)
+    throw (stario::NotConnectedException, stario::BufferSizeExceededException, stario::IOException, staruno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if (!m_xLockBytes.Is())
@@ -111,7 +111,7 @@ void SAL_CALL OInputStreamHelper::skipBytes(sal_Int32 nBytesToSkip)
 
 
 sal_Int32 SAL_CALL OInputStreamHelper::available()
-    throw (stario::NotConnectedException, stario::IOException, staruno::RuntimeException)
+    throw (stario::NotConnectedException, stario::IOException, staruno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if (!m_xLockBytes.Is())
@@ -122,7 +122,7 @@ sal_Int32 SAL_CALL OInputStreamHelper::available()
 
 
 void SAL_CALL OInputStreamHelper::closeInput()
-    throw (stario::NotConnectedException, stario::IOException, staruno::RuntimeException)
+    throw (stario::NotConnectedException, stario::IOException, staruno::RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if (!m_xLockBytes.Is())
diff --git a/unotools/source/streaming/streamwrap.cxx b/unotools/source/streaming/streamwrap.cxx
index 72aee2066eed..822f1a6d3eec 100644
--- a/unotools/source/streaming/streamwrap.cxx
+++ b/unotools/source/streaming/streamwrap.cxx
@@ -61,7 +61,7 @@ OInputStreamWrapper::~OInputStreamWrapper()
 
 
 sal_Int32 SAL_CALL OInputStreamWrapper::readBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
-                throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException )
+                throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception )
 {
     checkConnected();
 
@@ -83,7 +83,7 @@ sal_Int32 SAL_CALL OInputStreamWrapper::readBytes(staruno::Sequence< sal_Int8 >&
 }
 
 
-sal_Int32 SAL_CALL OInputStreamWrapper::readSomeBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException )
+sal_Int32 SAL_CALL OInputStreamWrapper::readSomeBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception )
 {
     checkError();
 
@@ -100,7 +100,7 @@ sal_Int32 SAL_CALL OInputStreamWrapper::readSomeBytes(staruno::Sequence< sal_Int
 }
 
 
-void SAL_CALL OInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException )
+void SAL_CALL OInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkError();
@@ -110,7 +110,7 @@ void SAL_CALL OInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( star
 }
 
 
-sal_Int32 SAL_CALL OInputStreamWrapper::available() throw( stario::NotConnectedException, staruno::RuntimeException )
+sal_Int32 SAL_CALL OInputStreamWrapper::available() throw( stario::NotConnectedException, staruno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkConnected();
@@ -129,7 +129,7 @@ sal_Int32 SAL_CALL OInputStreamWrapper::available() throw( stario::NotConnectedE
 }
 
 
-void SAL_CALL OInputStreamWrapper::closeInput() throw( stario::NotConnectedException, staruno::RuntimeException )
+void SAL_CALL OInputStreamWrapper::closeInput() throw( stario::NotConnectedException, staruno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkConnected();
@@ -173,7 +173,7 @@ OSeekableInputStreamWrapper::OSeekableInputStreamWrapper(SvStream* _pStream, boo
 }
 
 
-void SAL_CALL OSeekableInputStreamWrapper::seek( sal_Int64 _nLocation ) throw (IllegalArgumentException, IOException, RuntimeException)
+void SAL_CALL OSeekableInputStreamWrapper::seek( sal_Int64 _nLocation ) throw (IllegalArgumentException, IOException, RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkConnected();
@@ -183,7 +183,7 @@ void SAL_CALL OSeekableInputStreamWrapper::seek( sal_Int64 _nLocation ) throw (I
 }
 
 
-sal_Int64 SAL_CALL OSeekableInputStreamWrapper::getPosition(  ) throw (IOException, RuntimeException)
+sal_Int64 SAL_CALL OSeekableInputStreamWrapper::getPosition(  ) throw (IOException, RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkConnected();
@@ -194,7 +194,7 @@ sal_Int64 SAL_CALL OSeekableInputStreamWrapper::getPosition(  ) throw (IOExcepti
 }
 
 
-sal_Int64 SAL_CALL OSeekableInputStreamWrapper::getLength(  ) throw (IOException, RuntimeException)
+sal_Int64 SAL_CALL OSeekableInputStreamWrapper::getLength(  ) throw (IOException, RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkConnected();
@@ -221,7 +221,7 @@ OOutputStreamWrapper::OOutputStreamWrapper(SvStream& _rStream):
 
 OOutputStreamWrapper::~OOutputStreamWrapper() {}
 
-void SAL_CALL OOutputStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8 >& aData) throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException )
+void SAL_CALL OOutputStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8 >& aData) throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception )
 {
     sal_uInt32 nWritten = rStream.Write(aData.getConstArray(),aData.getLength());
     ErrCode err = rStream.GetError();
@@ -234,14 +234,14 @@ void SAL_CALL OOutputStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8
 }
 
 
-void SAL_CALL OOutputStreamWrapper::flush() throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException )
+void SAL_CALL OOutputStreamWrapper::flush() throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception )
 {
     rStream.Flush();
     checkError();
 }
 
 
-void SAL_CALL OOutputStreamWrapper::closeOutput() throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException )
+void SAL_CALL OOutputStreamWrapper::closeOutput() throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception )
 {
 }
 
@@ -265,7 +265,7 @@ OSeekableOutputStreamWrapper::OSeekableOutputStreamWrapper(SvStream& _rStream)
 OSeekableOutputStreamWrapper::~OSeekableOutputStreamWrapper() {}
 
 
-Any SAL_CALL OSeekableOutputStreamWrapper::queryInterface( const Type& _rType ) throw (RuntimeException)
+Any SAL_CALL OSeekableOutputStreamWrapper::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception)
 {
     Any aReturn = OOutputStreamWrapper::queryInterface(_rType);
     if (!aReturn.hasValue())
@@ -286,14 +286,14 @@ void SAL_CALL OSeekableOutputStreamWrapper::release(  ) throw ()
 }
 
 
-void SAL_CALL OSeekableOutputStreamWrapper::seek( sal_Int64 _nLocation ) throw (IllegalArgumentException, IOException, RuntimeException)
+void SAL_CALL OSeekableOutputStreamWrapper::seek( sal_Int64 _nLocation ) throw (IllegalArgumentException, IOException, RuntimeException, std::exception)
 {
     rStream.Seek((sal_uInt32)_nLocation);
     checkError();
 }
 
 
-sal_Int64 SAL_CALL OSeekableOutputStreamWrapper::getPosition(  ) throw (IOException, RuntimeException)
+sal_Int64 SAL_CALL OSeekableOutputStreamWrapper::getPosition(  ) throw (IOException, RuntimeException, std::exception)
 {
     sal_uInt32 nPos = rStream.Tell();
     checkError();
@@ -301,7 +301,7 @@ sal_Int64 SAL_CALL OSeekableOutputStreamWrapper::getPosition(  ) throw (IOExcept
 }
 
 
-sal_Int64 SAL_CALL OSeekableOutputStreamWrapper::getLength(  ) throw (IOException, RuntimeException)
+sal_Int64 SAL_CALL OSeekableOutputStreamWrapper::getLength(  ) throw (IOException, RuntimeException, std::exception)
 {
     sal_uInt32 nCurrentPos = rStream.Tell();
     checkError();
@@ -322,19 +322,19 @@ OStreamWrapper::OStreamWrapper(SvStream& _rStream)
 }
 
 
-::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL OStreamWrapper::getInputStream(  ) throw (::com::sun::star::uno::RuntimeException)
+::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL OStreamWrapper::getInputStream(  ) throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
     return this;
 }
 
 
-::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL OStreamWrapper::getOutputStream(  ) throw (::com::sun::star::uno::RuntimeException)
+::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL OStreamWrapper::getOutputStream(  ) throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
     return this;
 }
 
 
-void SAL_CALL OStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8 >& aData) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException)
+void SAL_CALL OStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8 >& aData) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception)
 {
     sal_uInt32 nWritten = m_pSvStream->Write(aData.getConstArray(),aData.getLength());
     ErrCode err = m_pSvStream->GetError();
@@ -347,7 +347,7 @@ void SAL_CALL OStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8 >& aD
 }
 
 
-void SAL_CALL OStreamWrapper::flush() throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException)
+void SAL_CALL OStreamWrapper::flush() throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception)
 {
     m_pSvStream->Flush();
     if (m_pSvStream->GetError() != ERRCODE_NONE)
@@ -355,12 +355,12 @@ void SAL_CALL OStreamWrapper::flush() throw(stario::NotConnectedException, stari
 }
 
 
-void SAL_CALL OStreamWrapper::closeOutput() throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException)
+void SAL_CALL OStreamWrapper::closeOutput() throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception)
 {
 }
 
 
-void SAL_CALL OStreamWrapper::truncate() throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException)
+void SAL_CALL OStreamWrapper::truncate() throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception)
 {
     m_pSvStream->SetStreamSize(0);
 }
diff --git a/unotools/source/ucbhelper/XTempFile.hxx b/unotools/source/ucbhelper/XTempFile.hxx
index c11ae0d5ebcf..626954c60c79 100644
--- a/unotools/source/ucbhelper/XTempFile.hxx
+++ b/unotools/source/ucbhelper/XTempFile.hxx
@@ -66,67 +66,67 @@ public:
     //Methods
     //  XInterface
     virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (::com::sun::star::uno::RuntimeException, std::exception);
     virtual void SAL_CALL acquire(  )
         throw ();
     virtual void SAL_CALL release(  )
         throw ();
     //  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);
 
     //  XTempFile
     virtual ::sal_Bool SAL_CALL getRemoveFile()
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (::com::sun::star::uno::RuntimeException, std::exception);
     virtual void SAL_CALL setRemoveFile( ::sal_Bool _removefile )
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (::com::sun::star::uno::RuntimeException, std::exception);
     virtual OUString SAL_CALL getUri()
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (::com::sun::star::uno::RuntimeException, std::exception);
     virtual OUString SAL_CALL getResourceName()
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (::com::sun::star::uno::RuntimeException, std::exception);
 
     // XInputStream
     virtual ::sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nBytesToRead )
-        throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+        throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception);
     virtual ::sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nMaxBytesToRead )
-        throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+        throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception);
     virtual void SAL_CALL skipBytes( ::sal_Int32 nBytesToSkip )
-        throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+        throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception);
     virtual ::sal_Int32 SAL_CALL available(  )
-        throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+        throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception);
     virtual void SAL_CALL closeInput(  )
-        throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+        throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception);
     // XOutputStream
     virtual void SAL_CALL writeBytes( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aData )
-        throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+        throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception);
     virtual void SAL_CALL flush(  )
-        throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+        throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception);
     virtual void SAL_CALL closeOutput(  )
-        throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+        throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception);
     // XSeekable
     virtual void SAL_CALL seek( sal_Int64 location )
-        throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+        throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception);
     virtual sal_Int64 SAL_CALL getPosition(  )
-        throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+        throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception);
     virtual sal_Int64 SAL_CALL getLength(  )
-        throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+        throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception);
     // XStream
     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);
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL getOutputStream(  )
-        throw (::com::sun::star::uno::RuntimeException);
+        throw (::com::sun::star::uno::RuntimeException, std::exception);
     // XTruncate
     virtual void SAL_CALL truncate()
-        throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
+        throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception);
     // XServiceInfo
     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);
 
     //::com::sun::star::uno::Reference < ::com::sun::star::uno::XInterface > SAL_CALL XTempFile_createInstance( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & context);
     static OUString getImplementationName_Static ();
diff --git a/unotools/source/ucbhelper/progresshandlerwrap.cxx b/unotools/source/ucbhelper/progresshandlerwrap.cxx
index 904781a18f22..60f2c784453b 100644
--- a/unotools/source/ucbhelper/progresshandlerwrap.cxx
+++ b/unotools/source/ucbhelper/progresshandlerwrap.cxx
@@ -49,7 +49,7 @@ bool getStatusFromAny_Impl( const Any& aAny, OUString& aText, sal_Int32& nNum )
 }
 
 void SAL_CALL ProgressHandlerWrap::push( const Any& Status )
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     if( !m_xStatusIndicator.is() )
         return;
@@ -62,7 +62,7 @@ void SAL_CALL ProgressHandlerWrap::push( const Any& Status )
 }
 
 void SAL_CALL ProgressHandlerWrap::update( const Any& Status )
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     if( !m_xStatusIndicator.is() )
         return;
@@ -78,7 +78,7 @@ void SAL_CALL ProgressHandlerWrap::update( const Any& Status )
 }
 
 void SAL_CALL ProgressHandlerWrap::pop()
-        throw( RuntimeException )
+        throw( RuntimeException, std::exception )
 {
     if( m_xStatusIndicator.is() )
         m_xStatusIndicator->end();
diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx
index 13907c2777b8..f4f0fd0c5136 100644
--- a/unotools/source/ucbhelper/ucblockbytes.cxx
+++ b/unotools/source/ucbhelper/ucblockbytes.cxx
@@ -83,16 +83,16 @@ public:
                             { return m_xLockBytes; }
 
     // XActiveDataControl.
-    virtual void SAL_CALL   addListener ( const Reference<XStreamListener> &/*rxListener*/) throw(RuntimeException) {}
-    virtual void SAL_CALL   removeListener ( const Reference<XStreamListener> &/*rxListener*/) throw(RuntimeException) {}
-    virtual void SAL_CALL   start (void) throw(RuntimeException) {}
-    virtual void SAL_CALL   terminate (void) throw(RuntimeException)
+    virtual void SAL_CALL   addListener ( const Reference<XStreamListener> &/*rxListener*/) throw(RuntimeException, std::exception) {}
+    virtual void SAL_CALL   removeListener ( const Reference<XStreamListener> &/*rxListener*/) throw(RuntimeException, std::exception) {}
+    virtual void SAL_CALL   start (void) throw(RuntimeException, std::exception) {}
+    virtual void SAL_CALL   terminate (void) throw(RuntimeException, std::exception)
                             { m_xLockBytes->terminate_Impl(); }
 
     // XActiveDataSink.
-    virtual void SAL_CALL   setInputStream ( const Reference<XInputStream> &rxInputStream) throw(RuntimeException)
+    virtual void SAL_CALL   setInputStream ( const Reference<XInputStream> &rxInputStream) throw(RuntimeException, std::exception)
                             { m_xLockBytes->setInputStream_Impl (rxInputStream); }
-    virtual Reference<XInputStream> SAL_CALL getInputStream (void) throw(RuntimeException)
+    virtual Reference<XInputStream> SAL_CALL getInputStream (void) throw(RuntimeException, std::exception)
                             { return m_xLockBytes->getInputStream_Impl(); }
 };
 
@@ -110,16 +110,16 @@ public:
                             {}
 
     // XActiveDataControl.
-    virtual void SAL_CALL   addListener ( const Reference<XStreamListener> &/*rxListener*/) throw(RuntimeException) {}
-    virtual void SAL_CALL   removeListener ( const Reference<XStreamListener> &/*rxListener*/) throw(RuntimeException) {}
-    virtual void SAL_CALL   start (void) throw(RuntimeException) {}
-    virtual void SAL_CALL   terminate (void) throw(RuntimeException)
+    virtual void SAL_CALL   addListener ( const Reference<XStreamListener> &/*rxListener*/) throw(RuntimeException, std::exception) {}
+    virtual void SAL_CALL   removeListener ( const Reference<XStreamListener> &/*rxListener*/) throw(RuntimeException, std::exception) {}
+    virtual void SAL_CALL   start (void) throw(RuntimeException, std::exception) {}
+    virtual void SAL_CALL   terminate (void) throw(RuntimeException, std::exception)
                             { m_xLockBytes->terminate_Impl(); }
 
     // XActiveDataStreamer
-    virtual void SAL_CALL   setStream( const Reference< XStream >& aStream ) throw(RuntimeException)
+    virtual void SAL_CALL   setStream( const Reference< XStream >& aStream ) throw(RuntimeException, std::exception)
                             { m_xStream = aStream; m_xLockBytes->setStream_Impl( aStream ); }
-    virtual Reference< XStream > SAL_CALL getStream() throw(RuntimeException)
+    virtual Reference< XStream > SAL_CALL getStream() throw(RuntimeException, std::exception)
                             { return m_xStream; }
 };
 
@@ -135,9 +135,9 @@ public:
                                 : m_aProgress( rLink )
                             {}
     // XProgressHandler
-    virtual void SAL_CALL   push(const Any & /*rStatus*/) throw (RuntimeException) {}
-    virtual void SAL_CALL   pop() throw (RuntimeException) {}
-    virtual void SAL_CALL   update(const Any & /*rStatus*/) throw (RuntimeException)
+    virtual void SAL_CALL   push(const Any & /*rStatus*/) throw (RuntimeException, std::exception) {}
+    virtual void SAL_CALL   pop() throw (RuntimeException, std::exception) {}
+    virtual void SAL_CALL   update(const Any & /*rStatus*/) throw (RuntimeException, std::exception)
                             { if ( m_aProgress.IsSet() ) m_aProgress.Call( 0 ); }
 };
 
@@ -156,10 +156,10 @@ public:
                                 , m_xProgressHandler( rxProgressHandler )
                             {}
 
-    virtual Reference<XInteractionHandler> SAL_CALL getInteractionHandler() throw (RuntimeException)
+    virtual Reference<XInteractionHandler> SAL_CALL getInteractionHandler() throw (RuntimeException, std::exception)
     { return m_xInteractionHandler; }
 
-    virtual Reference<XProgressHandler> SAL_CALL    getProgressHandler() throw (RuntimeException)
+    virtual Reference<XProgressHandler> SAL_CALL    getProgressHandler() throw (RuntimeException, std::exception)
     { return m_xProgressHandler; }
 };
 
@@ -176,11 +176,11 @@ public:
                                 : m_xLockBytes( rRef )
                             {}
 
-    virtual void SAL_CALL   disposing ( const EventObject &/*rEvent*/) throw(RuntimeException) {}
-    virtual void SAL_CALL   propertiesChange ( const Sequence<PropertyChangeEvent> &rEvent) throw(RuntimeException);
+    virtual void SAL_CALL   disposing ( const EventObject &/*rEvent*/) throw(RuntimeException, std::exception) {}
+    virtual void SAL_CALL   propertiesChange ( const Sequence<PropertyChangeEvent> &rEvent) throw(RuntimeException, std::exception);
 };
 
-void SAL_CALL UcbPropertiesChangeListener_Impl::propertiesChange ( const Sequence<PropertyChangeEvent> &rEvent) throw(RuntimeException)
+void SAL_CALL UcbPropertiesChangeListener_Impl::propertiesChange ( const Sequence<PropertyChangeEvent> &rEvent) throw(RuntimeException, std::exception)
 {
     sal_Int32 i, n = rEvent.getLength();
     for (i = 0; i < n; i++)
@@ -384,14 +384,14 @@ public:
         const Reference< XStream >& aStream
     )
         throw(
-            RuntimeException
+            RuntimeException, std::exception
         );
 
     virtual Reference<XStream> SAL_CALL
     getStream (
         void
     ) throw(
-        RuntimeException
+        RuntimeException, std::exception
     )
     {
         osl::MutexGuard aGuard(m_aMutex);
@@ -422,14 +422,14 @@ public:
         const Reference<XInputStream> &rxInputStream
     )
         throw(
-            RuntimeException
+            RuntimeException, std::exception
         );
 
     virtual Reference<XInputStream> SAL_CALL
     getInputStream (
         void
     ) throw(
-        RuntimeException
+        RuntimeException, std::exception
     )
     {
         osl::MutexGuard aGuard(m_aMutex);
@@ -461,7 +461,7 @@ ModeratorsActiveDataSink::setInputStream (
     const Reference<XInputStream> &rxInputStream
 )
     throw(
-        RuntimeException
+        RuntimeException, std::exception
     )
 {
     m_aModerator.setInputStream(rxInputStream);
@@ -488,7 +488,7 @@ ModeratorsActiveDataStreamer::setStream (
     const Reference<XStream> &rxStream
 )
     throw(
-        RuntimeException
+        RuntimeException, std::exception
     )
 {
     m_aModerator.setStream(rxStream);
@@ -509,7 +509,7 @@ public:
 
     virtual void SAL_CALL
     handle( const Reference<XInteractionRequest >& Request )
-        throw (RuntimeException);
+        throw (RuntimeException, std::exception);
 
 private:
 
@@ -527,13 +527,13 @@ public:
 
     virtual void SAL_CALL push( const Any& Status )
         throw (
-            RuntimeException);
+            RuntimeException, std::exception);
 
     virtual void SAL_CALL update( const Any& Status )
-        throw (RuntimeException);
+        throw (RuntimeException, std::exception);
 
     virtual void SAL_CALL pop(  )
-        throw (RuntimeException);
+        throw (RuntimeException, std::exception);
 
 
 private:
@@ -553,21 +553,21 @@ ModeratorsProgressHandler::~ModeratorsProgressHandler()
 
 void SAL_CALL ModeratorsProgressHandler::push( const Any& Status )
     throw (
-        RuntimeException)
+        RuntimeException, std::exception)
 {
     m_aModerator.push(Status);
 }
 
 
 void SAL_CALL ModeratorsProgressHandler::update( const Any& Status )
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     m_aModerator.update(Status);
 }
 
 
 void SAL_CALL ModeratorsProgressHandler::pop(  )
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     m_aModerator.pop();
 }
@@ -590,7 +590,7 @@ ModeratorsInteractionHandler::handle(
     const Reference<XInteractionRequest >& Request
 )
     throw (
-        RuntimeException
+        RuntimeException, std::exception
     )
 {
     // wakes up the mainthread
diff --git a/unotools/source/ucbhelper/xtempfile.cxx b/unotools/source/ucbhelper/xtempfile.cxx
index 3b31e529e789..3cbb4d54c418 100644
--- a/unotools/source/ucbhelper/xtempfile.cxx
+++ b/unotools/source/ucbhelper/xtempfile.cxx
@@ -52,7 +52,7 @@ OTempFileService::~OTempFileService ()
 // XInterface
 
 css::uno::Any SAL_CALL OTempFileService::queryInterface( css::uno::Type const & aType )
-throw ( css::uno::RuntimeException )
+throw ( css::uno::RuntimeException, std::exception )
 {
     css::uno::Any aResult( OTempFileBase::queryInterface( aType ) );
     if (!aResult.hasValue())
@@ -73,7 +73,7 @@ throw ()
 //  XTypeProvider
 
 css::uno::Sequence< css::uno::Type > SAL_CALL OTempFileService::getTypes(  )
-throw ( css::uno::RuntimeException )
+throw ( css::uno::RuntimeException, std::exception )
 {
     static ::cppu::OTypeCollection* pTypeCollection = NULL;
     if ( pTypeCollection == NULL )
@@ -91,7 +91,7 @@ throw ( css::uno::RuntimeException )
     return pTypeCollection->getTypes();
 };
 css::uno::Sequence< sal_Int8 > SAL_CALL OTempFileService::getImplementationId(  )
-throw ( css::uno::RuntimeException )
+throw ( css::uno::RuntimeException, std::exception )
 {
     return OTempFileBase::getImplementationId();
 }
@@ -99,7 +99,7 @@ throw ( css::uno::RuntimeException )
 //  XTempFile
 
 sal_Bool SAL_CALL OTempFileService::getRemoveFile()
-throw ( css::uno::RuntimeException )
+throw ( css::uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( maMutex );
 
@@ -112,7 +112,7 @@ throw ( css::uno::RuntimeException )
     return mbRemoveFile;
 };
 void SAL_CALL OTempFileService::setRemoveFile( sal_Bool _removefile )
-throw ( css::uno::RuntimeException )
+throw ( css::uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( maMutex );
 
@@ -126,7 +126,7 @@ throw ( css::uno::RuntimeException )
     mpTempFile->EnableKillingFile( mbRemoveFile );
 };
 OUString SAL_CALL OTempFileService::getUri()
-throw ( css::uno::RuntimeException )
+throw ( css::uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( maMutex );
 
@@ -139,7 +139,7 @@ throw ( css::uno::RuntimeException )
 
 };
 OUString SAL_CALL OTempFileService::getResourceName()
-throw ( css::uno::RuntimeException )
+throw ( css::uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( maMutex );
 
@@ -156,7 +156,7 @@ throw ( css::uno::RuntimeException )
 // XInputStream
 
 sal_Int32 SAL_CALL OTempFileService::readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
-throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException )
+throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( maMutex );
     if ( mbInClosed )
@@ -189,7 +189,7 @@ throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css
     return nRead;
 }
 sal_Int32 SAL_CALL OTempFileService::readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
-throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException )
+throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( maMutex );
     if ( mbInClosed )
@@ -210,7 +210,7 @@ throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, cs
         return readBytes(aData, nMaxBytesToRead);
 }
 void SAL_CALL OTempFileService::skipBytes( sal_Int32 nBytesToSkip )
-throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException )
+throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( maMutex );
     if ( mbInClosed )
@@ -222,7 +222,7 @@ throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, cs
     checkError();
 }
 sal_Int32 SAL_CALL OTempFileService::available(  )
-throw ( css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException )
+throw ( css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( maMutex );
     if ( mbInClosed )
@@ -243,7 +243,7 @@ throw ( css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeE
     return nAvailable;
 }
 void SAL_CALL OTempFileService::closeInput(  )
-throw ( css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException )
+throw ( css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( maMutex );
     if ( mbInClosed )
@@ -267,7 +267,7 @@ throw ( css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeE
 // XOutputStream
 
 void SAL_CALL OTempFileService::writeBytes( const css::uno::Sequence< sal_Int8 >& aData )
-throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException )
+throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( maMutex );
     if ( mbOutClosed )
@@ -280,7 +280,7 @@ throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, cs
         throw css::io::BufferSizeExceededException( OUString(),static_cast < css::uno::XWeak * > ( this ) );
 }
 void SAL_CALL OTempFileService::flush(  )
-throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException )
+throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( maMutex );
     if ( mbOutClosed )
@@ -291,7 +291,7 @@ throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, cs
     checkError();
 }
 void SAL_CALL OTempFileService::closeOutput(  )
-throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException )
+throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( maMutex );
     if ( mbOutClosed )
@@ -357,7 +357,7 @@ void OTempFileService::checkConnected ()
 // XSeekable
 
 void SAL_CALL OTempFileService::seek( sal_Int64 nLocation )
-throw ( css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException )
+throw ( css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( maMutex );
     checkConnected();
@@ -368,7 +368,7 @@ throw ( css::lang::IllegalArgumentException, css::io::IOException, css::uno::Run
     checkError();
 }
 sal_Int64 SAL_CALL OTempFileService::getPosition(  )
-throw ( css::io::IOException, css::uno::RuntimeException )
+throw ( css::io::IOException, css::uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( maMutex );
     checkConnected();
@@ -378,7 +378,7 @@ throw ( css::io::IOException, css::uno::RuntimeException )
     return (sal_Int64)nPos;
 }
 sal_Int64 SAL_CALL OTempFileService::getLength(  )
-throw ( css::io::IOException, css::uno::RuntimeException )
+throw ( css::io::IOException, css::uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( maMutex );
     checkConnected();
@@ -399,13 +399,13 @@ throw ( css::io::IOException, css::uno::RuntimeException )
 // XStream
 
 css::uno::Reference< css::io::XInputStream > SAL_CALL OTempFileService::getInputStream()
-throw ( css::uno::RuntimeException )
+throw ( css::uno::RuntimeException, std::exception )
     {
     return css::uno::Reference< css::io::XInputStream >( *this, css::uno::UNO_QUERY );
 }
 
 css::uno::Reference< css::io::XOutputStream > SAL_CALL OTempFileService::getOutputStream()
-throw ( css::uno::RuntimeException )
+throw ( css::uno::RuntimeException, std::exception )
     {
     return css::uno::Reference< css::io::XOutputStream >( *this, css::uno::UNO_QUERY );
     }
@@ -413,7 +413,7 @@ throw ( css::uno::RuntimeException )
 // XTruncate
 
 void SAL_CALL OTempFileService::truncate()
-throw ( css::io::IOException, css::uno::RuntimeException )
+throw ( css::io::IOException, css::uno::RuntimeException, std::exception )
 {
     ::osl::MutexGuard aGuard( maMutex );
     checkConnected();
@@ -426,19 +426,19 @@ throw ( css::io::IOException, css::uno::RuntimeException )
 // XServiceInfo
 
 OUString SAL_CALL OTempFileService::getImplementationName()
-throw ( css::uno::RuntimeException )
+throw ( css::uno::RuntimeException, std::exception )
 {
     return getImplementationName_Static();
 }
 
 sal_Bool SAL_CALL OTempFileService::supportsService( OUString const & rServiceName )
-throw ( css::uno::RuntimeException )
+throw ( css::uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 css::uno::Sequence < OUString > SAL_CALL OTempFileService::getSupportedServiceNames()
-throw ( css::uno::RuntimeException )
+throw ( css::uno::RuntimeException, std::exception )
 {
     return getSupportedServiceNames_Static();
 }