cppuhelper: retrofit std::exception into overriding exception specs

Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3

6 files changed, 116 insertions, 116 deletions

diff --git a/basic/source/classes/errobject.cxx b/basic/source/classes/errobject.cxx
index 4043549be109..1eec72926949 100644
--- a/basic/source/classes/errobject.cxx
+++ b/basic/source/classes/errobject.cxx
@@ -41,22 +41,22 @@ public:
     ErrObject();
     ~ErrObject();
     // Attributes
-    virtual ::sal_Int32 SAL_CALL getNumber() throw (uno::RuntimeException);
-    virtual void SAL_CALL setNumber( ::sal_Int32 _number ) throw (uno::RuntimeException);
-    virtual ::sal_Int32 SAL_CALL getHelpContext() throw (uno::RuntimeException);
-    virtual void SAL_CALL setHelpContext( ::sal_Int32 _helpcontext ) throw (uno::RuntimeException);
-    virtual OUString SAL_CALL getHelpFile() throw (uno::RuntimeException);
-    virtual void SAL_CALL setHelpFile( const OUString& _helpfile ) throw (uno::RuntimeException);
-    virtual OUString SAL_CALL getDescription() throw (uno::RuntimeException);
-    virtual void SAL_CALL setDescription( const OUString& _description ) throw (uno::RuntimeException);
-    virtual OUString SAL_CALL getSource() throw (uno::RuntimeException);
-    virtual void SAL_CALL setSource( const OUString& _source ) throw (uno::RuntimeException);
+    virtual ::sal_Int32 SAL_CALL getNumber() throw (uno::RuntimeException, std::exception);
+    virtual void SAL_CALL setNumber( ::sal_Int32 _number ) throw (uno::RuntimeException, std::exception);
+    virtual ::sal_Int32 SAL_CALL getHelpContext() throw (uno::RuntimeException, std::exception);
+    virtual void SAL_CALL setHelpContext( ::sal_Int32 _helpcontext ) throw (uno::RuntimeException, std::exception);
+    virtual OUString SAL_CALL getHelpFile() throw (uno::RuntimeException, std::exception);
+    virtual void SAL_CALL setHelpFile( const OUString& _helpfile ) throw (uno::RuntimeException, std::exception);
+    virtual OUString SAL_CALL getDescription() throw (uno::RuntimeException, std::exception);
+    virtual void SAL_CALL setDescription( const OUString& _description ) throw (uno::RuntimeException, std::exception);
+    virtual OUString SAL_CALL getSource() throw (uno::RuntimeException, std::exception);
+    virtual void SAL_CALL setSource( const OUString& _source ) throw (uno::RuntimeException, std::exception);
 
     // Methods
-    virtual void SAL_CALL Clear(  ) throw (uno::RuntimeException);
-    virtual void SAL_CALL Raise( const uno::Any& Number, const uno::Any& Source, const uno::Any& Description, const uno::Any& HelpFile, const uno::Any& HelpContext ) throw (uno::RuntimeException);
+    virtual void SAL_CALL Clear(  ) throw (uno::RuntimeException, std::exception);
+    virtual void SAL_CALL Raise( const uno::Any& Number, const uno::Any& Source, const uno::Any& Description, const uno::Any& HelpFile, const uno::Any& HelpContext ) throw (uno::RuntimeException, std::exception);
     // XDefaultProperty
-    virtual OUString SAL_CALL getDefaultPropertyName(  ) throw (uno::RuntimeException);
+    virtual OUString SAL_CALL getDefaultPropertyName(  ) throw (uno::RuntimeException, std::exception);
 
     // Helper method
     void setData( const uno::Any& Number, const uno::Any& Source, const uno::Any& Description,
@@ -73,13 +73,13 @@ ErrObject::ErrObject() : m_nNumber(0), m_nHelpContext(0)
 }
 
 sal_Int32 SAL_CALL
-ErrObject::getNumber() throw (uno::RuntimeException)
+ErrObject::getNumber() throw (uno::RuntimeException, std::exception)
 {
     return m_nNumber;
 }
 
 void SAL_CALL
-ErrObject::setNumber( ::sal_Int32 _number ) throw (uno::RuntimeException)
+ErrObject::setNumber( ::sal_Int32 _number ) throw (uno::RuntimeException, std::exception)
 {
     GetSbData()->pInst->setErrorVB( _number, OUString() );
     OUString _description = GetSbData()->pInst->GetErrorMsg();
@@ -87,55 +87,55 @@ ErrObject::setNumber( ::sal_Int32 _number ) throw (uno::RuntimeException)
 }
 
 ::sal_Int32 SAL_CALL
-ErrObject::getHelpContext() throw (uno::RuntimeException)
+ErrObject::getHelpContext() throw (uno::RuntimeException, std::exception)
 {
     return m_nHelpContext;
 }
 void SAL_CALL
-ErrObject::setHelpContext( ::sal_Int32 _helpcontext ) throw (uno::RuntimeException)
+ErrObject::setHelpContext( ::sal_Int32 _helpcontext ) throw (uno::RuntimeException, std::exception)
 {
     m_nHelpContext = _helpcontext;
 }
 
 OUString SAL_CALL
-ErrObject::getHelpFile() throw (uno::RuntimeException)
+ErrObject::getHelpFile() throw (uno::RuntimeException, std::exception)
 {
     return m_sHelpFile;
 }
 
 void SAL_CALL
-ErrObject::setHelpFile( const OUString& _helpfile ) throw (uno::RuntimeException)
+ErrObject::setHelpFile( const OUString& _helpfile ) throw (uno::RuntimeException, std::exception)
 {
     m_sHelpFile = _helpfile;
 }
 
 OUString SAL_CALL
-ErrObject::getDescription() throw (uno::RuntimeException)
+ErrObject::getDescription() throw (uno::RuntimeException, std::exception)
 {
     return m_sDescription;
 }
 
 void SAL_CALL
-ErrObject::setDescription( const OUString& _description ) throw (uno::RuntimeException)
+ErrObject::setDescription( const OUString& _description ) throw (uno::RuntimeException, std::exception)
 {
     m_sDescription = _description;
 }
 
 OUString SAL_CALL
-ErrObject::getSource() throw (uno::RuntimeException)
+ErrObject::getSource() throw (uno::RuntimeException, std::exception)
 {
     return m_sSource;
 }
 
 void SAL_CALL
-ErrObject::setSource( const OUString& _source ) throw (uno::RuntimeException)
+ErrObject::setSource( const OUString& _source ) throw (uno::RuntimeException, std::exception)
 {
     m_sSource = _source;
 }
 
 // Methods
 void SAL_CALL
-ErrObject::Clear(  ) throw (uno::RuntimeException)
+ErrObject::Clear(  ) throw (uno::RuntimeException, std::exception)
 {
     m_sHelpFile = OUString();
     m_sSource = m_sHelpFile;
@@ -145,7 +145,7 @@ ErrObject::Clear(  ) throw (uno::RuntimeException)
 }
 
 void SAL_CALL
-ErrObject::Raise( const uno::Any& Number, const uno::Any& Source, const uno::Any& Description, const uno::Any& HelpFile, const uno::Any& HelpContext ) throw (uno::RuntimeException)
+ErrObject::Raise( const uno::Any& Number, const uno::Any& Source, const uno::Any& Description, const uno::Any& HelpFile, const uno::Any& HelpContext ) throw (uno::RuntimeException, std::exception)
 {
     setData( Number, Source, Description, HelpFile, HelpContext );
     if ( m_nNumber )
@@ -154,7 +154,7 @@ ErrObject::Raise( const uno::Any& Number, const uno::Any& Source, const uno::Any
 
 // XDefaultProperty
 OUString SAL_CALL
-ErrObject::getDefaultPropertyName(  ) throw (uno::RuntimeException)
+ErrObject::getDefaultPropertyName(  ) throw (uno::RuntimeException, std::exception)
 {
     static OUString sDfltPropName( "Number" );
     return sDfltPropName;
diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx
index b9d44ac26139..39b43108a02c 100644
--- a/basic/source/classes/eventatt.cxx
+++ b/basic/source/classes/eventatt.cxx
@@ -155,23 +155,23 @@ public:
 
     // Methods of XAllListener
     virtual void SAL_CALL firing(const ScriptEvent& aScriptEvent)
-        throw( RuntimeException );
+        throw( RuntimeException, std::exception );
     virtual Any SAL_CALL approveFiring(const ScriptEvent& aScriptEvent)
-        throw( InvocationTargetException, RuntimeException );
+        throw( InvocationTargetException, RuntimeException, std::exception );
 
     // Methods of XEventListener
     virtual void SAL_CALL disposing(const EventObject& Source)
-        throw( RuntimeException );
+        throw( RuntimeException, std::exception );
 };
 
 // Methods XAllListener
-void BasicScriptListener_Impl::firing( const ScriptEvent& aScriptEvent ) throw ( RuntimeException )
+void BasicScriptListener_Impl::firing( const ScriptEvent& aScriptEvent ) throw ( RuntimeException, std::exception )
 {
     firing_impl( aScriptEvent, NULL );
 }
 
 Any BasicScriptListener_Impl::approveFiring( const ScriptEvent& aScriptEvent )
-    throw ( InvocationTargetException, RuntimeException )
+    throw ( InvocationTargetException, RuntimeException, std::exception )
 {
     Any aRetAny;
     firing_impl( aScriptEvent, &aRetAny );
@@ -179,7 +179,7 @@ Any BasicScriptListener_Impl::approveFiring( const ScriptEvent& aScriptEvent )
 }
 
 // Methods XEventListener
-void BasicScriptListener_Impl::disposing(const EventObject& ) throw ( RuntimeException )
+void BasicScriptListener_Impl::disposing(const EventObject& ) throw ( RuntimeException, std::exception )
 {
     // TODO: ???
     //SolarMutexGuard aGuard;
diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx
index 3ca1e296c0a9..0713a72b58fe 100644
--- a/basic/source/classes/propacc.cxx
+++ b/basic/source/classes/propacc.cxx
@@ -72,7 +72,7 @@ SbPropertyValues::~SbPropertyValues()
 
 
 
-Reference< XPropertySetInfo > SbPropertyValues::getPropertySetInfo(void) throw( RuntimeException )
+Reference< XPropertySetInfo > SbPropertyValues::getPropertySetInfo(void) throw( RuntimeException, std::exception )
 {
     // create on demand?
     if (!m_xInfo.is())
@@ -108,7 +108,7 @@ void SbPropertyValues::setPropertyValue(
                     ::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)
 {
     size_t const nIndex = GetIndex_Impl( aPropertyName );
     PropertyValue & rPropVal = m_aPropVals[nIndex];
@@ -121,7 +121,7 @@ Any SbPropertyValues::getPropertyValue(
                     const OUString& aPropertyName)
                     throw(::com::sun::star::beans::UnknownPropertyException,
                     ::com::sun::star::lang::WrappedTargetException,
-                    ::com::sun::star::uno::RuntimeException)
+                    ::com::sun::star::uno::RuntimeException, std::exception)
 {
     size_t const nIndex = GetIndex_Impl( aPropertyName );
     return m_aPropVals[nIndex].Value;
@@ -132,7 +132,7 @@ Any SbPropertyValues::getPropertyValue(
 void SbPropertyValues::addPropertyChangeListener(
                     const OUString& aPropertyName,
                     const Reference< XPropertyChangeListener >& )
-                    throw ()
+                    throw (std::exception)
 {
     (void)aPropertyName;
 }
@@ -142,7 +142,7 @@ void SbPropertyValues::addPropertyChangeListener(
 void SbPropertyValues::removePropertyChangeListener(
                     const OUString& aPropertyName,
                     const Reference< XPropertyChangeListener >& )
-                    throw ()
+                    throw (std::exception)
 {
     (void)aPropertyName;
 }
@@ -152,7 +152,7 @@ void SbPropertyValues::removePropertyChangeListener(
 void SbPropertyValues::addVetoableChangeListener(
                     const OUString& aPropertyName,
                     const Reference< XVetoableChangeListener >& )
-                    throw()
+                    throw(std::exception)
 {
     (void)aPropertyName;
 }
@@ -162,14 +162,14 @@ void SbPropertyValues::addVetoableChangeListener(
 void SbPropertyValues::removeVetoableChangeListener(
                     const OUString& aPropertyName,
                     const Reference< XVetoableChangeListener >& )
-                    throw()
+                    throw(std::exception)
 {
     (void)aPropertyName;
 }
 
 
 
-Sequence< PropertyValue > SbPropertyValues::getPropertyValues(void) throw (::com::sun::star::uno::RuntimeException)
+Sequence< PropertyValue > SbPropertyValues::getPropertyValues(void) throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
     Sequence<PropertyValue> aRet( m_aPropVals.size() );
     for (size_t n = 0; n < m_aPropVals.size(); ++n)
@@ -184,7 +184,7 @@ void SbPropertyValues::setPropertyValues(const Sequence< PropertyValue >& rPrope
                      ::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)
 {
     if ( !m_aPropVals.empty() )
         throw PropertyExistException();
@@ -258,19 +258,19 @@ SbPropertySetInfo::~SbPropertySetInfo()
 
 
 
-Sequence< Property > SbPropertySetInfo::getProperties(void) throw( RuntimeException )
+Sequence< Property > SbPropertySetInfo::getProperties(void) throw( RuntimeException, std::exception )
 {
     return aImpl.getProperties();
 }
 
 Property SbPropertySetInfo::getPropertyByName(const OUString& Name)
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     return aImpl.getPropertyByName( Name );
 }
 
 sal_Bool SbPropertySetInfo::hasPropertyByName(const OUString& Name)
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     return aImpl.hasPropertyByName( Name );
 }
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index a0ffd4cc3bfc..2620251f83a6 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -80,9 +80,9 @@ public:
     void startListening();
     void stopListening();
 
-    virtual void SAL_CALL queryClosing( const lang::EventObject& rSource, sal_Bool bGetsOwnership ) throw (util::CloseVetoException, uno::RuntimeException);
-    virtual void SAL_CALL notifyClosing( const lang::EventObject& rSource ) throw (uno::RuntimeException);
-    virtual void SAL_CALL disposing( const lang::EventObject& rSource ) throw (uno::RuntimeException);
+    virtual void SAL_CALL queryClosing( const lang::EventObject& rSource, sal_Bool bGetsOwnership ) throw (util::CloseVetoException, uno::RuntimeException, std::exception);
+    virtual void SAL_CALL notifyClosing( const lang::EventObject& rSource ) throw (uno::RuntimeException, std::exception);
+    virtual void SAL_CALL disposing( const lang::EventObject& rSource ) throw (uno::RuntimeException, std::exception);
 
 private:
     StarBASIC&      mrDocBasic;
@@ -136,17 +136,17 @@ void DocBasicItem::stopListening()
     }
 }
 
-void SAL_CALL DocBasicItem::queryClosing( const lang::EventObject& /*rSource*/, sal_Bool /*bGetsOwnership*/ ) throw (util::CloseVetoException, uno::RuntimeException)
+void SAL_CALL DocBasicItem::queryClosing( const lang::EventObject& /*rSource*/, sal_Bool /*bGetsOwnership*/ ) throw (util::CloseVetoException, uno::RuntimeException, std::exception)
 {
 }
 
-void SAL_CALL DocBasicItem::notifyClosing( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException)
+void SAL_CALL DocBasicItem::notifyClosing( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException, std::exception)
 {
     stopListening();
     mbDocClosed = true;
 }
 
-void SAL_CALL DocBasicItem::disposing( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException)
+void SAL_CALL DocBasicItem::disposing( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException, std::exception)
 {
     stopListening();
 }
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 2bc4c57a0ce5..5e21eecb5044 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -3907,11 +3907,11 @@ public:
     ~BasicAllListener_Impl();
 
     // Methods of XAllListener
-    virtual void SAL_CALL firing(const AllEventObject& Event) throw ( RuntimeException );
-    virtual Any SAL_CALL approveFiring(const AllEventObject& Event) throw ( RuntimeException );
+    virtual void SAL_CALL firing(const AllEventObject& Event) throw ( RuntimeException, std::exception );
+    virtual Any SAL_CALL approveFiring(const AllEventObject& Event) throw ( RuntimeException, std::exception );
 
     // Methods of XEventListener
-    virtual void SAL_CALL disposing(const EventObject& Source) throw ( RuntimeException );
+    virtual void SAL_CALL disposing(const EventObject& Source) throw ( RuntimeException, std::exception );
 };
 
 
@@ -3979,12 +3979,12 @@ void BasicAllListener_Impl::firing_impl( const AllEventObject& Event, Any* pRet
 
 
 // Methods of Listener
-void BasicAllListener_Impl::firing( const AllEventObject& Event ) throw ( RuntimeException )
+void BasicAllListener_Impl::firing( const AllEventObject& Event ) throw ( RuntimeException, std::exception )
 {
     firing_impl( Event, NULL );
 }
 
-Any BasicAllListener_Impl::approveFiring( const AllEventObject& Event ) throw ( RuntimeException )
+Any BasicAllListener_Impl::approveFiring( const AllEventObject& Event ) throw ( RuntimeException, std::exception )
 {
     Any aRetAny;
     firing_impl( Event, &aRetAny );
@@ -3993,7 +3993,7 @@ Any BasicAllListener_Impl::approveFiring( const AllEventObject& Event ) throw (
 
 
 // Methods of XEventListener
-void BasicAllListener_Impl ::disposing(const EventObject& ) throw ( RuntimeException )
+void BasicAllListener_Impl ::disposing(const EventObject& ) throw ( RuntimeException, std::exception )
 {
     SolarMutexGuard guard;
 
@@ -4013,14 +4013,14 @@ public:
         const Reference< XAllListener >& AllListener, const Any& Helper );
 
     // XInvocation
-    virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection(void) throw( RuntimeException );
+    virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection(void) throw( RuntimeException, std::exception );
     virtual Any SAL_CALL invoke(const OUString& FunctionName, const Sequence< Any >& Params, Sequence< sal_Int16 >& OutParamIndex, Sequence< Any >& OutParam)
-        throw( IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException );
+        throw( IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception );
     virtual void SAL_CALL setValue(const OUString& PropertyName, const Any& Value)
-        throw( UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException );
-    virtual Any SAL_CALL getValue(const OUString& PropertyName) throw( UnknownPropertyException, RuntimeException );
-    virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) throw( RuntimeException );
-    virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) throw( RuntimeException );
+        throw( UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception );
+    virtual Any SAL_CALL getValue(const OUString& PropertyName) throw( UnknownPropertyException, RuntimeException, std::exception );
+    virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) throw( RuntimeException, std::exception );
+    virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) throw( RuntimeException, std::exception );
 
 private:
     Reference< XIdlReflection >  m_xCoreReflection;
@@ -4065,7 +4065,7 @@ InvocationToAllListenerMapper::InvocationToAllListenerMapper
 
 
 Reference< XIntrospectionAccess > SAL_CALL InvocationToAllListenerMapper::getIntrospection(void)
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     return Reference< XIntrospectionAccess >();
 }
@@ -4074,7 +4074,7 @@ Reference< XIntrospectionAccess > SAL_CALL InvocationToAllListenerMapper::getInt
 Any SAL_CALL InvocationToAllListenerMapper::invoke(const OUString& FunctionName, const Sequence< Any >& Params,
     Sequence< sal_Int16 >& OutParamIndex, Sequence< Any >& OutParam)
         throw( IllegalArgumentException, CannotConvertException,
-        InvocationTargetException, RuntimeException )
+        InvocationTargetException, RuntimeException, std::exception )
 {
     (void)OutParamIndex;
     (void)OutParam     ;
@@ -4127,7 +4127,7 @@ Any SAL_CALL InvocationToAllListenerMapper::invoke(const OUString& FunctionName,
 
 void SAL_CALL InvocationToAllListenerMapper::setValue(const OUString& PropertyName, const Any& Value)
     throw( UnknownPropertyException, CannotConvertException,
-           InvocationTargetException, RuntimeException )
+           InvocationTargetException, RuntimeException, std::exception )
 {
     (void)PropertyName;
     (void)Value;
@@ -4135,7 +4135,7 @@ void SAL_CALL InvocationToAllListenerMapper::setValue(const OUString& PropertyNa
 
 
 Any SAL_CALL InvocationToAllListenerMapper::getValue(const OUString& PropertyName)
-    throw( UnknownPropertyException, RuntimeException )
+    throw( UnknownPropertyException, RuntimeException, std::exception )
 {
     (void)PropertyName;
 
@@ -4144,7 +4144,7 @@ Any SAL_CALL InvocationToAllListenerMapper::getValue(const OUString& PropertyNam
 
 
 sal_Bool SAL_CALL InvocationToAllListenerMapper::hasMethod(const OUString& Name)
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     Reference< XIdlMethod > xMethod = m_xListenerType->getMethod( Name );
     return xMethod.is();
@@ -4152,7 +4152,7 @@ sal_Bool SAL_CALL InvocationToAllListenerMapper::hasMethod(const OUString& Name)
 
 
 sal_Bool SAL_CALL InvocationToAllListenerMapper::hasProperty(const OUString& Name)
-    throw( RuntimeException )
+    throw( RuntimeException, std::exception )
 {
     Reference< XIdlField > xField = m_xListenerType->getField( Name );
     return xField.is();
@@ -4352,24 +4352,24 @@ public:
     {}
 
     // XInvocation
-    virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection() throw();
+    virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection() throw(std::exception);
     virtual void SAL_CALL setValue( const OUString& rProperty, const Any& rValue )
-        throw( UnknownPropertyException );
+        throw( UnknownPropertyException, std::exception );
     virtual Any SAL_CALL getValue( const OUString& rProperty )
-        throw( UnknownPropertyException );
-    virtual sal_Bool SAL_CALL hasMethod( const OUString& rName ) throw();
-    virtual sal_Bool SAL_CALL hasProperty( const OUString& rProp ) throw();
+        throw( UnknownPropertyException, std::exception );
+    virtual sal_Bool SAL_CALL hasMethod( const OUString& rName ) throw(std::exception);
+    virtual sal_Bool SAL_CALL hasProperty( const OUString& rProp ) throw(std::exception);
 
     virtual Any SAL_CALL invoke( const OUString& rFunction,
                                  const Sequence< Any >& rParams,
                                  Sequence< sal_Int16 >& rOutParamIndex,
                                  Sequence< Any >& rOutParam )
-        throw( CannotConvertException, InvocationTargetException );
+        throw( CannotConvertException, InvocationTargetException, std::exception );
 
     // XComponent
-    virtual void SAL_CALL dispose() throw(RuntimeException);
-    virtual void SAL_CALL addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException);
-    virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& aListener ) throw (RuntimeException);
+    virtual void SAL_CALL dispose() throw(RuntimeException, std::exception);
+    virtual void SAL_CALL addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException, std::exception);
+    virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& aListener ) throw (RuntimeException, std::exception);
 };
 
 ModuleInvocationProxy::ModuleInvocationProxy( const OUString& aPrefix, SbxObjectRef xScopeObj )
@@ -4380,12 +4380,12 @@ ModuleInvocationProxy::ModuleInvocationProxy( const OUString& aPrefix, SbxObject
     m_bProxyIsClassModuleObject = xScopeObj.Is() ? xScopeObj->ISA(SbClassModuleObject) : false;
 }
 
-Reference< XIntrospectionAccess > SAL_CALL ModuleInvocationProxy::getIntrospection() throw()
+Reference< XIntrospectionAccess > SAL_CALL ModuleInvocationProxy::getIntrospection() throw(std::exception)
 {
     return Reference< XIntrospectionAccess >();
 }
 
-void SAL_CALL ModuleInvocationProxy::setValue( const OUString& rProperty, const Any& rValue ) throw( UnknownPropertyException )
+void SAL_CALL ModuleInvocationProxy::setValue( const OUString& rProperty, const Any& rValue ) throw( UnknownPropertyException, std::exception )
 {
     if( !m_bProxyIsClassModuleObject )
         throw UnknownPropertyException();
@@ -4423,7 +4423,7 @@ void SAL_CALL ModuleInvocationProxy::setValue( const OUString& rProperty, const
 
 }
 
-Any SAL_CALL ModuleInvocationProxy::getValue( const OUString& rProperty ) throw( UnknownPropertyException )
+Any SAL_CALL ModuleInvocationProxy::getValue( const OUString& rProperty ) throw( UnknownPropertyException, std::exception )
 {
     if( !m_bProxyIsClassModuleObject )
     {
@@ -4451,12 +4451,12 @@ Any SAL_CALL ModuleInvocationProxy::getValue( const OUString& rProperty ) throw(
     return aRet;
 }
 
-sal_Bool SAL_CALL ModuleInvocationProxy::hasMethod( const OUString& ) throw()
+sal_Bool SAL_CALL ModuleInvocationProxy::hasMethod( const OUString& ) throw(std::exception)
 {
     return sal_False;
 }
 
-sal_Bool SAL_CALL ModuleInvocationProxy::hasProperty( const OUString& ) throw()
+sal_Bool SAL_CALL ModuleInvocationProxy::hasProperty( const OUString& ) throw(std::exception)
 {
     return sal_False;
 }
@@ -4465,7 +4465,7 @@ Any SAL_CALL ModuleInvocationProxy::invoke( const OUString& rFunction,
                                             const Sequence< Any >& rParams,
                                             Sequence< sal_Int16 >&,
                                             Sequence< Any >& )
-    throw( CannotConvertException, InvocationTargetException )
+    throw( CannotConvertException, InvocationTargetException, std::exception )
 {
     SolarMutexGuard guard;
 
@@ -4532,7 +4532,7 @@ Any SAL_CALL ModuleInvocationProxy::invoke( const OUString& rFunction,
 }
 
 void SAL_CALL ModuleInvocationProxy::dispose()
-    throw(RuntimeException)
+    throw(RuntimeException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -4543,13 +4543,13 @@ void SAL_CALL ModuleInvocationProxy::dispose()
 }
 
 void SAL_CALL ModuleInvocationProxy::addEventListener( const Reference< XEventListener >& xListener )
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     m_aListeners.addInterface( xListener );
 }
 
 void SAL_CALL ModuleInvocationProxy::removeEventListener( const Reference< XEventListener >& xListener )
-    throw (RuntimeException)
+    throw (RuntimeException, std::exception)
 {
     m_aListeners.removeInterface( xListener );
 }
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 2768ef98b497..ce31d501c647 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -107,23 +107,23 @@ public:
     virtual void SAL_CALL acquire() throw();
     virtual void SAL_CALL release() throw();
 
-    virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (RuntimeException)
+    virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (RuntimeException, std::exception)
     {
         if( !m_xAggregateTypeProv.is() )
             throw RuntimeException();
         return m_xAggregateTypeProv->getImplementationId();
     }
 
-    virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection(  ) throw (RuntimeException);
+    virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection(  ) throw (RuntimeException, std::exception);
 
-    virtual Any SAL_CALL invoke( const OUString& aFunctionName, const Sequence< Any >& aParams, Sequence< ::sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam ) throw (IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException);
-    virtual void SAL_CALL setValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException);
-    virtual Any SAL_CALL getValue( const OUString& aPropertyName ) throw (UnknownPropertyException, RuntimeException);
-    virtual ::sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw (RuntimeException);
-    virtual ::sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw (RuntimeException);
-    virtual  Any SAL_CALL queryInterface( const Type& aType ) throw ( RuntimeException );
+    virtual Any SAL_CALL invoke( const OUString& aFunctionName, const Sequence< Any >& aParams, Sequence< ::sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam ) throw (IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception);
+    virtual void SAL_CALL setValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception);
+    virtual Any SAL_CALL getValue( const OUString& aPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception);
+    virtual ::sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw (RuntimeException, std::exception);
+    virtual ::sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw (RuntimeException, std::exception);
+    virtual  Any SAL_CALL queryInterface( const Type& aType ) throw ( RuntimeException, std::exception );
 
-    virtual Sequence< Type > SAL_CALL getTypes() throw ( RuntimeException );
+    virtual Sequence< Type > SAL_CALL getTypes() throw ( RuntimeException, std::exception );
 };
 
 DocObjectWrapper::DocObjectWrapper( SbModule* pVar ) : m_pMod( pVar ), mName( pVar->GetName() )
@@ -202,7 +202,7 @@ DocObjectWrapper::~DocObjectWrapper()
 }
 
 Sequence< Type > SAL_CALL DocObjectWrapper::getTypes()
-    throw ( RuntimeException )
+    throw ( RuntimeException, std::exception )
 {
     if ( m_Types.getLength() == 0 )
     {
@@ -229,13 +229,13 @@ Sequence< Type > SAL_CALL DocObjectWrapper::getTypes()
 }
 
 Reference< XIntrospectionAccess > SAL_CALL
-DocObjectWrapper::getIntrospection(  ) throw (RuntimeException)
+DocObjectWrapper::getIntrospection(  ) throw (RuntimeException, std::exception)
 {
     return NULL;
 }
 
 Any SAL_CALL
-DocObjectWrapper::invoke( const OUString& aFunctionName, const Sequence< Any >& aParams, Sequence< ::sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam ) throw (IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException)
+DocObjectWrapper::invoke( const OUString& aFunctionName, const Sequence< Any >& aParams, Sequence< ::sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam ) throw (IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception)
 {
     if ( m_xAggInv.is() &&  m_xAggInv->hasMethod( aFunctionName ) )
             return m_xAggInv->invoke( aFunctionName, aParams, aOutParamIndex, aOutParam );
@@ -329,7 +329,7 @@ DocObjectWrapper::invoke( const OUString& aFunctionName, const Sequence< Any >&
 }
 
 void SAL_CALL
-DocObjectWrapper::setValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException)
+DocObjectWrapper::setValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception)
 {
     if ( m_xAggInv.is() &&  m_xAggInv->hasProperty( aPropertyName ) )
             return m_xAggInv->setValue( aPropertyName, aValue );
@@ -341,7 +341,7 @@ DocObjectWrapper::setValue( const OUString& aPropertyName, const Any& aValue ) t
 }
 
 Any SAL_CALL
-DocObjectWrapper::getValue( const OUString& aPropertyName ) throw (UnknownPropertyException, RuntimeException)
+DocObjectWrapper::getValue( const OUString& aPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception)
 {
     if ( m_xAggInv.is() &&  m_xAggInv->hasProperty( aPropertyName ) )
             return m_xAggInv->getValue( aPropertyName );
@@ -359,7 +359,7 @@ DocObjectWrapper::getValue( const OUString& aPropertyName ) throw (UnknownProper
 }
 
 ::sal_Bool SAL_CALL
-DocObjectWrapper::hasMethod( const OUString& aName ) throw (RuntimeException)
+DocObjectWrapper::hasMethod( const OUString& aName ) throw (RuntimeException, std::exception)
 {
     if ( m_xAggInv.is() && m_xAggInv->hasMethod( aName ) )
         return sal_True;
@@ -367,7 +367,7 @@ DocObjectWrapper::hasMethod( const OUString& aName ) throw (RuntimeException)
 }
 
 ::sal_Bool SAL_CALL
-DocObjectWrapper::hasProperty( const OUString& aName ) throw (RuntimeException)
+DocObjectWrapper::hasProperty( const OUString& aName ) throw (RuntimeException, std::exception)
 {
     sal_Bool bRes = sal_False;
     if ( m_xAggInv.is() && m_xAggInv->hasProperty( aName ) )
@@ -377,7 +377,7 @@ DocObjectWrapper::hasProperty( const OUString& aName ) throw (RuntimeException)
 }
 
 Any SAL_CALL DocObjectWrapper::queryInterface( const Type& aType )
-    throw ( RuntimeException )
+    throw ( RuntimeException, std::exception )
 {
     Any aRet = DocObjectWrapper_BASE::queryInterface( aType );
     if ( aRet.hasValue() )
@@ -2350,7 +2350,7 @@ public:
         mxModel.clear();
     }
 
-    virtual void SAL_CALL windowOpened( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException)
+    virtual void SAL_CALL windowOpened( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception)
     {
         if ( mpUserForm )
         {
@@ -2365,7 +2365,7 @@ public:
     }
 
 
-    virtual void SAL_CALL windowClosing( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException)
+    virtual void SAL_CALL windowClosing( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception)
     {
 #ifdef IN_THE_FUTURE
         uno::Reference< awt::XDialog > xDialog( e.Source, uno::UNO_QUERY );
@@ -2397,21 +2397,21 @@ public:
     }
 
 
-    virtual void SAL_CALL windowClosed( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException)
+    virtual void SAL_CALL windowClosed( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception)
     {
         mbOpened = false;
         mbShowing = false;
     }
 
-    virtual void SAL_CALL windowMinimized( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException)
+    virtual void SAL_CALL windowMinimized( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception)
     {
     }
 
-    virtual void SAL_CALL windowNormalized( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException)
+    virtual void SAL_CALL windowNormalized( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception)
     {
     }
 
-    virtual void SAL_CALL windowActivated( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException)
+    virtual void SAL_CALL windowActivated( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception)
     {
         if ( mpUserForm )
         {
@@ -2424,13 +2424,13 @@ public:
         }
     }
 
-    virtual void SAL_CALL windowDeactivated( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException)
+    virtual void SAL_CALL windowDeactivated( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception)
     {
         if ( mpUserForm )
             mpUserForm->triggerDeactivateEvent();
     }
 
-    virtual void SAL_CALL windowResized( const awt::WindowEvent& /*e*/ ) throw (uno::RuntimeException)
+    virtual void SAL_CALL windowResized( const awt::WindowEvent& /*e*/ ) throw (uno::RuntimeException, std::exception)
     {
         if ( mpUserForm )
         {
@@ -2439,21 +2439,21 @@ public:
         }
     }
 
-    virtual void SAL_CALL windowMoved( const awt::WindowEvent& /*e*/ ) throw (uno::RuntimeException)
+    virtual void SAL_CALL windowMoved( const awt::WindowEvent& /*e*/ ) throw (uno::RuntimeException, std::exception)
     {
         if ( mpUserForm )
             mpUserForm->triggerLayoutEvent();
     }
 
-    virtual void SAL_CALL windowShown( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException)
+    virtual void SAL_CALL windowShown( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception)
     {
     }
 
-    virtual void SAL_CALL windowHidden( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException)
+    virtual void SAL_CALL windowHidden( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception)
     {
     }
 
-    virtual void SAL_CALL notifyEvent( const document::EventObject& rEvent ) throw (uno::RuntimeException)
+    virtual void SAL_CALL notifyEvent( const document::EventObject& rEvent ) throw (uno::RuntimeException, std::exception)
     {
         // early dosposing on document event "OnUnload", to be sure Basic still exists when calling VBA "UserForm_Terminate"
         if( rEvent.EventName == GlobalEventConfig::GetEventName( STR_EVENT_CLOSEDOC ) )
@@ -2465,7 +2465,7 @@ public:
         }
     }
 
-    virtual void SAL_CALL disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException)
+    virtual void SAL_CALL disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException, std::exception)
     {
         SAL_INFO("basic", "** Userform/Dialog disposing");
         removeListener();