cppuhelper: retrofit std::exception into overriding exception specs

Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3

3 files changed, 85 insertions, 85 deletions

diff --git a/UnoControls/source/base/basecontainercontrol.cxx b/UnoControls/source/base/basecontainercontrol.cxx
index ae63f0b57730..5806504520b4 100644
--- a/UnoControls/source/base/basecontainercontrol.cxx
+++ b/UnoControls/source/base/basecontainercontrol.cxx
@@ -54,7 +54,7 @@ BaseContainerControl::~BaseContainerControl()
 //  XInterface
 
 
-Any SAL_CALL BaseContainerControl::queryInterface( const Type& rType ) throw( RuntimeException )
+Any SAL_CALL BaseContainerControl::queryInterface( const Type& rType ) throw( RuntimeException, std::exception )
 {
     // Attention:
     //  Don't use mutex or guard in this method!!! Is a method of XInterface.
@@ -79,7 +79,7 @@ Any SAL_CALL BaseContainerControl::queryInterface( const Type& rType ) throw( Ru
 //  XTypeProvider
 
 
-Sequence< Type > SAL_CALL BaseContainerControl::getTypes() throw( RuntimeException )
+Sequence< Type > SAL_CALL BaseContainerControl::getTypes() throw( RuntimeException, std::exception )
 {
     // Optimize this method !
     // We initialize a static variable only one time. And we don't must use a mutex at every call!
@@ -111,7 +111,7 @@ Sequence< Type > SAL_CALL BaseContainerControl::getTypes() throw( RuntimeExcepti
 //  XAggregation
 
 
-Any SAL_CALL BaseContainerControl::queryAggregation( const Type& aType ) throw( RuntimeException )
+Any SAL_CALL BaseContainerControl::queryAggregation( const Type& aType ) throw( RuntimeException, std::exception )
 {
     // Ask for my own supported interfaces ...
     // Attention: XTypeProvider and XInterface are supported by OComponentHelper!
@@ -139,7 +139,7 @@ Any SAL_CALL BaseContainerControl::queryAggregation( const Type& aType ) throw(
 
 
 void SAL_CALL BaseContainerControl::createPeer( const   Reference< XToolkit >&      xToolkit    ,
-                                                const   Reference< XWindowPeer >&   xParent     ) throw( RuntimeException )
+                                                const   Reference< XWindowPeer >&   xParent     ) throw( RuntimeException, std::exception )
 {
     if ( !getPeer().is() )
     {
@@ -165,7 +165,7 @@ void SAL_CALL BaseContainerControl::createPeer( const   Reference< XToolkit >&
 //  XControl
 
 
-sal_Bool SAL_CALL BaseContainerControl::setModel( const Reference< XControlModel >& ) throw( RuntimeException )
+sal_Bool SAL_CALL BaseContainerControl::setModel( const Reference< XControlModel >& ) throw( RuntimeException, std::exception )
 {
     // This object has NO model.
     return sal_False ;
@@ -175,7 +175,7 @@ sal_Bool SAL_CALL BaseContainerControl::setModel( const Reference< XControlModel
 //  XControl
 
 
-Reference< XControlModel > SAL_CALL BaseContainerControl::getModel() throw( RuntimeException )
+Reference< XControlModel > SAL_CALL BaseContainerControl::getModel() throw( RuntimeException, std::exception )
 {
     // This object has NO model.
     // return (XControlModel*)this ;
@@ -186,7 +186,7 @@ Reference< XControlModel > SAL_CALL BaseContainerControl::getModel() throw( Runt
 //  XComponent
 
 
-void SAL_CALL BaseContainerControl::dispose() throw( RuntimeException )
+void SAL_CALL BaseContainerControl::dispose() throw( RuntimeException, std::exception )
 {
     // Tell everything that this container is now gone.
     // It's faster if you listen to both the control and the container.
@@ -227,7 +227,7 @@ void SAL_CALL BaseContainerControl::dispose() throw( RuntimeException )
 //  XEventListener
 
 
-void SAL_CALL BaseContainerControl::disposing( const EventObject& rEvent ) throw( RuntimeException )
+void SAL_CALL BaseContainerControl::disposing( const EventObject& rEvent ) throw( RuntimeException, std::exception )
 {
     Reference< XControl > xControl( rEvent.Source, UNO_QUERY );
 
@@ -239,7 +239,7 @@ void SAL_CALL BaseContainerControl::disposing( const EventObject& rEvent ) throw
 //  XControlContainer
 
 
-void SAL_CALL BaseContainerControl::addControl ( const OUString& rName, const Reference< XControl > & rControl ) throw( RuntimeException )
+void SAL_CALL BaseContainerControl::addControl ( const OUString& rName, const Reference< XControl > & rControl ) throw( RuntimeException, std::exception )
 {
     if ( !rControl.is () )
         return;
@@ -310,7 +310,7 @@ void SAL_CALL BaseContainerControl::addContainerListener ( const Reference< XCon
 //  XControlContainer
 
 
-void SAL_CALL BaseContainerControl::removeControl ( const Reference< XControl > & rControl ) throw( RuntimeException )
+void SAL_CALL BaseContainerControl::removeControl ( const Reference< XControl > & rControl ) throw( RuntimeException, std::exception )
 {
     if ( rControl.is() )
     {
@@ -375,7 +375,7 @@ void SAL_CALL BaseContainerControl::removeContainerListener ( const Reference< X
 //  XControlContainer
 
 
-void SAL_CALL BaseContainerControl::setStatusText ( const OUString& rStatusText ) throw( RuntimeException )
+void SAL_CALL BaseContainerControl::setStatusText ( const OUString& rStatusText ) throw( RuntimeException, std::exception )
 {
     // go down to each parent
     Reference< XControlContainer >  xContainer ( getContext(), UNO_QUERY ) ;
@@ -390,7 +390,7 @@ void SAL_CALL BaseContainerControl::setStatusText ( const OUString& rStatusText
 //  XControlContainer
 
 
-Reference< XControl > SAL_CALL BaseContainerControl::getControl ( const OUString& rName ) throw( RuntimeException )
+Reference< XControl > SAL_CALL BaseContainerControl::getControl ( const OUString& rName ) throw( RuntimeException, std::exception )
 {
     // Ready for multithreading
     MutexGuard  aGuard ( Mutex::getGlobalMutex() ) ;
@@ -418,7 +418,7 @@ Reference< XControl > SAL_CALL BaseContainerControl::getControl ( const OUString
 //  XControlContainer
 
 
-Sequence< Reference< XControl > > SAL_CALL BaseContainerControl::getControls () throw( RuntimeException )
+Sequence< Reference< XControl > > SAL_CALL BaseContainerControl::getControls () throw( RuntimeException, std::exception )
 {
     // Ready for multithreading
     MutexGuard  aGuard ( Mutex::getGlobalMutex() ) ;
@@ -513,7 +513,7 @@ Sequence<Reference< XTabController > > SAL_CALL BaseContainerControl::getTabCont
 //  XWindow
 
 
-void SAL_CALL BaseContainerControl::setVisible ( sal_Bool bVisible ) throw( RuntimeException )
+void SAL_CALL BaseContainerControl::setVisible ( sal_Bool bVisible ) throw( RuntimeException, std::exception )
 {
     // override baseclass definition
     BaseControl::setVisible ( bVisible ) ;
diff --git a/UnoControls/source/base/basecontrol.cxx b/UnoControls/source/base/basecontrol.cxx
index b355344467b3..064785105504 100644
--- a/UnoControls/source/base/basecontrol.cxx
+++ b/UnoControls/source/base/basecontrol.cxx
@@ -78,7 +78,7 @@ BaseControl::~BaseControl()
 //  XInterface
 
 
-Any SAL_CALL BaseControl::queryInterface( const Type& rType ) throw( RuntimeException )
+Any SAL_CALL BaseControl::queryInterface( const Type& rType ) throw( RuntimeException, std::exception )
 {
     Any aReturn ;
     if ( m_xDelegator.is() )
@@ -126,7 +126,7 @@ void SAL_CALL BaseControl::release() throw()
 //  XTypeProvider
 
 
-Sequence< Type > SAL_CALL BaseControl::getTypes() throw( RuntimeException )
+Sequence< Type > SAL_CALL BaseControl::getTypes() throw( RuntimeException, std::exception )
 {
     // Optimize this method !
     // We initialize a static variable only one time. And we don't must use a mutex at every call!
@@ -163,7 +163,7 @@ Sequence< Type > SAL_CALL BaseControl::getTypes() throw( RuntimeException )
 //  XTypeProvider
 
 
-Sequence< sal_Int8 > SAL_CALL BaseControl::getImplementationId() throw( RuntimeException )
+Sequence< sal_Int8 > SAL_CALL BaseControl::getImplementationId() throw( RuntimeException, std::exception )
 {
     // Create one Id for all instances of this class.
     // Use ethernet address to do this! (sal_True)
@@ -195,7 +195,7 @@ Sequence< sal_Int8 > SAL_CALL BaseControl::getImplementationId() throw( RuntimeE
 //  XAggregation
 
 
-void SAL_CALL BaseControl::setDelegator( const Reference< XInterface >& xDel ) throw( RuntimeException )
+void SAL_CALL BaseControl::setDelegator( const Reference< XInterface >& xDel ) throw( RuntimeException, std::exception )
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -206,7 +206,7 @@ void SAL_CALL BaseControl::setDelegator( const Reference< XInterface >& xDel ) t
 //  XAggregation
 
 
-Any SAL_CALL BaseControl::queryAggregation( const Type& aType ) throw( RuntimeException )
+Any SAL_CALL BaseControl::queryAggregation( const Type& aType ) throw( RuntimeException, std::exception )
 {
     // Ask for my own supported interfaces ...
     // Attention: XTypeProvider and XInterface are supported by OComponentHelper!
@@ -237,7 +237,7 @@ Any SAL_CALL BaseControl::queryAggregation( const Type& aType ) throw( RuntimeEx
 //  XServiceInfo
 
 
-OUString SAL_CALL BaseControl::getImplementationName() throw( RuntimeException )
+OUString SAL_CALL BaseControl::getImplementationName() throw( RuntimeException, std::exception )
 {
     return impl_getStaticImplementationName();
 }
@@ -246,7 +246,7 @@ OUString SAL_CALL BaseControl::getImplementationName() throw( RuntimeException )
 //  XServiceInfo
 
 
-sal_Bool SAL_CALL BaseControl::supportsService( const OUString& sServiceName ) throw( RuntimeException )
+sal_Bool SAL_CALL BaseControl::supportsService( const OUString& sServiceName ) throw( RuntimeException, std::exception )
 {
     return cppu::supportsService(this, sServiceName);
 }
@@ -255,7 +255,7 @@ sal_Bool SAL_CALL BaseControl::supportsService( const OUString& sServiceName ) t
 //  XServiceInfo
 
 
-Sequence< OUString > SAL_CALL BaseControl::getSupportedServiceNames() throw( RuntimeException )
+Sequence< OUString > SAL_CALL BaseControl::getSupportedServiceNames() throw( RuntimeException, std::exception )
 {
     return impl_getStaticSupportedServiceNames();
 }
@@ -264,7 +264,7 @@ Sequence< OUString > SAL_CALL BaseControl::getSupportedServiceNames() throw( Run
 //  XComponent
 
 
-void SAL_CALL BaseControl::dispose() throw( RuntimeException )
+void SAL_CALL BaseControl::dispose() throw( RuntimeException, std::exception )
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -293,7 +293,7 @@ void SAL_CALL BaseControl::dispose() throw( RuntimeException )
 //  XComponent
 
 
-void SAL_CALL BaseControl::addEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException )
+void SAL_CALL BaseControl::addEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException, std::exception )
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -304,7 +304,7 @@ void SAL_CALL BaseControl::addEventListener( const Reference< XEventListener >&
 //  XComponent
 
 
-void SAL_CALL BaseControl::removeEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException )
+void SAL_CALL BaseControl::removeEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException, std::exception )
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -316,7 +316,7 @@ void SAL_CALL BaseControl::removeEventListener( const Reference< XEventListener
 
 
 void SAL_CALL BaseControl::createPeer(  const   Reference< XToolkit >&      xToolkit    ,
-                                        const   Reference< XWindowPeer >&   xParentPeer ) throw( RuntimeException )
+                                        const   Reference< XWindowPeer >&   xParentPeer ) throw( RuntimeException, std::exception )
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -378,7 +378,7 @@ void SAL_CALL BaseControl::createPeer(  const   Reference< XToolkit >&      xToo
 //  XControl
 
 
-void SAL_CALL BaseControl::setContext( const Reference< XInterface >& xContext ) throw( RuntimeException )
+void SAL_CALL BaseControl::setContext( const Reference< XInterface >& xContext ) throw( RuntimeException, std::exception )
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -389,7 +389,7 @@ void SAL_CALL BaseControl::setContext( const Reference< XInterface >& xContext )
 //  XControl
 
 
-void SAL_CALL BaseControl::setDesignMode( sal_Bool bOn ) throw( RuntimeException )
+void SAL_CALL BaseControl::setDesignMode( sal_Bool bOn ) throw( RuntimeException, std::exception )
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -400,7 +400,7 @@ void SAL_CALL BaseControl::setDesignMode( sal_Bool bOn ) throw( RuntimeException
 //  XControl
 
 
-Reference< XInterface > SAL_CALL BaseControl::getContext() throw( RuntimeException )
+Reference< XInterface > SAL_CALL BaseControl::getContext() throw( RuntimeException, std::exception )
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -411,7 +411,7 @@ Reference< XInterface > SAL_CALL BaseControl::getContext() throw( RuntimeExcepti
 //  XControl
 
 
-Reference< XWindowPeer > SAL_CALL BaseControl::getPeer() throw( RuntimeException )
+Reference< XWindowPeer > SAL_CALL BaseControl::getPeer() throw( RuntimeException, std::exception )
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -422,7 +422,7 @@ Reference< XWindowPeer > SAL_CALL BaseControl::getPeer() throw( RuntimeException
 //  XControl
 
 
-Reference< XView > SAL_CALL BaseControl::getView() throw( RuntimeException )
+Reference< XView > SAL_CALL BaseControl::getView() throw( RuntimeException, std::exception )
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -433,7 +433,7 @@ Reference< XView > SAL_CALL BaseControl::getView() throw( RuntimeException )
 //  XControl
 
 
-sal_Bool SAL_CALL BaseControl::isDesignMode() throw( RuntimeException )
+sal_Bool SAL_CALL BaseControl::isDesignMode() throw( RuntimeException, std::exception )
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -444,7 +444,7 @@ sal_Bool SAL_CALL BaseControl::isDesignMode() throw( RuntimeException )
 //  XControl
 
 
-sal_Bool SAL_CALL BaseControl::isTransparent() throw( RuntimeException )
+sal_Bool SAL_CALL BaseControl::isTransparent() throw( RuntimeException, std::exception )
 {
     return sal_False ;
 }
@@ -457,7 +457,7 @@ void SAL_CALL BaseControl::setPosSize(  sal_Int32   nX      ,
                                         sal_Int32   nY      ,
                                         sal_Int32   nWidth  ,
                                         sal_Int32   nHeight ,
-                                        sal_Int16   nFlags  ) throw( RuntimeException )
+                                        sal_Int16   nFlags  ) throw( RuntimeException, std::exception )
 {
     // - change size and position of window and save the values
 
@@ -496,7 +496,7 @@ void SAL_CALL BaseControl::setPosSize(  sal_Int32   nX      ,
 //  XWindow
 
 
-void SAL_CALL BaseControl::setVisible( sal_Bool bVisible ) throw( RuntimeException )
+void SAL_CALL BaseControl::setVisible( sal_Bool bVisible ) throw( RuntimeException, std::exception )
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -515,7 +515,7 @@ void SAL_CALL BaseControl::setVisible( sal_Bool bVisible ) throw( RuntimeExcepti
 //  XWindow
 
 
-void SAL_CALL BaseControl::setEnable( sal_Bool bEnable ) throw( RuntimeException )
+void SAL_CALL BaseControl::setEnable( sal_Bool bEnable ) throw( RuntimeException, std::exception )
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -534,7 +534,7 @@ void SAL_CALL BaseControl::setEnable( sal_Bool bEnable ) throw( RuntimeException
 //  XWindow
 
 
-void SAL_CALL BaseControl::setFocus() throw( RuntimeException )
+void SAL_CALL BaseControl::setFocus() throw( RuntimeException, std::exception )
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -549,7 +549,7 @@ void SAL_CALL BaseControl::setFocus() throw( RuntimeException )
 //  XWindow
 
 
-Rectangle SAL_CALL BaseControl::getPosSize() throw( RuntimeException )
+Rectangle SAL_CALL BaseControl::getPosSize() throw( RuntimeException, std::exception )
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -560,7 +560,7 @@ Rectangle SAL_CALL BaseControl::getPosSize() throw( RuntimeException )
 //  XWindow
 
 
-void SAL_CALL BaseControl::addWindowListener( const Reference< XWindowListener >& xListener ) throw( RuntimeException )
+void SAL_CALL BaseControl::addWindowListener( const Reference< XWindowListener >& xListener ) throw( RuntimeException, std::exception )
 {
     impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XWindowListener >*)0), xListener );
 }
@@ -569,7 +569,7 @@ void SAL_CALL BaseControl::addWindowListener( const Reference< XWindowListener >
 //  XWindow
 
 
-void SAL_CALL BaseControl::addFocusListener( const Reference< XFocusListener >& xListener ) throw( RuntimeException )
+void SAL_CALL BaseControl::addFocusListener( const Reference< XFocusListener >& xListener ) throw( RuntimeException, std::exception )
 {
     impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XFocusListener >*)0), xListener );
 }
@@ -578,7 +578,7 @@ void SAL_CALL BaseControl::addFocusListener( const Reference< XFocusListener >&
 //  XWindow
 
 
-void SAL_CALL BaseControl::addKeyListener( const Reference< XKeyListener >& xListener ) throw( RuntimeException )
+void SAL_CALL BaseControl::addKeyListener( const Reference< XKeyListener >& xListener ) throw( RuntimeException, std::exception )
 {
     impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XKeyListener >*)0), xListener );
 }
@@ -587,7 +587,7 @@ void SAL_CALL BaseControl::addKeyListener( const Reference< XKeyListener >& xLis
 //  XWindow
 
 
-void SAL_CALL BaseControl::addMouseListener( const Reference< XMouseListener >& xListener ) throw( RuntimeException )
+void SAL_CALL BaseControl::addMouseListener( const Reference< XMouseListener >& xListener ) throw( RuntimeException, std::exception )
 {
     impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XMouseListener >*)0), xListener );
 }
@@ -596,7 +596,7 @@ void SAL_CALL BaseControl::addMouseListener( const Reference< XMouseListener >&
 //  XWindow
 
 
-void SAL_CALL BaseControl::addMouseMotionListener( const Reference< XMouseMotionListener >& xListener ) throw( RuntimeException )
+void SAL_CALL BaseControl::addMouseMotionListener( const Reference< XMouseMotionListener >& xListener ) throw( RuntimeException, std::exception )
 {
     impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XMouseMotionListener >*)0), xListener );
 }
@@ -605,7 +605,7 @@ void SAL_CALL BaseControl::addMouseMotionListener( const Reference< XMouseMotion
 //  XWindow
 
 
-void SAL_CALL BaseControl::addPaintListener( const Reference< XPaintListener >& xListener ) throw( RuntimeException )
+void SAL_CALL BaseControl::addPaintListener( const Reference< XPaintListener >& xListener ) throw( RuntimeException, std::exception )
 {
     impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XPaintListener >*)0), xListener );
 }
@@ -614,7 +614,7 @@ void SAL_CALL BaseControl::addPaintListener( const Reference< XPaintListener >&
 //  XWindow
 
 
-void SAL_CALL BaseControl::removeWindowListener( const Reference< XWindowListener >& xListener ) throw( RuntimeException )
+void SAL_CALL BaseControl::removeWindowListener( const Reference< XWindowListener >& xListener ) throw( RuntimeException, std::exception )
 {
     impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XWindowListener >*)0), xListener );
 }
@@ -623,7 +623,7 @@ void SAL_CALL BaseControl::removeWindowListener( const Reference< XWindowListene
 //  XWindow
 
 
-void SAL_CALL BaseControl::removeFocusListener( const Reference< XFocusListener >& xListener ) throw( RuntimeException )
+void SAL_CALL BaseControl::removeFocusListener( const Reference< XFocusListener >& xListener ) throw( RuntimeException, std::exception )
 {
     impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XFocusListener >*)0), xListener );
 }
@@ -632,7 +632,7 @@ void SAL_CALL BaseControl::removeFocusListener( const Reference< XFocusListener
 //  XWindow
 
 
-void SAL_CALL BaseControl::removeKeyListener( const Reference< XKeyListener >& xListener ) throw( RuntimeException )
+void SAL_CALL BaseControl::removeKeyListener( const Reference< XKeyListener >& xListener ) throw( RuntimeException, std::exception )
 {
     impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XKeyListener >*)0), xListener );
 }
@@ -641,7 +641,7 @@ void SAL_CALL BaseControl::removeKeyListener( const Reference< XKeyListener >& x
 //  XWindow
 
 
-void SAL_CALL BaseControl::removeMouseListener( const Reference< XMouseListener >& xListener ) throw( RuntimeException )
+void SAL_CALL BaseControl::removeMouseListener( const Reference< XMouseListener >& xListener ) throw( RuntimeException, std::exception )
 {
     impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XMouseListener >*)0), xListener );
 }
@@ -650,7 +650,7 @@ void SAL_CALL BaseControl::removeMouseListener( const Reference< XMouseListener
 //  XWindow
 
 
-void  SAL_CALL BaseControl::removeMouseMotionListener( const Reference< XMouseMotionListener >& xListener ) throw( RuntimeException )
+void  SAL_CALL BaseControl::removeMouseMotionListener( const Reference< XMouseMotionListener >& xListener ) throw( RuntimeException, std::exception )
 {
     impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XMouseMotionListener >*)0), xListener );
 }
@@ -659,7 +659,7 @@ void  SAL_CALL BaseControl::removeMouseMotionListener( const Reference< XMouseMo
 //  XWindow
 
 
-void SAL_CALL BaseControl::removePaintListener( const Reference< XPaintListener >& xListener ) throw( RuntimeException )
+void SAL_CALL BaseControl::removePaintListener( const Reference< XPaintListener >& xListener ) throw( RuntimeException, std::exception )
 {
     impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XPaintListener >*)0), xListener );
 }
@@ -669,7 +669,7 @@ void SAL_CALL BaseControl::removePaintListener( const Reference< XPaintListener
 
 
 void SAL_CALL BaseControl::draw(    sal_Int32   nX  ,
-                                    sal_Int32   nY  ) throw( RuntimeException )
+                                    sal_Int32   nY  ) throw( RuntimeException, std::exception )
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -684,7 +684,7 @@ void SAL_CALL BaseControl::draw(    sal_Int32   nX  ,
 //  XView
 
 
-sal_Bool SAL_CALL BaseControl::setGraphics( const Reference< XGraphics >& xDevice ) throw( RuntimeException )
+sal_Bool SAL_CALL BaseControl::setGraphics( const Reference< XGraphics >& xDevice ) throw( RuntimeException, std::exception )
 {
     // - set the graphics for an view
     // - in this class exist 2 graphics-member ... one for peer[_xGraphicsPeer] and one for view[_xGraphicsView]
@@ -707,7 +707,7 @@ sal_Bool SAL_CALL BaseControl::setGraphics( const Reference< XGraphics >& xDevic
 
 
 void SAL_CALL BaseControl::setZoom( float   /*fZoomX*/  ,
-                                    float   /*fZoomY*/  ) throw( RuntimeException )
+                                    float   /*fZoomY*/  ) throw( RuntimeException, std::exception )
 {
     // Not implemented yet
 }
@@ -716,7 +716,7 @@ void SAL_CALL BaseControl::setZoom( float   /*fZoomX*/  ,
 //  XView
 
 
-Reference< XGraphics > SAL_CALL BaseControl::getGraphics() throw( RuntimeException )
+Reference< XGraphics > SAL_CALL BaseControl::getGraphics() throw( RuntimeException, std::exception )
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -727,7 +727,7 @@ Reference< XGraphics > SAL_CALL BaseControl::getGraphics() throw( RuntimeExcepti
 //  XView
 
 
-Size SAL_CALL BaseControl::getSize() throw( RuntimeException )
+Size SAL_CALL BaseControl::getSize() throw( RuntimeException, std::exception )
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -738,7 +738,7 @@ Size SAL_CALL BaseControl::getSize() throw( RuntimeException )
 //  XEventListener
 
 
-void SAL_CALL BaseControl::disposing( const EventObject& /*aSource*/ ) throw( RuntimeException )
+void SAL_CALL BaseControl::disposing( const EventObject& /*aSource*/ ) throw( RuntimeException, std::exception )
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -762,7 +762,7 @@ void SAL_CALL BaseControl::disposing( const EventObject& /*aSource*/ ) throw( Ru
 //  XPaintListener
 
 
-void SAL_CALL BaseControl::windowPaint( const PaintEvent& /*aEvent*/ ) throw( RuntimeException )
+void SAL_CALL BaseControl::windowPaint( const PaintEvent& /*aEvent*/ ) throw( RuntimeException, std::exception )
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -777,7 +777,7 @@ void SAL_CALL BaseControl::windowPaint( const PaintEvent& /*aEvent*/ ) throw( Ru
 //  XWindowListener
 
 
-void SAL_CALL BaseControl::windowResized( const WindowEvent& aEvent ) throw( RuntimeException )
+void SAL_CALL BaseControl::windowResized( const WindowEvent& aEvent ) throw( RuntimeException, std::exception )
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -794,7 +794,7 @@ void SAL_CALL BaseControl::windowResized( const WindowEvent& aEvent ) throw( Run
 //  XWindowListener
 
 
-void SAL_CALL BaseControl::windowMoved( const WindowEvent& aEvent ) throw( RuntimeException )
+void SAL_CALL BaseControl::windowMoved( const WindowEvent& aEvent ) throw( RuntimeException, std::exception )
 {
     // Ready for multithreading
     MutexGuard aGuard( m_aMutex );
@@ -811,7 +811,7 @@ void SAL_CALL BaseControl::windowMoved( const WindowEvent& aEvent ) throw( Runti
 //  XWindowListener
 
 
-void SAL_CALL BaseControl::windowShown( const EventObject& /*aEvent*/ ) throw( RuntimeException )
+void SAL_CALL BaseControl::windowShown( const EventObject& /*aEvent*/ ) throw( RuntimeException, std::exception )
 {
 }
 
@@ -819,7 +819,7 @@ void SAL_CALL BaseControl::windowShown( const EventObject& /*aEvent*/ ) throw( R
 //  XWindowListener
 
 
-void SAL_CALL BaseControl::windowHidden( const EventObject& /*aEvent*/ ) throw( RuntimeException )
+void SAL_CALL BaseControl::windowHidden( const EventObject& /*aEvent*/ ) throw( RuntimeException, std::exception )
 {
 }
 
diff --git a/UnoControls/source/base/multiplexer.cxx b/UnoControls/source/base/multiplexer.cxx
index 0dd2bc41cfe5..ccee9bea5a13 100644
--- a/UnoControls/source/base/multiplexer.cxx
+++ b/UnoControls/source/base/multiplexer.cxx
@@ -96,7 +96,7 @@ OMRCListenerMultiplexerHelper::~OMRCListenerMultiplexerHelper()
 //  XInterface
 
 
-Any SAL_CALL OMRCListenerMultiplexerHelper::queryInterface( const Type& rType ) throw( RuntimeException )
+Any SAL_CALL OMRCListenerMultiplexerHelper::queryInterface( const Type& rType ) throw( RuntimeException, std::exception )
 {
     // Attention:
     //  Don't use mutex or guard in this method!!! Is a method of XInterface.
@@ -247,7 +247,7 @@ void OMRCListenerMultiplexerHelper::unadvise(   const   Type&
 //  XEventListener
 
 
-void SAL_CALL OMRCListenerMultiplexerHelper::disposing( const EventObject& /*aSource*/ ) throw( RuntimeException )
+void SAL_CALL OMRCListenerMultiplexerHelper::disposing( const EventObject& /*aSource*/ ) throw( RuntimeException, std::exception )
 {
     MutexGuard aGuard( m_aMutex );
     // peer is disposed, clear the reference
@@ -258,7 +258,7 @@ void SAL_CALL OMRCListenerMultiplexerHelper::disposing( const EventObject& /*aSo
 //  XFcousListener
 
 
-void OMRCListenerMultiplexerHelper::focusGained(const FocusEvent& aEvent ) throw( RuntimeException )
+void OMRCListenerMultiplexerHelper::focusGained(const FocusEvent& aEvent ) throw( RuntimeException, std::exception )
 {
     MULTIPLEX( XFocusListener, focusGained, FocusEvent, aEvent )
 }
@@ -267,7 +267,7 @@ void OMRCListenerMultiplexerHelper::focusGained(const FocusEvent& aEvent ) throw
 //  XFcousListener
 
 
-void OMRCListenerMultiplexerHelper::focusLost(const FocusEvent& aEvent ) throw( RuntimeException )
+void OMRCListenerMultiplexerHelper::focusLost(const FocusEvent& aEvent ) throw( RuntimeException, std::exception )
 {
     MULTIPLEX( XFocusListener, focusLost, FocusEvent, aEvent )
 }
@@ -276,7 +276,7 @@ void OMRCListenerMultiplexerHelper::focusLost(const FocusEvent& aEvent ) throw(
 //  XWindowListener
 
 
-void OMRCListenerMultiplexerHelper::windowResized(const WindowEvent& aEvent ) throw( RuntimeException )
+void OMRCListenerMultiplexerHelper::windowResized(const WindowEvent& aEvent ) throw( RuntimeException, std::exception )
 {
     MULTIPLEX( XWindowListener, windowResized, WindowEvent, aEvent )
 }
@@ -285,7 +285,7 @@ void OMRCListenerMultiplexerHelper::windowResized(const WindowEvent& aEvent ) th
 //  XWindowListener
 
 
-void OMRCListenerMultiplexerHelper::windowMoved(const WindowEvent& aEvent ) throw( RuntimeException )
+void OMRCListenerMultiplexerHelper::windowMoved(const WindowEvent& aEvent ) throw( RuntimeException, std::exception )
 {
     MULTIPLEX( XWindowListener, windowMoved, WindowEvent, aEvent )
 }
@@ -294,7 +294,7 @@ void OMRCListenerMultiplexerHelper::windowMoved(const WindowEvent& aEvent ) thro
 //  XWindowListener
 
 
-void OMRCListenerMultiplexerHelper::windowShown(const EventObject& aEvent ) throw( RuntimeException )
+void OMRCListenerMultiplexerHelper::windowShown(const EventObject& aEvent ) throw( RuntimeException, std::exception )
 {
     MULTIPLEX( XWindowListener, windowShown, EventObject, aEvent )
 }
@@ -303,7 +303,7 @@ void OMRCListenerMultiplexerHelper::windowShown(const EventObject& aEvent ) thro
 //  XWindowListener
 
 
-void OMRCListenerMultiplexerHelper::windowHidden(const EventObject& aEvent ) throw( RuntimeException )
+void OMRCListenerMultiplexerHelper::windowHidden(const EventObject& aEvent ) throw( RuntimeException, std::exception )
 {
     MULTIPLEX( XWindowListener, windowHidden, EventObject, aEvent )
 }
@@ -312,7 +312,7 @@ void OMRCListenerMultiplexerHelper::windowHidden(const EventObject& aEvent ) thr
 //  XKeyListener
 
 
-void OMRCListenerMultiplexerHelper::keyPressed(const KeyEvent& aEvent) throw( RuntimeException )
+void OMRCListenerMultiplexerHelper::keyPressed(const KeyEvent& aEvent) throw( RuntimeException, std::exception )
 {
     MULTIPLEX( XKeyListener, keyPressed, KeyEvent, aEvent )
 }
@@ -321,7 +321,7 @@ void OMRCListenerMultiplexerHelper::keyPressed(const KeyEvent& aEvent) throw( Ru
 //  XKeyListener
 
 
-void OMRCListenerMultiplexerHelper::keyReleased(const KeyEvent& aEvent) throw( RuntimeException )
+void OMRCListenerMultiplexerHelper::keyReleased(const KeyEvent& aEvent) throw( RuntimeException, std::exception )
 {
     MULTIPLEX( XKeyListener, keyReleased, KeyEvent, aEvent )
 }
@@ -330,7 +330,7 @@ void OMRCListenerMultiplexerHelper::keyReleased(const KeyEvent& aEvent) throw( R
 //  XMouseListener
 
 
-void OMRCListenerMultiplexerHelper::mousePressed(const MouseEvent& aEvent) throw( RuntimeException )
+void OMRCListenerMultiplexerHelper::mousePressed(const MouseEvent& aEvent) throw( RuntimeException, std::exception )
 {
     MULTIPLEX( XMouseListener, mousePressed, MouseEvent, aEvent )
 }
@@ -339,7 +339,7 @@ void OMRCListenerMultiplexerHelper::mousePressed(const MouseEvent& aEvent) throw
 //  XMouseListener
 
 
-void OMRCListenerMultiplexerHelper::mouseReleased(const MouseEvent& aEvent) throw( RuntimeException )
+void OMRCListenerMultiplexerHelper::mouseReleased(const MouseEvent& aEvent) throw( RuntimeException, std::exception )
 {
     MULTIPLEX( XMouseListener, mouseReleased, MouseEvent, aEvent )
 }
@@ -348,7 +348,7 @@ void OMRCListenerMultiplexerHelper::mouseReleased(const MouseEvent& aEvent) thro
 //  XMouseListener
 
 
-void OMRCListenerMultiplexerHelper::mouseEntered(const MouseEvent& aEvent) throw( RuntimeException )
+void OMRCListenerMultiplexerHelper::mouseEntered(const MouseEvent& aEvent) throw( RuntimeException, std::exception )
 {
     MULTIPLEX( XMouseListener, mouseEntered, MouseEvent, aEvent )
 }
@@ -357,7 +357,7 @@ void OMRCListenerMultiplexerHelper::mouseEntered(const MouseEvent& aEvent) throw
 //  XMouseListener
 
 
-void OMRCListenerMultiplexerHelper::mouseExited(const MouseEvent& aEvent) throw( RuntimeException )
+void OMRCListenerMultiplexerHelper::mouseExited(const MouseEvent& aEvent) throw( RuntimeException, std::exception )
 {
     MULTIPLEX( XMouseListener, mouseExited, MouseEvent, aEvent )
 }
@@ -366,7 +366,7 @@ void OMRCListenerMultiplexerHelper::mouseExited(const MouseEvent& aEvent) throw(
 //  XMouseMotionListener
 
 
-void OMRCListenerMultiplexerHelper::mouseDragged(const MouseEvent& aEvent) throw( RuntimeException )
+void OMRCListenerMultiplexerHelper::mouseDragged(const MouseEvent& aEvent) throw( RuntimeException, std::exception )
 {
     MULTIPLEX( XMouseMotionListener, mouseDragged, MouseEvent, aEvent )
 }
@@ -375,7 +375,7 @@ void OMRCListenerMultiplexerHelper::mouseDragged(const MouseEvent& aEvent) throw
 //  XMouseMotionListener
 
 
-void OMRCListenerMultiplexerHelper::mouseMoved(const MouseEvent& aEvent) throw( RuntimeException )
+void OMRCListenerMultiplexerHelper::mouseMoved(const MouseEvent& aEvent) throw( RuntimeException, std::exception )
 {
     MULTIPLEX( XMouseMotionListener, mouseMoved, MouseEvent, aEvent )
 }
@@ -384,7 +384,7 @@ void OMRCListenerMultiplexerHelper::mouseMoved(const MouseEvent& aEvent) throw(
 //  XPaintListener
 
 
-void OMRCListenerMultiplexerHelper::windowPaint(const PaintEvent& aEvent) throw( RuntimeException )
+void OMRCListenerMultiplexerHelper::windowPaint(const PaintEvent& aEvent) throw( RuntimeException, std::exception )
 {
     MULTIPLEX( XPaintListener, windowPaint, PaintEvent, aEvent )
 }
@@ -393,7 +393,7 @@ void OMRCListenerMultiplexerHelper::windowPaint(const PaintEvent& aEvent) throw(
 //  XTopWindowListener
 
 
-void OMRCListenerMultiplexerHelper::windowOpened(const EventObject& aEvent) throw( RuntimeException )
+void OMRCListenerMultiplexerHelper::windowOpened(const EventObject& aEvent) throw( RuntimeException, std::exception )
 {
     MULTIPLEX( XTopWindowListener, windowOpened, EventObject, aEvent )
 }
@@ -402,7 +402,7 @@ void OMRCListenerMultiplexerHelper::windowOpened(const EventObject& aEvent) thro
 //  XTopWindowListener
 
 
-void OMRCListenerMultiplexerHelper::windowClosing( const EventObject& aEvent ) throw( RuntimeException )
+void OMRCListenerMultiplexerHelper::windowClosing( const EventObject& aEvent ) throw( RuntimeException, std::exception )
 {
     MULTIPLEX( XTopWindowListener, windowClosing, EventObject, aEvent )
 }
@@ -411,7 +411,7 @@ void OMRCListenerMultiplexerHelper::windowClosing( const EventObject& aEvent ) t
 //  XTopWindowListener
 
 
-void OMRCListenerMultiplexerHelper::windowClosed( const EventObject& aEvent ) throw( RuntimeException )
+void OMRCListenerMultiplexerHelper::windowClosed( const EventObject& aEvent ) throw( RuntimeException, std::exception )
 {
     MULTIPLEX( XTopWindowListener, windowClosed, EventObject, aEvent )
 }
@@ -420,7 +420,7 @@ void OMRCListenerMultiplexerHelper::windowClosed( const EventObject& aEvent ) th
 //  XTopWindowListener
 
 
-void OMRCListenerMultiplexerHelper::windowMinimized( const EventObject& aEvent ) throw( RuntimeException )
+void OMRCListenerMultiplexerHelper::windowMinimized( const EventObject& aEvent ) throw( RuntimeException, std::exception )
 {
     MULTIPLEX( XTopWindowListener, windowMinimized, EventObject, aEvent )
 }
@@ -429,7 +429,7 @@ void OMRCListenerMultiplexerHelper::windowMinimized( const EventObject& aEvent )
 //  XTopWindowListener
 
 
-void OMRCListenerMultiplexerHelper::windowNormalized( const EventObject& aEvent ) throw( RuntimeException )
+void OMRCListenerMultiplexerHelper::windowNormalized( const EventObject& aEvent ) throw( RuntimeException, std::exception )
 {
     MULTIPLEX( XTopWindowListener, windowNormalized, EventObject, aEvent )
 }
@@ -438,7 +438,7 @@ void OMRCListenerMultiplexerHelper::windowNormalized( const EventObject& aEvent
 //  XTopWindowListener
 
 
-void OMRCListenerMultiplexerHelper::windowActivated( const EventObject& aEvent ) throw( RuntimeException )
+void OMRCListenerMultiplexerHelper::windowActivated( const EventObject& aEvent ) throw( RuntimeException, std::exception )
 {
     MULTIPLEX( XTopWindowListener, windowActivated, EventObject, aEvent )
 }
@@ -447,7 +447,7 @@ void OMRCListenerMultiplexerHelper::windowActivated( const EventObject& aEvent )
 //  XTopWindowListener
 
 
-void OMRCListenerMultiplexerHelper::windowDeactivated( const EventObject& aEvent ) throw( RuntimeException )
+void OMRCListenerMultiplexerHelper::windowDeactivated( const EventObject& aEvent ) throw( RuntimeException, std::exception )
 {
     MULTIPLEX( XTopWindowListener, windowDeactivated, EventObject, aEvent )
 }