cppuhelper: retrofit std::exception into overriding exception specs

Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3

11 files changed, 261 insertions, 261 deletions

diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx
index 8e4bd8256de1..571a1e6eed74 100644
--- a/configmgr/source/access.cxx
+++ b/configmgr/source/access.cxx
@@ -151,7 +151,7 @@ void Access::initBroadcaster(
 }
 
 css::uno::Sequence< css::uno::Type > Access::getTypes()
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
@@ -203,7 +203,7 @@ css::uno::Sequence< css::uno::Type > Access::getTypes()
 }
 
 css::uno::Sequence< sal_Int8 > Access::getImplementationId()
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
@@ -211,7 +211,7 @@ css::uno::Sequence< sal_Int8 > Access::getImplementationId()
     return css::uno::Sequence< sal_Int8 >();
 }
 
-OUString Access::getImplementationName() throw (css::uno::RuntimeException)
+OUString Access::getImplementationName() throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
@@ -220,13 +220,13 @@ OUString Access::getImplementationName() throw (css::uno::RuntimeException)
 }
 
 sal_Bool Access::supportsService(OUString const & ServiceName)
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     return cppu::supportsService(this, ServiceName);
 }
 
 css::uno::Sequence< OUString > Access::getSupportedServiceNames()
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
@@ -257,7 +257,7 @@ css::uno::Sequence< OUString > Access::getSupportedServiceNames()
     return services.getAsConstList();
 }
 
-void Access::dispose() throw (css::uno::RuntimeException) {
+void Access::dispose() throw (css::uno::RuntimeException, std::exception) {
     assert(thisIs(IS_ANY));
     Broadcaster bc;
     {
@@ -280,7 +280,7 @@ void Access::dispose() throw (css::uno::RuntimeException) {
 
 void Access::addEventListener(
     css::uno::Reference< css::lang::XEventListener > const & xListener)
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     {
@@ -303,7 +303,7 @@ void Access::addEventListener(
 
 void Access::removeEventListener(
     css::uno::Reference< css::lang::XEventListener > const & aListener)
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
@@ -314,7 +314,7 @@ void Access::removeEventListener(
     }
 }
 
-css::uno::Type Access::getElementType() throw (css::uno::RuntimeException) {
+css::uno::Type Access::getElementType() throw (css::uno::RuntimeException, std::exception) {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
@@ -337,7 +337,7 @@ css::uno::Type Access::getElementType() throw (css::uno::RuntimeException) {
     }
 }
 
-sal_Bool Access::hasElements() throw (css::uno::RuntimeException) {
+sal_Bool Access::hasElements() throw (css::uno::RuntimeException, std::exception) {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
@@ -347,7 +347,7 @@ sal_Bool Access::hasElements() throw (css::uno::RuntimeException) {
 css::uno::Any Access::getByName(OUString const & aName)
     throw (
         css::container::NoSuchElementException,
-        css::lang::WrappedTargetException, css::uno::RuntimeException)
+        css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
@@ -361,7 +361,7 @@ css::uno::Any Access::getByName(OUString const & aName)
 }
 
 css::uno::Sequence< OUString > Access::getElementNames()
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
@@ -378,7 +378,7 @@ css::uno::Sequence< OUString > Access::getElementNames()
 }
 
 sal_Bool Access::hasByName(OUString const & aName)
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
@@ -387,7 +387,7 @@ sal_Bool Access::hasByName(OUString const & aName)
 }
 
 css::uno::Any Access::getByHierarchicalName(OUString const & aName)
-    throw (css::container::NoSuchElementException, css::uno::RuntimeException)
+    throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
@@ -401,7 +401,7 @@ css::uno::Any Access::getByHierarchicalName(OUString const & aName)
 }
 
 sal_Bool Access::hasByHierarchicalName(OUString const & aName)
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
@@ -414,7 +414,7 @@ void Access::replaceByHierarchicalName(
     throw (
         css::lang::IllegalArgumentException,
         css::container::NoSuchElementException,
-        css::lang::WrappedTargetException, css::uno::RuntimeException)
+        css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     //TODO: Actually support sets and combine with replaceByName:
     assert(thisIs(IS_UPDATE));
@@ -457,7 +457,7 @@ void Access::replaceByHierarchicalName(
 
 void Access::addContainerListener(
     css::uno::Reference< css::container::XContainerListener > const & xListener)
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     {
@@ -480,7 +480,7 @@ void Access::addContainerListener(
 
 void Access::removeContainerListener(
     css::uno::Reference< css::container::XContainerListener > const & xListener)
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
@@ -492,7 +492,7 @@ void Access::removeContainerListener(
 }
 
 OUString Access::getExactName(OUString const & aApproximateName)
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
@@ -501,7 +501,7 @@ OUString Access::getExactName(OUString const & aApproximateName)
 }
 
 css::uno::Sequence< css::beans::Property > Access::getProperties()
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_GROUP));
     osl::MutexGuard g(*lock_);
@@ -517,7 +517,7 @@ css::uno::Sequence< css::beans::Property > Access::getProperties()
 }
 
 css::beans::Property Access::getPropertyByName(OUString const & aName)
-    throw (css::beans::UnknownPropertyException, css::uno::RuntimeException)
+    throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_GROUP));
     osl::MutexGuard g(*lock_);
@@ -530,14 +530,14 @@ css::beans::Property Access::getPropertyByName(OUString const & aName)
 }
 
 sal_Bool Access::hasPropertyByName(OUString const & Name)
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_GROUP));
     osl::MutexGuard g(*lock_);
     return getChild(Name).is();
 }
 
-OUString Access::getHierarchicalName() throw (css::uno::RuntimeException) {
+OUString Access::getHierarchicalName() throw (css::uno::RuntimeException, std::exception) {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
@@ -561,7 +561,7 @@ OUString Access::composeHierarchicalName(
     OUString const & aRelativeName)
     throw (
         css::lang::IllegalArgumentException, css::lang::NoSupportException,
-        css::uno::RuntimeException)
+        css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
@@ -579,7 +579,7 @@ OUString Access::composeHierarchicalName(
     return path.makeStringAndClear();
 }
 
-OUString Access::getName() throw (css::uno::RuntimeException) {
+OUString Access::getName() throw (css::uno::RuntimeException, std::exception) {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
@@ -587,7 +587,7 @@ OUString Access::getName() throw (css::uno::RuntimeException) {
 }
 
 void Access::setName(OUString const & aName)
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     Broadcaster bc;
@@ -651,7 +651,7 @@ void Access::setName(OUString const & aName)
     bc.send();
 }
 
-css::beans::Property Access::getAsProperty() throw (css::uno::RuntimeException)
+css::beans::Property Access::getAsProperty() throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
@@ -660,7 +660,7 @@ css::beans::Property Access::getAsProperty() throw (css::uno::RuntimeException)
 }
 
 css::uno::Reference< css::beans::XPropertySetInfo > Access::getPropertySetInfo()
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_GROUP));
     return this;
@@ -671,7 +671,7 @@ void Access::setPropertyValue(
     throw (
         css::beans::UnknownPropertyException, css::beans::PropertyVetoException,
         css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException)
+        css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_GROUP));
     Broadcaster bc;
@@ -695,7 +695,7 @@ void Access::setPropertyValue(
 css::uno::Any Access::getPropertyValue(OUString const & PropertyName)
     throw (
         css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException)
+        css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_GROUP));
     osl::MutexGuard g(*lock_);
@@ -713,7 +713,7 @@ void Access::addPropertyChangeListener(
         xListener)
     throw (
         css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException)
+        css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_GROUP));
     {
@@ -740,7 +740,7 @@ void Access::removePropertyChangeListener(
         aListener)
     throw (
         css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException)
+        css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_GROUP));
     osl::MutexGuard g(*lock_);
@@ -764,7 +764,7 @@ void Access::addVetoableChangeListener(
         aListener)
     throw (
         css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException)
+        css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_GROUP));
     {
@@ -792,7 +792,7 @@ void Access::removeVetoableChangeListener(
         aListener)
     throw (
         css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException)
+        css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_GROUP));
     osl::MutexGuard g(*lock_);
@@ -815,7 +815,7 @@ void Access::setPropertyValues(
     css::uno::Sequence< css::uno::Any > const & aValues)
     throw (
         css::beans::PropertyVetoException, css::lang::IllegalArgumentException,
-        css::lang::WrappedTargetException, css::uno::RuntimeException)
+        css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_GROUP));
     Broadcaster bc;
@@ -847,7 +847,7 @@ void Access::setPropertyValues(
 
 css::uno::Sequence< css::uno::Any > Access::getPropertyValues(
     css::uno::Sequence< OUString > const & aPropertyNames)
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_GROUP));
     osl::MutexGuard g(*lock_);
@@ -868,7 +868,7 @@ void Access::addPropertiesChangeListener(
     css::uno::Sequence< OUString > const &,
     css::uno::Reference< css::beans::XPropertiesChangeListener > const &
         xListener)
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_GROUP));
     {
@@ -891,7 +891,7 @@ void Access::addPropertiesChangeListener(
 void Access::removePropertiesChangeListener(
     css::uno::Reference< css::beans::XPropertiesChangeListener > const &
         xListener)
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_GROUP));
     osl::MutexGuard g(*lock_);
@@ -906,7 +906,7 @@ void Access::firePropertiesChangeEvent(
     css::uno::Sequence< OUString > const & aPropertyNames,
     css::uno::Reference< css::beans::XPropertiesChangeListener > const &
         xListener)
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_GROUP));
     css::uno::Sequence< css::beans::PropertyChangeEvent > events(
@@ -921,7 +921,7 @@ void Access::firePropertiesChangeEvent(
 }
 
 css::uno::Reference< css::beans::XHierarchicalPropertySetInfo >
-Access::getHierarchicalPropertySetInfo() throw (css::uno::RuntimeException) {
+Access::getHierarchicalPropertySetInfo() throw (css::uno::RuntimeException, std::exception) {
     assert(thisIs(IS_GROUP));
     return this;
 }
@@ -932,7 +932,7 @@ void Access::setHierarchicalPropertyValue(
     throw (
         css::beans::UnknownPropertyException, css::beans::PropertyVetoException,
         css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException)
+        css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_GROUP));
     Broadcaster bc;
@@ -963,7 +963,7 @@ css::uno::Any Access::getHierarchicalPropertyValue(
     throw (
         css::beans::UnknownPropertyException,
         css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException)
+        css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_GROUP));
     osl::MutexGuard g(*lock_);
@@ -981,7 +981,7 @@ void Access::setHierarchicalPropertyValues(
     css::uno::Sequence< css::uno::Any > const & Values)
     throw (
         css::beans::PropertyVetoException, css::lang::IllegalArgumentException,
-        css::lang::WrappedTargetException, css::uno::RuntimeException)
+        css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_GROUP));
     Broadcaster bc;
@@ -1020,7 +1020,7 @@ css::uno::Sequence< css::uno::Any > Access::getHierarchicalPropertyValues(
     css::uno::Sequence< OUString > const & aHierarchicalPropertyNames)
     throw (
         css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException)
+        css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_GROUP));
     osl::MutexGuard g(*lock_);
@@ -1042,7 +1042,7 @@ css::uno::Sequence< css::uno::Any > Access::getHierarchicalPropertyValues(
 
 css::beans::Property Access::getPropertyByHierarchicalName(
     OUString const & aHierarchicalName)
-    throw (css::beans::UnknownPropertyException, css::uno::RuntimeException)
+    throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_GROUP));
     osl::MutexGuard g(*lock_);
@@ -1056,7 +1056,7 @@ css::beans::Property Access::getPropertyByHierarchicalName(
 
 sal_Bool Access::hasPropertyByHierarchicalName(
     OUString const & aHierarchicalName)
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_GROUP));
     osl::MutexGuard g(*lock_);
@@ -1068,7 +1068,7 @@ void Access::replaceByName(
     throw (
         css::lang::IllegalArgumentException,
         css::container::NoSuchElementException,
-        css::lang::WrappedTargetException, css::uno::RuntimeException)
+        css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_UPDATE));
     Broadcaster bc;
@@ -1112,7 +1112,7 @@ void Access::insertByName(
     throw (
         css::lang::IllegalArgumentException,
         css::container::ElementExistException,
-        css::lang::WrappedTargetException, css::uno::RuntimeException)
+        css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_EXTENSIBLE|IS_UPDATE));
     Broadcaster bc;
@@ -1162,7 +1162,7 @@ void Access::insertByName(
 void Access::removeByName(OUString const & aName)
     throw (
         css::container::NoSuchElementException,
-        css::lang::WrappedTargetException, css::uno::RuntimeException)
+        css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_EXTENSIBLE|IS_UPDATE));
     Broadcaster bc;
@@ -1197,7 +1197,7 @@ void Access::removeByName(OUString const & aName)
 }
 
 css::uno::Reference< css::uno::XInterface > Access::createInstance()
-    throw (css::uno::Exception, css::uno::RuntimeException)
+    throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_SET|IS_UPDATE));
     OUString tmplName(
@@ -1217,7 +1217,7 @@ css::uno::Reference< css::uno::XInterface > Access::createInstance()
 
 css::uno::Reference< css::uno::XInterface > Access::createInstanceWithArguments(
     css::uno::Sequence< css::uno::Any > const & aArguments)
-    throw (css::uno::Exception, css::uno::RuntimeException)
+    throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_SET|IS_UPDATE));
     if (aArguments.getLength() != 0) {
@@ -1314,7 +1314,7 @@ void Access::clearListeners() throw() {
 }
 
 css::uno::Any Access::queryInterface(css::uno::Type const & aType)
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Any res(OWeakObject::queryInterface(aType));
     if (res.hasValue()) {
diff --git a/configmgr/source/access.hxx b/configmgr/source/access.hxx
index 6703568fbd57..18e1681af957 100644
--- a/configmgr/source/access.hxx
+++ b/configmgr/source/access.hxx
@@ -136,60 +136,60 @@ public:
     using OWeakObject::release;
 
     virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
-    getTypes() throw (com::sun::star::uno::RuntimeException);
+    getTypes() 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);
+    getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception);
 
     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(OUString const & 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);
+    getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception);
 
     virtual void SAL_CALL dispose()
-        throw (com::sun::star::uno::RuntimeException);
+        throw (com::sun::star::uno::RuntimeException, std::exception);
 
     virtual void SAL_CALL addEventListener(
         com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >
             const & xListener)
-        throw (com::sun::star::uno::RuntimeException);
+        throw (com::sun::star::uno::RuntimeException, std::exception);
 
     virtual void SAL_CALL removeEventListener(
         com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >
             const & aListener)
-        throw (com::sun::star::uno::RuntimeException);
+        throw (com::sun::star::uno::RuntimeException, std::exception);
 
     virtual com::sun::star::uno::Type SAL_CALL getElementType()
-        throw (com::sun::star::uno::RuntimeException);
+        throw (com::sun::star::uno::RuntimeException, std::exception);
 
     virtual sal_Bool SAL_CALL hasElements()
-        throw (com::sun::star::uno::RuntimeException);
+        throw (com::sun::star::uno::RuntimeException, std::exception);
 
     virtual com::sun::star::uno::Any SAL_CALL getByName(
         OUString const & aName)
         throw (
             com::sun::star::container::NoSuchElementException,
             com::sun::star::lang::WrappedTargetException,
-            com::sun::star::uno::RuntimeException);
+            com::sun::star::uno::RuntimeException, std::exception);
 
     virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
-    getElementNames() throw (com::sun::star::uno::RuntimeException);
+    getElementNames() throw (com::sun::star::uno::RuntimeException, std::exception);
 
     virtual sal_Bool SAL_CALL hasByName(OUString const & aName)
-        throw (com::sun::star::uno::RuntimeException);
+        throw (com::sun::star::uno::RuntimeException, std::exception);
 
     virtual com::sun::star::uno::Any SAL_CALL getByHierarchicalName(
         OUString const & aName)
         throw (
             com::sun::star::container::NoSuchElementException,
-            com::sun::star::uno::RuntimeException);
+            com::sun::star::uno::RuntimeException, std::exception);
 
     virtual sal_Bool SAL_CALL hasByHierarchicalName(OUString const & aName)
-        throw (com::sun::star::uno::RuntimeException);
+        throw (com::sun::star::uno::RuntimeException, std::exception);
 
     virtual void SAL_CALL replaceByHierarchicalName(
         OUString const & aName, com::sun::star::uno::Any const & aElement)
@@ -197,56 +197,56 @@ public:
             com::sun::star::lang::IllegalArgumentException,
             com::sun::star::container::NoSuchElementException,
             com::sun::star::lang::WrappedTargetException,
-            com::sun::star::uno::RuntimeException);
+            com::sun::star::uno::RuntimeException, std::exception);
 
     virtual void SAL_CALL addContainerListener(
         com::sun::star::uno::Reference<
             com::sun::star::container::XContainerListener > const & xListener)
-        throw (com::sun::star::uno::RuntimeException);
+        throw (com::sun::star::uno::RuntimeException, std::exception);
 
     virtual void SAL_CALL removeContainerListener(
         com::sun::star::uno::Reference<
             com::sun::star::container::XContainerListener > const & xListener)
-        throw (com::sun::star::uno::RuntimeException);
+        throw (com::sun::star::uno::RuntimeException, std::exception);
 
     virtual OUString SAL_CALL getExactName(
         OUString const & aApproximateName)
-        throw (com::sun::star::uno::RuntimeException);
+        throw (com::sun::star::uno::RuntimeException, std::exception);
 
     virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property >
-    SAL_CALL getProperties() throw (com::sun::star::uno::RuntimeException);
+    SAL_CALL getProperties() throw (com::sun::star::uno::RuntimeException, std::exception);
 
     virtual com::sun::star::beans::Property SAL_CALL getPropertyByName(
         OUString const & 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(OUString const & Name)
-        throw (com::sun::star::uno::RuntimeException);
+        throw (com::sun::star::uno::RuntimeException, std::exception);
 
     virtual OUString SAL_CALL getHierarchicalName()
-        throw (com::sun::star::uno::RuntimeException);
+        throw (com::sun::star::uno::RuntimeException, std::exception);
 
     virtual OUString SAL_CALL composeHierarchicalName(
         OUString const & aRelativeName)
         throw (
             com::sun::star::lang::IllegalArgumentException,
             com::sun::star::lang::NoSupportException,
-            com::sun::star::uno::RuntimeException);
+            com::sun::star::uno::RuntimeException, std::exception);
 
     virtual OUString SAL_CALL getName()
-        throw (com::sun::star::uno::RuntimeException);
+        throw (com::sun::star::uno::RuntimeException, std::exception);
 
     virtual void SAL_CALL setName(OUString const & aName)
-        throw (com::sun::star::uno::RuntimeException);
+        throw (com::sun::star::uno::RuntimeException, std::exception);
 
     virtual com::sun::star::beans::Property SAL_CALL getAsProperty()
-        throw (com::sun::star::uno::RuntimeException);
+        throw (com::sun::star::uno::RuntimeException, std::exception);
 
     virtual
     com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo >
-    SAL_CALL getPropertySetInfo() throw (com::sun::star::uno::RuntimeException);
+    SAL_CALL getPropertySetInfo() throw (com::sun::star::uno::RuntimeException, std::exception);
 
     virtual void SAL_CALL setPropertyValue(
         OUString const & aPropertyName,
@@ -256,14 +256,14 @@ 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(
         OUString const & 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(
         OUString const & aPropertyName,
@@ -272,7 +272,7 @@ public:
         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(
         OUString const & aPropertyName,
@@ -281,7 +281,7 @@ public:
         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(
         OUString const & PropertyName,
@@ -290,7 +290,7 @@ public:
         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(
         OUString const & PropertyName,
@@ -299,7 +299,7 @@ public:
         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 setPropertyValues(
         com::sun::star::uno::Sequence< OUString > const & aPropertyNames,
@@ -309,38 +309,38 @@ 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::Sequence< com::sun::star::uno::Any > SAL_CALL
     getPropertyValues(
         com::sun::star::uno::Sequence< OUString > const & aPropertyNames)
-        throw (com::sun::star::uno::RuntimeException);
+        throw (com::sun::star::uno::RuntimeException, std::exception);
 
     virtual void SAL_CALL addPropertiesChangeListener(
         com::sun::star::uno::Sequence< OUString > const & aPropertyNames,
         com::sun::star::uno::Reference<
             com::sun::star::beans::XPropertiesChangeListener > const &
                 xListener)
-        throw (com::sun::star::uno::RuntimeException);
+        throw (com::sun::star::uno::RuntimeException, std::exception);
 
     virtual void SAL_CALL removePropertiesChangeListener(
         com::sun::star::uno::Reference<
             com::sun::star::beans::XPropertiesChangeListener > const &
                 xListener)
-        throw (com::sun::star::uno::RuntimeException);
+        throw (com::sun::star::uno::RuntimeException, std::exception);
 
     virtual void SAL_CALL firePropertiesChangeEvent(
         com::sun::star::uno::Sequence< OUString > const & aPropertyNames,
         com::sun::star::uno::Reference<
             com::sun::star::beans::XPropertiesChangeListener > const &
                 xListener)
-        throw (com::sun::star::uno::RuntimeException);
+        throw (com::sun::star::uno::RuntimeException, std::exception);
 
     virtual
     com::sun::star::uno::Reference<
         com::sun::star::beans::XHierarchicalPropertySetInfo > SAL_CALL
     getHierarchicalPropertySetInfo()
-        throw (com::sun::star::uno::RuntimeException);
+        throw (com::sun::star::uno::RuntimeException, std::exception);
 
     virtual void SAL_CALL setHierarchicalPropertyValue(
         OUString const & aHierarchicalPropertyName,
@@ -350,7 +350,7 @@ 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 getHierarchicalPropertyValue(
         OUString const & aHierarchicalPropertyName)
@@ -358,7 +358,7 @@ public:
             com::sun::star::beans::UnknownPropertyException,
             com::sun::star::lang::IllegalArgumentException,
             com::sun::star::lang::WrappedTargetException,
-            com::sun::star::uno::RuntimeException);
+            com::sun::star::uno::RuntimeException, std::exception);
 
     virtual void SAL_CALL setHierarchicalPropertyValues(
         com::sun::star::uno::Sequence< OUString > const &
@@ -369,7 +369,7 @@ 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::Sequence< com::sun::star::uno::Any > SAL_CALL
     getHierarchicalPropertyValues(
@@ -378,17 +378,17 @@ public:
         throw (
             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::beans::Property SAL_CALL
     getPropertyByHierarchicalName(OUString const & aHierarchicalName)
         throw (
             com::sun::star::beans::UnknownPropertyException,
-            com::sun::star::uno::RuntimeException);
+            com::sun::star::uno::RuntimeException, std::exception);
 
     virtual sal_Bool SAL_CALL hasPropertyByHierarchicalName(
         OUString const & aHierarchicalName)
-        throw (com::sun::star::uno::RuntimeException);
+        throw (com::sun::star::uno::RuntimeException, std::exception);
 
     virtual void SAL_CALL replaceByName(
         OUString const & aName, com::sun::star::uno::Any const & aElement)
@@ -396,7 +396,7 @@ public:
             com::sun::star::lang::IllegalArgumentException,
             com::sun::star::container::NoSuchElementException,
             com::sun::star::lang::WrappedTargetException,
-            com::sun::star::uno::RuntimeException);
+            com::sun::star::uno::RuntimeException, std::exception);
 
     virtual void SAL_CALL insertByName(
         OUString const & aName, com::sun::star::uno::Any const & aElement)
@@ -404,19 +404,19 @@ public:
             com::sun::star::lang::IllegalArgumentException,
             com::sun::star::container::ElementExistException,
             com::sun::star::lang::WrappedTargetException,
-            com::sun::star::uno::RuntimeException);
+            com::sun::star::uno::RuntimeException, std::exception);
 
     virtual void SAL_CALL removeByName(OUString const & aName)
         throw (
             com::sun::star::container::NoSuchElementException,
             com::sun::star::lang::WrappedTargetException,
-            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 createInstance()
         throw (
             com::sun::star::uno::Exception,
-            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 createInstanceWithArguments(
@@ -424,7 +424,7 @@ public:
             aArguments)
         throw (
             com::sun::star::uno::Exception,
-            com::sun::star::uno::RuntimeException);
+            com::sun::star::uno::RuntimeException, std::exception);
 
 protected:
     Access(Components & components);
@@ -446,7 +446,7 @@ protected:
 
     virtual com::sun::star::uno::Any SAL_CALL queryInterface(
         com::sun::star::uno::Type const & aType)
-        throw (com::sun::star::uno::RuntimeException);
+        throw (com::sun::star::uno::RuntimeException, std::exception);
 
     Components & getComponents() const;
 
diff --git a/configmgr/source/childaccess.cxx b/configmgr/source/childaccess.cxx
index 6071df0d5b26..14dfdfa74f38 100644
--- a/configmgr/source/childaccess.cxx
+++ b/configmgr/source/childaccess.cxx
@@ -151,7 +151,7 @@ void ChildAccess::release() throw () {
 }
 
 css::uno::Reference< css::uno::XInterface > ChildAccess::getParent()
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
@@ -160,7 +160,7 @@ css::uno::Reference< css::uno::XInterface > ChildAccess::getParent()
 }
 
 void ChildAccess::setParent(css::uno::Reference< css::uno::XInterface > const &)
-    throw (css::lang::NoSupportException, css::uno::RuntimeException)
+    throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
@@ -171,7 +171,7 @@ void ChildAccess::setParent(css::uno::Reference< css::uno::XInterface > const &)
 
 sal_Int64 ChildAccess::getSomething(
     css::uno::Sequence< sal_Int8 > const & aIdentifier)
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
@@ -330,7 +330,7 @@ void ChildAccess::addSupportedServiceNames(
 }
 
 css::uno::Any ChildAccess::queryInterface(css::uno::Type const & aType)
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
diff --git a/configmgr/source/childaccess.hxx b/configmgr/source/childaccess.hxx
index 8eb688ee2590..478aa1494000 100644
--- a/configmgr/source/childaccess.hxx
+++ b/configmgr/source/childaccess.hxx
@@ -85,18 +85,18 @@ 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);
 
     virtual void SAL_CALL setParent(
         com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
             const &)
         throw (
             com::sun::star::lang::NoSupportException,
-            com::sun::star::uno::RuntimeException);
+            com::sun::star::uno::RuntimeException, std::exception);
 
     virtual sal_Int64 SAL_CALL getSomething(
         com::sun::star::uno::Sequence< sal_Int8 > const & aIdentifier)
-        throw (com::sun::star::uno::RuntimeException);
+        throw (com::sun::star::uno::RuntimeException, std::exception);
 
     void bind(
         rtl::Reference< RootAccess > const & root,
@@ -128,7 +128,7 @@ private:
 
     virtual com::sun::star::uno::Any SAL_CALL queryInterface(
         com::sun::star::uno::Type const & aType)
-        throw (com::sun::star::uno::RuntimeException);
+        throw (com::sun::star::uno::RuntimeException, std::exception);
 
     rtl::Reference< RootAccess > root_;
     rtl::Reference< Access > parent_; // null if free node
diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx
index 8a76390c84b4..40d580b5d5ca 100644
--- a/configmgr/source/configurationprovider.cxx
+++ b/configmgr/source/configurationprovider.cxx
@@ -115,7 +115,7 @@ private:
     virtual void SAL_CALL disposing() { flushModifications(); }
 
     virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException)
+        throw (css::uno::RuntimeException, std::exception)
     {
         return default_
             ? default_provider::getImplementationName()
@@ -123,11 +123,11 @@ private:
     }
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException)
+        throw (css::uno::RuntimeException, std::exception)
     { return cppu::supportsService(this, ServiceName); }
 
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getSupportedServiceNames() throw (css::uno::RuntimeException)
+    getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception)
     {
         return default_
             ? default_provider::getSupportedServiceNames()
@@ -136,42 +136,42 @@ private:
 
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(
         OUString const & aServiceSpecifier)
-        throw (css::uno::Exception, css::uno::RuntimeException);
+        throw (css::uno::Exception, css::uno::RuntimeException, std::exception);
 
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
     createInstanceWithArguments(
         OUString const & ServiceSpecifier,
         css::uno::Sequence< css::uno::Any > const & Arguments)
-        throw (css::uno::Exception, css::uno::RuntimeException);
+        throw (css::uno::Exception, css::uno::RuntimeException, std::exception);
 
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getAvailableServiceNames() throw (css::uno::RuntimeException);
+    getAvailableServiceNames() throw (css::uno::RuntimeException, std::exception);
 
-    virtual void SAL_CALL refresh() throw (css::uno::RuntimeException);
+    virtual void SAL_CALL refresh() throw (css::uno::RuntimeException, std::exception);
 
     virtual void SAL_CALL addRefreshListener(
         css::uno::Reference< css::util::XRefreshListener > const & l)
-        throw (css::uno::RuntimeException);
+        throw (css::uno::RuntimeException, std::exception);
 
     virtual void SAL_CALL removeRefreshListener(
         css::uno::Reference< css::util::XRefreshListener > const & l)
-        throw (css::uno::RuntimeException);
+        throw (css::uno::RuntimeException, std::exception);
 
-    virtual void SAL_CALL flush() throw (css::uno::RuntimeException);
+    virtual void SAL_CALL flush() throw (css::uno::RuntimeException, std::exception);
 
     virtual void SAL_CALL addFlushListener(
         css::uno::Reference< css::util::XFlushListener > const & l)
-        throw (css::uno::RuntimeException);
+        throw (css::uno::RuntimeException, std::exception);
 
     virtual void SAL_CALL removeFlushListener(
         css::uno::Reference< css::util::XFlushListener > const & l)
-        throw (css::uno::RuntimeException);
+        throw (css::uno::RuntimeException, std::exception);
 
     virtual void SAL_CALL setLocale(css::lang::Locale const & eLocale)
-        throw (css::uno::RuntimeException);
+        throw (css::uno::RuntimeException, std::exception);
 
     virtual css::lang::Locale SAL_CALL getLocale()
-        throw (css::uno::RuntimeException);
+        throw (css::uno::RuntimeException, std::exception);
 
     void flushModifications() const;
 
@@ -183,7 +183,7 @@ private:
 
 css::uno::Reference< css::uno::XInterface > Service::createInstance(
     OUString const & aServiceSpecifier)
-    throw (css::uno::Exception, css::uno::RuntimeException)
+    throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     return createInstanceWithArguments(
         aServiceSpecifier, css::uno::Sequence< css::uno::Any >());
@@ -193,7 +193,7 @@ css::uno::Reference< css::uno::XInterface >
 Service::createInstanceWithArguments(
     OUString const & ServiceSpecifier,
     css::uno::Sequence< css::uno::Any > const & Arguments)
-    throw (css::uno::Exception, css::uno::RuntimeException)
+    throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     OUString nodepath;
     OUString locale;
@@ -281,7 +281,7 @@ Service::createInstanceWithArguments(
 }
 
 css::uno::Sequence< OUString > Service::getAvailableServiceNames()
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     css::uno::Sequence< OUString > names(2);
     names[0] = accessServiceName;
@@ -289,7 +289,7 @@ css::uno::Sequence< OUString > Service::getAvailableServiceNames()
     return names;
 }
 
-void Service::refresh() throw (css::uno::RuntimeException) {
+void Service::refresh() throw (css::uno::RuntimeException, std::exception) {
     //TODO
     cppu::OInterfaceContainerHelper * cont = rBHelper.getContainer(
         cppu::UnoType< css::util::XRefreshListener >::get());
@@ -301,7 +301,7 @@ void Service::refresh() throw (css::uno::RuntimeException) {
 
 void Service::addRefreshListener(
     css::uno::Reference< css::util::XRefreshListener > const & l)
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     rBHelper.addListener(
         cppu::UnoType< css::util::XRefreshListener >::get(), l);
@@ -309,13 +309,13 @@ void Service::addRefreshListener(
 
 void Service::removeRefreshListener(
     css::uno::Reference< css::util::XRefreshListener > const & l)
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     rBHelper.removeListener(
         cppu::UnoType< css::util::XRefreshListener >::get(), l);
 }
 
-void Service::flush() throw (css::uno::RuntimeException) {
+void Service::flush() throw (css::uno::RuntimeException, std::exception) {
     flushModifications();
     cppu::OInterfaceContainerHelper * cont = rBHelper.getContainer(
         cppu::UnoType< css::util::XFlushListener >::get());
@@ -327,27 +327,27 @@ void Service::flush() throw (css::uno::RuntimeException) {
 
 void Service::addFlushListener(
     css::uno::Reference< css::util::XFlushListener > const & l)
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     rBHelper.addListener(cppu::UnoType< css::util::XFlushListener >::get(), l);
 }
 
 void Service::removeFlushListener(
     css::uno::Reference< css::util::XFlushListener > const & l)
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     rBHelper.removeListener(
         cppu::UnoType< css::util::XFlushListener >::get(), l);
 }
 
 void Service::setLocale(css::lang::Locale const & eLocale)
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard guard(*lock_);
     locale_ = LanguageTag::convertToBcp47( eLocale, false);
 }
 
-css::lang::Locale Service::getLocale() throw (css::uno::RuntimeException) {
+css::lang::Locale Service::getLocale() throw (css::uno::RuntimeException, std::exception) {
     osl::MutexGuard guard(*lock_);
     css::lang::Locale loc;
     if (! locale_.isEmpty()) {
@@ -379,30 +379,30 @@ private:
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
     createInstanceWithContext(
         css::uno::Reference< css::uno::XComponentContext > const & Context)
-        throw (css::uno::Exception, css::uno::RuntimeException);
+        throw (css::uno::Exception, css::uno::RuntimeException, std::exception);
 
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
     createInstanceWithArgumentsAndContext(
         css::uno::Sequence< css::uno::Any > const & Arguments,
         css::uno::Reference< css::uno::XComponentContext > const & Context)
-        throw (css::uno::Exception, css::uno::RuntimeException);
+        throw (css::uno::Exception, css::uno::RuntimeException, std::exception);
 
     virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException)
+        throw (css::uno::RuntimeException, std::exception)
     { return configuration_provider::getImplementationName(); }
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException)
+        throw (css::uno::RuntimeException, std::exception)
     { return cppu::supportsService(this, ServiceName); }
 
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getSupportedServiceNames() throw (css::uno::RuntimeException)
+    getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception)
     { return configuration_provider::getSupportedServiceNames(); }
 };
 
 css::uno::Reference< css::uno::XInterface > Factory::createInstanceWithContext(
     css::uno::Reference< css::uno::XComponentContext > const & Context)
-    throw (css::uno::Exception, css::uno::RuntimeException)
+    throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     return createInstanceWithArgumentsAndContext(
         css::uno::Sequence< css::uno::Any >(), Context);
@@ -412,7 +412,7 @@ css::uno::Reference< css::uno::XInterface >
 Factory::createInstanceWithArgumentsAndContext(
     css::uno::Sequence< css::uno::Any > const & Arguments,
     css::uno::Reference< css::uno::XComponentContext > const & Context)
-    throw (css::uno::Exception, css::uno::RuntimeException)
+    throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     if (Arguments.getLength() == 0) {
         return css::configuration::theDefaultProvider::get(Context);
diff --git a/configmgr/source/configurationregistry.cxx b/configmgr/source/configurationregistry.cxx
index f22bc818ba2d..83dbd448232e 100644
--- a/configmgr/source/configurationregistry.cxx
+++ b/configmgr/source/configurationregistry.cxx
@@ -81,59 +81,59 @@ private:
     virtual ~Service() {}
 
     virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException)
+        throw (css::uno::RuntimeException, std::exception)
     { return configuration_registry::getImplementationName(); }
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException)
+        throw (css::uno::RuntimeException, std::exception)
     { return cppu::supportsService(this, ServiceName); }
 
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getSupportedServiceNames() throw (css::uno::RuntimeException)
+    getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception)
     { return configuration_registry::getSupportedServiceNames(); }
 
-    virtual OUString SAL_CALL getURL() throw (css::uno::RuntimeException);
+    virtual OUString SAL_CALL getURL() throw (css::uno::RuntimeException, std::exception);
 
     virtual void SAL_CALL open(
         OUString const & rURL, sal_Bool bReadOnly, sal_Bool)
         throw (
             css::registry::InvalidRegistryException,
-            css::uno::RuntimeException);
+            css::uno::RuntimeException, std::exception);
 
-    virtual sal_Bool SAL_CALL isValid() throw (css::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL isValid() throw (css::uno::RuntimeException, std::exception);
 
     virtual void SAL_CALL close()
         throw (
             css::registry::InvalidRegistryException,
-            css::uno::RuntimeException);
+            css::uno::RuntimeException, std::exception);
 
     virtual void SAL_CALL destroy()
         throw (
             css::registry::InvalidRegistryException,
-            css::uno::RuntimeException);
+            css::uno::RuntimeException, std::exception);
 
     virtual css::uno::Reference< css::registry::XRegistryKey > SAL_CALL
     getRootKey()
         throw (
             css::registry::InvalidRegistryException,
-            css::uno::RuntimeException);
+            css::uno::RuntimeException, std::exception);
 
-    virtual sal_Bool SAL_CALL isReadOnly() throw (css::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL isReadOnly() throw (css::uno::RuntimeException, std::exception);
 
     virtual void SAL_CALL mergeKey(OUString const &, OUString const &)
         throw (
             css::registry::InvalidRegistryException,
-            css::registry::MergeConflictException, css::uno::RuntimeException);
+            css::registry::MergeConflictException, css::uno::RuntimeException, std::exception);
 
-    virtual void SAL_CALL flush() throw (css::uno::RuntimeException);
+    virtual void SAL_CALL flush() throw (css::uno::RuntimeException, std::exception);
 
     virtual void SAL_CALL addFlushListener(
         css::uno::Reference< css::util::XFlushListener > const &)
-        throw (css::uno::RuntimeException);
+        throw (css::uno::RuntimeException, std::exception);
 
     virtual void SAL_CALL removeFlushListener(
         css::uno::Reference< css::util::XFlushListener > const &)
-        throw (css::uno::RuntimeException);
+        throw (css::uno::RuntimeException, std::exception);
 
     void checkValid();
 
@@ -162,154 +162,154 @@ private:
     virtual ~RegistryKey() {}
 
     virtual OUString SAL_CALL getKeyName()
-        throw (css::uno::RuntimeException);
+        throw (css::uno::RuntimeException, std::exception);
 
     virtual sal_Bool SAL_CALL isReadOnly()
         throw (
             css::registry::InvalidRegistryException,
-            css::uno::RuntimeException);
+            css::uno::RuntimeException, std::exception);
 
-    virtual sal_Bool SAL_CALL isValid() throw (css::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL isValid() throw (css::uno::RuntimeException, std::exception);
 
     virtual css::registry::RegistryKeyType SAL_CALL getKeyType(
         OUString const &)
         throw (
             css::registry::InvalidRegistryException,
-            css::uno::RuntimeException);
+            css::uno::RuntimeException, std::exception);
 
     virtual css::registry::RegistryValueType SAL_CALL getValueType()
         throw (
             css::registry::InvalidRegistryException,
-            css::uno::RuntimeException);
+            css::uno::RuntimeException, std::exception);
 
     virtual sal_Int32 SAL_CALL getLongValue()
         throw (
             css::registry::InvalidRegistryException,
-            css::registry::InvalidValueException, css::uno::RuntimeException);
+            css::registry::InvalidValueException, css::uno::RuntimeException, std::exception);
 
     virtual void SAL_CALL setLongValue(sal_Int32)
         throw (
             css::registry::InvalidRegistryException,
-            css::uno::RuntimeException);
+            css::uno::RuntimeException, std::exception);
 
     virtual css::uno::Sequence< sal_Int32 > SAL_CALL getLongListValue()
         throw (
             css::registry::InvalidRegistryException,
-            css::registry::InvalidValueException, css::uno::RuntimeException);
+            css::registry::InvalidValueException, css::uno::RuntimeException, std::exception);
 
     virtual void SAL_CALL setLongListValue(
         css::uno::Sequence< sal_Int32 > const &)
         throw (
             css::registry::InvalidRegistryException,
-            css::uno::RuntimeException);
+            css::uno::RuntimeException, std::exception);
 
     virtual OUString SAL_CALL getAsciiValue()
         throw (
             css::registry::InvalidRegistryException,
-            css::registry::InvalidValueException, css::uno::RuntimeException);
+            css::registry::InvalidValueException, css::uno::RuntimeException, std::exception);
 
     virtual void SAL_CALL setAsciiValue(OUString const &)
         throw (
             css::registry::InvalidRegistryException,
-            css::uno::RuntimeException);
+            css::uno::RuntimeException, std::exception);
 
     virtual css::uno::Sequence< OUString > SAL_CALL getAsciiListValue()
         throw (
             css::registry::InvalidRegistryException,
-            css::registry::InvalidValueException, css::uno::RuntimeException);
+            css::registry::InvalidValueException, css::uno::RuntimeException, std::exception);
 
     virtual void SAL_CALL setAsciiListValue(
         css::uno::Sequence< OUString > const &)
         throw (
             css::registry::InvalidRegistryException,
-            css::uno::RuntimeException);
+            css::uno::RuntimeException, std::exception);
 
     virtual OUString SAL_CALL getStringValue()
         throw (
             css::registry::InvalidRegistryException,
-            css::registry::InvalidValueException, css::uno::RuntimeException);
+            css::registry::InvalidValueException, css::uno::RuntimeException, std::exception);
 
     virtual void SAL_CALL setStringValue(OUString const &)
         throw (
             css::registry::InvalidRegistryException,
-            css::uno::RuntimeException);
+            css::uno::RuntimeException, std::exception);
 
     virtual css::uno::Sequence< OUString > SAL_CALL getStringListValue()
         throw (
             css::registry::InvalidRegistryException,
-            css::registry::InvalidValueException, css::uno::RuntimeException);
+            css::registry::InvalidValueException, css::uno::RuntimeException, std::exception);
 
     virtual void SAL_CALL setStringListValue(
         css::uno::Sequence< OUString > const &)
         throw (
             css::registry::InvalidRegistryException,
-            css::uno::RuntimeException);
+            css::uno::RuntimeException, std::exception);
 
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBinaryValue()
         throw (
             css::registry::InvalidRegistryException,
-            css::registry::InvalidValueException, css::uno::RuntimeException);
+            css::registry::InvalidValueException, css::uno::RuntimeException, std::exception);
 
     virtual void SAL_CALL setBinaryValue(css::uno::Sequence< sal_Int8 > const &)
         throw (
             css::registry::InvalidRegistryException,
-            css::uno::RuntimeException);
+            css::uno::RuntimeException, std::exception);
 
     virtual css::uno::Reference< css::registry::XRegistryKey > SAL_CALL openKey(
         OUString const & aKeyName)
         throw (
             css::registry::InvalidRegistryException,
-            css::uno::RuntimeException);
+            css::uno::RuntimeException, std::exception);
 
     virtual css::uno::Reference< css::registry::XRegistryKey > SAL_CALL
     createKey(OUString const &)
         throw (
             css::registry::InvalidRegistryException,
-            css::uno::RuntimeException);
+            css::uno::RuntimeException, std::exception);
 
     virtual void SAL_CALL closeKey()
         throw (
             css::registry::InvalidRegistryException,
-            css::uno::RuntimeException);
+            css::uno::RuntimeException, std::exception);
 
     virtual void SAL_CALL deleteKey(OUString const &)
         throw (
             css::registry::InvalidRegistryException,
-            css::uno::RuntimeException);
+            css::uno::RuntimeException, std::exception);
 
     virtual
     css::uno::Sequence< css::uno::Reference< css::registry::XRegistryKey > >
     SAL_CALL openKeys()
         throw (
             css::registry::InvalidRegistryException,
-            css::uno::RuntimeException);
+            css::uno::RuntimeException, std::exception);
 
     virtual css::uno::Sequence< OUString > SAL_CALL getKeyNames()
         throw (
             css::registry::InvalidRegistryException,
-            css::uno::RuntimeException);
+            css::uno::RuntimeException, std::exception);
 
     virtual sal_Bool SAL_CALL createLink(
         OUString const &, OUString const &)
         throw (
             css::registry::InvalidRegistryException,
-            css::uno::RuntimeException);
+            css::uno::RuntimeException, std::exception);
 
     virtual void SAL_CALL deleteLink(OUString const &)
         throw (
             css::registry::InvalidRegistryException,
-            css::uno::RuntimeException);
+            css::uno::RuntimeException, std::exception);
 
     virtual OUString SAL_CALL getLinkTarget(OUString const &)
         throw (
             css::registry::InvalidRegistryException,
-            css::uno::RuntimeException);
+            css::uno::RuntimeException, std::exception);
 
     virtual OUString SAL_CALL getResolvedName(
         OUString const & aKeyName)
         throw (
             css::registry::InvalidRegistryException,
-            css::uno::RuntimeException);
+            css::uno::RuntimeException, std::exception);
 
     Service & service_;
     css::uno::Any value_;
@@ -336,14 +336,14 @@ Service::Service(
     }
 }
 
-OUString Service::getURL() throw (css::uno::RuntimeException) {
+OUString Service::getURL() throw (css::uno::RuntimeException, std::exception) {
     osl::MutexGuard g(mutex_);
     checkValid_RuntimeException();
     return url_;
 }
 
 void Service::open(OUString const & rURL, sal_Bool bReadOnly, sal_Bool)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     //TODO: bCreate
     osl::MutexGuard g(mutex_);
@@ -371,13 +371,13 @@ void Service::open(OUString const & rURL, sal_Bool bReadOnly, sal_Bool)
     readOnly_ = bReadOnly;
 }
 
-sal_Bool Service::isValid() throw (css::uno::RuntimeException) {
+sal_Bool Service::isValid() throw (css::uno::RuntimeException, std::exception) {
     osl::MutexGuard g(mutex_);
     return access_.is();
 }
 
 void Service::close()
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(mutex_);
     checkValid();
@@ -385,7 +385,7 @@ void Service::close()
 }
 
 void Service::destroy()
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     throw css::uno::RuntimeException(
         "com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -393,14 +393,14 @@ void Service::destroy()
 }
 
 css::uno::Reference< css::registry::XRegistryKey > Service::getRootKey()
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(mutex_);
     checkValid();
     return new RegistryKey(*this, css::uno::makeAny(access_));
 }
 
-sal_Bool Service::isReadOnly() throw (css::uno::RuntimeException) {
+sal_Bool Service::isReadOnly() throw (css::uno::RuntimeException, std::exception) {
     osl::MutexGuard g(mutex_);
     checkValid_RuntimeException();
     return readOnly_;
@@ -409,14 +409,14 @@ sal_Bool Service::isReadOnly() throw (css::uno::RuntimeException) {
 void Service::mergeKey(OUString const &, OUString const &)
     throw (
         css::registry::InvalidRegistryException,
-        css::registry::MergeConflictException, css::uno::RuntimeException)
+        css::registry::MergeConflictException, css::uno::RuntimeException, std::exception)
 {
     throw css::uno::RuntimeException(
         "com.sun.star.configuration.ConfigurationRegistry: not implemented",
         static_cast< cppu::OWeakObject * >(this));
 }
 
-void Service::flush() throw (css::uno::RuntimeException)
+void Service::flush() throw (css::uno::RuntimeException, std::exception)
 {
     throw css::uno::RuntimeException(
         "com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -425,7 +425,7 @@ void Service::flush() throw (css::uno::RuntimeException)
 
 void Service::addFlushListener(
     css::uno::Reference< css::util::XFlushListener > const &)
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     throw css::uno::RuntimeException(
         "com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -434,7 +434,7 @@ void Service::addFlushListener(
 
 void Service::removeFlushListener(
     css::uno::Reference< css::util::XFlushListener > const &)
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     throw css::uno::RuntimeException(
         "com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -461,7 +461,7 @@ void Service::doClose() {
     access_.clear();
 }
 
-OUString RegistryKey::getKeyName() throw (css::uno::RuntimeException) {
+OUString RegistryKey::getKeyName() throw (css::uno::RuntimeException, std::exception) {
     osl::MutexGuard g(service_.mutex_);
     service_.checkValid_RuntimeException();
     css::uno::Reference< css::container::XNamed > named;
@@ -474,19 +474,19 @@ OUString RegistryKey::getKeyName() throw (css::uno::RuntimeException) {
 }
 
 sal_Bool RegistryKey::isReadOnly()
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(service_.mutex_);
     service_.checkValid_RuntimeException();
     return service_.readOnly_; //TODO: read-only sub-nodes in update access?
 }
 
-sal_Bool RegistryKey::isValid() throw (css::uno::RuntimeException) {
+sal_Bool RegistryKey::isValid() throw (css::uno::RuntimeException, std::exception) {
     return service_.isValid();
 }
 
 css::registry::RegistryKeyType RegistryKey::getKeyType(OUString const &)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(service_.mutex_);
     service_.checkValid();
@@ -494,7 +494,7 @@ css::registry::RegistryKeyType RegistryKey::getKeyType(OUString const &)
 }
 
 css::registry::RegistryValueType RegistryKey::getValueType()
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(service_.mutex_);
     service_.checkValid();
@@ -524,7 +524,7 @@ css::registry::RegistryValueType RegistryKey::getValueType()
 sal_Int32 RegistryKey::getLongValue()
     throw (
         css::registry::InvalidRegistryException,
-        css::registry::InvalidValueException, css::uno::RuntimeException)
+        css::registry::InvalidValueException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(service_.mutex_);
     service_.checkValid();
@@ -538,7 +538,7 @@ sal_Int32 RegistryKey::getLongValue()
 }
 
 void RegistryKey::setLongValue(sal_Int32)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     throw css::uno::RuntimeException(
         "com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -548,7 +548,7 @@ void RegistryKey::setLongValue(sal_Int32)
 css::uno::Sequence< sal_Int32 > RegistryKey::getLongListValue()
     throw (
         css::registry::InvalidRegistryException,
-        css::registry::InvalidValueException, css::uno::RuntimeException)
+        css::registry::InvalidValueException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(service_.mutex_);
     service_.checkValid();
@@ -562,7 +562,7 @@ css::uno::Sequence< sal_Int32 > RegistryKey::getLongListValue()
 }
 
 void RegistryKey::setLongListValue(css::uno::Sequence< sal_Int32 > const &)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     throw css::uno::RuntimeException(
         "com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -572,7 +572,7 @@ void RegistryKey::setLongListValue(css::uno::Sequence< sal_Int32 > const &)
 OUString RegistryKey::getAsciiValue()
     throw (
         css::registry::InvalidRegistryException,
-        css::registry::InvalidValueException, css::uno::RuntimeException)
+        css::registry::InvalidValueException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(service_.mutex_);
     service_.checkValid();
@@ -586,7 +586,7 @@ OUString RegistryKey::getAsciiValue()
 }
 
 void RegistryKey::setAsciiValue(OUString const &)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     throw css::uno::RuntimeException(
         "com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -596,7 +596,7 @@ void RegistryKey::setAsciiValue(OUString const &)
 css::uno::Sequence< OUString > RegistryKey::getAsciiListValue()
     throw (
         css::registry::InvalidRegistryException,
-        css::registry::InvalidValueException, css::uno::RuntimeException)
+        css::registry::InvalidValueException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(service_.mutex_);
     service_.checkValid();
@@ -610,7 +610,7 @@ css::uno::Sequence< OUString > RegistryKey::getAsciiListValue()
 }
 
 void RegistryKey::setAsciiListValue(css::uno::Sequence< OUString > const &)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     throw css::uno::RuntimeException(
         "com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -620,7 +620,7 @@ void RegistryKey::setAsciiListValue(css::uno::Sequence< OUString > const &)
 OUString RegistryKey::getStringValue()
     throw (
         css::registry::InvalidRegistryException,
-        css::registry::InvalidValueException, css::uno::RuntimeException)
+        css::registry::InvalidValueException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(service_.mutex_);
     service_.checkValid();
@@ -634,7 +634,7 @@ OUString RegistryKey::getStringValue()
 }
 
 void RegistryKey::setStringValue(OUString const &)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     throw css::uno::RuntimeException(
         "com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -644,7 +644,7 @@ void RegistryKey::setStringValue(OUString const &)
 css::uno::Sequence< OUString > RegistryKey::getStringListValue()
     throw (
         css::registry::InvalidRegistryException,
-        css::registry::InvalidValueException, css::uno::RuntimeException)
+        css::registry::InvalidValueException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(service_.mutex_);
     service_.checkValid();
@@ -659,7 +659,7 @@ css::uno::Sequence< OUString > RegistryKey::getStringListValue()
 
 void RegistryKey::setStringListValue(
     css::uno::Sequence< OUString > const &)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     throw css::uno::RuntimeException(
         "com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -669,7 +669,7 @@ void RegistryKey::setStringListValue(
 css::uno::Sequence< sal_Int8 > RegistryKey::getBinaryValue()
     throw (
         css::registry::InvalidRegistryException,
-        css::registry::InvalidValueException, css::uno::RuntimeException)
+        css::registry::InvalidValueException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(service_.mutex_);
     service_.checkValid();
@@ -683,7 +683,7 @@ css::uno::Sequence< sal_Int8 > RegistryKey::getBinaryValue()
 }
 
 void RegistryKey::setBinaryValue(css::uno::Sequence< sal_Int8 > const &)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     throw css::uno::RuntimeException(
         "com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -692,7 +692,7 @@ void RegistryKey::setBinaryValue(css::uno::Sequence< sal_Int8 > const &)
 
 css::uno::Reference< css::registry::XRegistryKey > RegistryKey::openKey(
     OUString const & aKeyName)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(service_.mutex_);
     service_.checkValid_RuntimeException();
@@ -709,7 +709,7 @@ css::uno::Reference< css::registry::XRegistryKey > RegistryKey::openKey(
 css::uno::Reference< css::registry::XRegistryKey > RegistryKey::createKey(
     OUString const &)
     throw (
-        css::registry::InvalidRegistryException, css::uno::RuntimeException)
+        css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     throw css::uno::RuntimeException(
         "com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -718,14 +718,14 @@ css::uno::Reference< css::registry::XRegistryKey > RegistryKey::createKey(
 
 void RegistryKey::closeKey()
     throw (
-        css::registry::InvalidRegistryException, css::uno::RuntimeException)
+        css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(service_.mutex_);
     service_.checkValid_RuntimeException();
 }
 
 void RegistryKey::deleteKey(OUString const &)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     throw css::uno::RuntimeException(
         "com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -734,7 +734,7 @@ void RegistryKey::deleteKey(OUString const &)
 
 css::uno::Sequence< css::uno::Reference< css::registry::XRegistryKey > >
 RegistryKey::openKeys()
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     throw css::uno::RuntimeException(
         "com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -742,7 +742,7 @@ RegistryKey::openKeys()
 }
 
 css::uno::Sequence< OUString > RegistryKey::getKeyNames()
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     throw css::uno::RuntimeException(
         "com.sun.star.configuration.ConfigurationRegistry: not implemented",
@@ -750,7 +750,7 @@ css::uno::Sequence< OUString > RegistryKey::getKeyNames()
 }
 
 sal_Bool RegistryKey::createLink(OUString const &, OUString const &)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(service_.mutex_);
     service_.checkValid_RuntimeException();
@@ -758,14 +758,14 @@ sal_Bool RegistryKey::createLink(OUString const &, OUString const &)
 }
 
 void RegistryKey::deleteLink(OUString const &)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(service_.mutex_);
     service_.checkValid_RuntimeException();
 }
 
 OUString RegistryKey::getLinkTarget(OUString const &)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(service_.mutex_);
     service_.checkValid_RuntimeException();
@@ -773,7 +773,7 @@ OUString RegistryKey::getLinkTarget(OUString const &)
 }
 
 OUString RegistryKey::getResolvedName(OUString const & aKeyName)
-    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException)
+    throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(service_.mutex_);
     service_.checkValid_RuntimeException();
diff --git a/configmgr/source/readonlyaccess.cxx b/configmgr/source/readonlyaccess.cxx
index 67d0e0f6d53f..a8c76b782dab 100644
--- a/configmgr/source/readonlyaccess.cxx
+++ b/configmgr/source/readonlyaccess.cxx
@@ -56,29 +56,29 @@ private:
     virtual ~Service() {}
 
     virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException)
+        throw (css::uno::RuntimeException, std::exception)
     { return read_only_access::getImplementationName(); }
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException)
+        throw (css::uno::RuntimeException, std::exception)
     { return cppu::supportsService(this, ServiceName); }
 
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getSupportedServiceNames() throw (css::uno::RuntimeException)
+    getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception)
     { return read_only_access::getSupportedServiceNames(); }
 
     virtual void SAL_CALL initialize(
         css::uno::Sequence< css::uno::Any > const & aArguments)
-        throw (css::uno::Exception, css::uno::RuntimeException);
+        throw (css::uno::Exception, css::uno::RuntimeException, std::exception);
 
     virtual css::uno::Any SAL_CALL getByHierarchicalName(
         OUString const & aName)
         throw (
-            css::container::NoSuchElementException, css::uno::RuntimeException)
+            css::container::NoSuchElementException, css::uno::RuntimeException, std::exception)
     { return getRoot()->getByHierarchicalName(aName); }
 
     virtual sal_Bool SAL_CALL hasByHierarchicalName(OUString const & aName)
-        throw (css::uno::RuntimeException)
+        throw (css::uno::RuntimeException, std::exception)
     { return getRoot()->hasByHierarchicalName(aName); }
 
     rtl::Reference< RootAccess > getRoot();
@@ -90,7 +90,7 @@ private:
 };
 
 void Service::initialize(css::uno::Sequence< css::uno::Any > const & aArguments)
-    throw (css::uno::Exception, css::uno::RuntimeException)
+    throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     OUString locale;
     if (aArguments.getLength() != 1 || !(aArguments[0] >>= locale)) {
diff --git a/configmgr/source/readwriteaccess.cxx b/configmgr/source/readwriteaccess.cxx
index d9352892411e..bce076b2c2e7 100644
--- a/configmgr/source/readwriteaccess.cxx
+++ b/configmgr/source/readwriteaccess.cxx
@@ -58,29 +58,29 @@ private:
     virtual ~Service() {}
 
     virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException)
+        throw (css::uno::RuntimeException, std::exception)
     { return read_write_access::getImplementationName(); }
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException)
+        throw (css::uno::RuntimeException, std::exception)
     { return cppu::supportsService(this, ServiceName); }
 
     virtual css::uno::Sequence< OUString > SAL_CALL
-    getSupportedServiceNames() throw (css::uno::RuntimeException)
+    getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception)
     { return read_write_access::getSupportedServiceNames(); }
 
     virtual void SAL_CALL initialize(
         css::uno::Sequence< css::uno::Any > const & aArguments)
-        throw (css::uno::Exception, css::uno::RuntimeException);
+        throw (css::uno::Exception, css::uno::RuntimeException, std::exception);
 
     virtual css::uno::Any SAL_CALL getByHierarchicalName(
         OUString const & aName)
         throw (
-            css::container::NoSuchElementException, css::uno::RuntimeException)
+            css::container::NoSuchElementException, css::uno::RuntimeException, std::exception)
     { return getRoot()->getByHierarchicalName(aName); }
 
     virtual sal_Bool SAL_CALL hasByHierarchicalName(OUString const & aName)
-        throw (css::uno::RuntimeException)
+        throw (css::uno::RuntimeException, std::exception)
     { return getRoot()->hasByHierarchicalName(aName); }
 
     virtual void SAL_CALL replaceByHierarchicalName(
@@ -88,19 +88,19 @@ private:
         throw (
             css::lang::IllegalArgumentException,
             css::container::NoSuchElementException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException)
+            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
     { getRoot()->replaceByHierarchicalName(aName, aElement); }
 
     virtual void SAL_CALL commitChanges()
-        throw (css::lang::WrappedTargetException, css::uno::RuntimeException)
+        throw (css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
     { getRoot()->commitChanges(); }
 
     virtual sal_Bool SAL_CALL hasPendingChanges()
-        throw (css::uno::RuntimeException)
+        throw (css::uno::RuntimeException, std::exception)
     { return getRoot()->hasPendingChanges(); }
 
     virtual css::util::ChangesSet SAL_CALL getPendingChanges()
-        throw (css::uno::RuntimeException)
+        throw (css::uno::RuntimeException, std::exception)
     { return getRoot()->getPendingChanges(); }
 
     rtl::Reference< RootAccess > getRoot();
@@ -112,7 +112,7 @@ private:
 };
 
 void Service::initialize(css::uno::Sequence< css::uno::Any > const & aArguments)
-    throw (css::uno::Exception, css::uno::RuntimeException)
+    throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
 {
     OUString locale;
     if (aArguments.getLength() != 1 || !(aArguments[0] >>= locale)) {
diff --git a/configmgr/source/rootaccess.cxx b/configmgr/source/rootaccess.cxx
index 59b2bbd12051..9ccf8fcb5fb3 100644
--- a/configmgr/source/rootaccess.cxx
+++ b/configmgr/source/rootaccess.cxx
@@ -120,7 +120,7 @@ void RootAccess::setAlive(bool b) {
 
 void RootAccess::addChangesListener(
     css::uno::Reference< css::util::XChangesListener > const & aListener)
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     {
@@ -143,7 +143,7 @@ void RootAccess::addChangesListener(
 
 void RootAccess::removeChangesListener(
     css::uno::Reference< css::util::XChangesListener > const & aListener)
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
@@ -183,7 +183,7 @@ void RootAccess::commitChanges()
     bc.send();
 }
 
-sal_Bool RootAccess::hasPendingChanges() throw (css::uno::RuntimeException) {
+sal_Bool RootAccess::hasPendingChanges() throw (css::uno::RuntimeException, std::exception) {
     assert(thisIs(IS_UPDATE));
     osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
@@ -194,7 +194,7 @@ sal_Bool RootAccess::hasPendingChanges() throw (css::uno::RuntimeException) {
 }
 
 css::util::ChangesSet RootAccess::getPendingChanges()
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_UPDATE));
     osl::MutexGuard g(*lock_);
@@ -296,7 +296,7 @@ void RootAccess::clearListeners() throw() {
 }
 
 css::uno::Any RootAccess::queryInterface(css::uno::Type const & aType)
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
@@ -318,7 +318,7 @@ css::uno::Any RootAccess::queryInterface(css::uno::Type const & aType)
 }
 
 OUString RootAccess::getImplementationName()
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
diff --git a/configmgr/source/rootaccess.hxx b/configmgr/source/rootaccess.hxx
index 25d13082ed6d..f87d1b533721 100644
--- a/configmgr/source/rootaccess.hxx
+++ b/configmgr/source/rootaccess.hxx
@@ -82,12 +82,12 @@ public:
     virtual void SAL_CALL addChangesListener(
         com::sun::star::uno::Reference< com::sun::star::util::XChangesListener >
             const & aListener)
-        throw (com::sun::star::uno::RuntimeException);
+        throw (com::sun::star::uno::RuntimeException, std::exception);
 
     virtual void SAL_CALL removeChangesListener(
         com::sun::star::uno::Reference< com::sun::star::util::XChangesListener >
             const & aListener)
-        throw (com::sun::star::uno::RuntimeException);
+        throw (com::sun::star::uno::RuntimeException, std::exception);
 
     virtual void SAL_CALL commitChanges()
         throw (
@@ -96,10 +96,10 @@ public:
             std::exception);
 
     virtual sal_Bool SAL_CALL hasPendingChanges()
-        throw (com::sun::star::uno::RuntimeException);
+        throw (com::sun::star::uno::RuntimeException, std::exception);
 
     virtual com::sun::star::util::ChangesSet SAL_CALL getPendingChanges()
-        throw (com::sun::star::uno::RuntimeException);
+        throw (com::sun::star::uno::RuntimeException, std::exception);
 
 private:
     virtual ~RootAccess();
@@ -130,10 +130,10 @@ private:
 
     virtual com::sun::star::uno::Any SAL_CALL queryInterface(
         com::sun::star::uno::Type const & aType)
-        throw (com::sun::star::uno::RuntimeException);
+        throw (com::sun::star::uno::RuntimeException, std::exception);
 
     virtual OUString SAL_CALL getImplementationName()
-        throw (com::sun::star::uno::RuntimeException);
+        throw (com::sun::star::uno::RuntimeException, std::exception);
 
     typedef
         std::multiset<
diff --git a/configmgr/source/update.cxx b/configmgr/source/update.cxx
index ac53c94c4c52..7e6d982ca6e3 100644
--- a/configmgr/source/update.cxx
+++ b/configmgr/source/update.cxx
@@ -74,7 +74,7 @@ private:
 
     virtual void SAL_CALL insertExtensionXcsFile(
         sal_Bool shared, OUString const & fileUri)
-        throw (css::uno::RuntimeException);
+        throw (css::uno::RuntimeException, std::exception);
 
     virtual void SAL_CALL insertExtensionXcuFile(
         sal_Bool shared, OUString const & fileUri)
@@ -89,7 +89,7 @@ private:
         OUString const & fileUri,
         css::uno::Sequence< OUString > const & includedPaths,
         css::uno::Sequence< OUString > const & excludedPaths)
-        throw (css::uno::RuntimeException);
+        throw (css::uno::RuntimeException, std::exception);
 
     boost::shared_ptr<osl::Mutex> lock_;
     css::uno::Reference< css::uno::XComponentContext > context_;
@@ -97,7 +97,7 @@ private:
 
 void Service::insertExtensionXcsFile(
     sal_Bool shared, OUString const & fileUri)
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     osl::MutexGuard g(*lock_);
     Components::getSingleton(context_).insertExtensionXcsFile(shared, fileUri);
@@ -139,7 +139,7 @@ void Service::insertModificationXcuFile(
     OUString const & fileUri,
     css::uno::Sequence< OUString > const & includedPaths,
     css::uno::Sequence< OUString > const & excludedPaths)
-    throw (css::uno::RuntimeException)
+    throw (css::uno::RuntimeException, std::exception)
 {
     Broadcaster bc;
     {