diff options
Diffstat (limited to 'UnoControls')
19 files changed, 326 insertions, 408 deletions
diff --git a/UnoControls/inc/basecontainercontrol.hxx b/UnoControls/inc/basecontainercontrol.hxx index 908b8a2873b5..55a8f940d7c4 100644 --- a/UnoControls/inc/basecontainercontrol.hxx +++ b/UnoControls/inc/basecontainercontrol.hxx @@ -74,7 +74,7 @@ public: virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; // XTypeProvider @@ -86,62 +86,59 @@ public: @onerror A RuntimeException is thrown. */ - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // XAggregation virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; // XControl virtual void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& xToolkit , const css::uno::Reference< css::awt::XWindowPeer >& xParent - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& xModel - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; - virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel() override; // XComponent - virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispose() override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& rEvent ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& rEvent ) override; // XControlContainer virtual void SAL_CALL addControl( const OUString& sName , const css::uno::Reference< css::awt::XControl >& xControl - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL removeControl( const css::uno::Reference< css::awt::XControl >& xControl - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL setStatusText( const OUString& sStatusText - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual css::uno::Reference< css::awt::XControl > SAL_CALL getControl( const OUString& sName - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; - virtual css::uno::Sequence< css::uno::Reference< css::awt::XControl > > SAL_CALL getControls() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Reference< css::awt::XControl > > SAL_CALL getControls() override; // XWindow - virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setVisible( sal_Bool bVisible ) override; protected: using OComponentHelper::disposing; diff --git a/UnoControls/inc/basecontrol.hxx b/UnoControls/inc/basecontrol.hxx index 8e8b93784b7f..6967a3ff1085 100644 --- a/UnoControls/inc/basecontrol.hxx +++ b/UnoControls/inc/basecontrol.hxx @@ -139,7 +139,7 @@ public: virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; /**_______________________________________________________________________________________________________ @short increment refcount @@ -169,8 +169,7 @@ public: @onerror A RuntimeException is thrown. */ - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; /**_______________________________________________________________________________________________________ @short get implementation id @@ -183,75 +182,68 @@ public: @onerror A RuntimeException is thrown. */ - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; // XAggregation virtual void SAL_CALL setDelegator( const css::uno::Reference< css::uno::XInterface >& xDelegator - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; // XServiceInfo virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XComponent - virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispose() override; virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; // XControl virtual void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& xToolkit, const css::uno::Reference< css::awt::XWindowPeer >& xParent - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL setContext( const css::uno::Reference< css::uno::XInterface >& xContext - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& xModel - ) throw( css::uno::RuntimeException, std::exception ) override = 0; + ) override = 0; - virtual void SAL_CALL setDesignMode( sal_Bool bOn ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setDesignMode( sal_Bool bOn ) override; - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getContext() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getContext() override; - virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel() - throw( css::uno::RuntimeException, std::exception ) override = 0; + virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel() override = 0; - virtual css::uno::Reference< css::awt::XWindowPeer > SAL_CALL getPeer() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::awt::XWindowPeer > SAL_CALL getPeer() override; - virtual css::uno::Reference< css::awt::XView > SAL_CALL getView() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::awt::XView > SAL_CALL getView() override; - virtual sal_Bool SAL_CALL isDesignMode() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL isDesignMode() override; - virtual sal_Bool SAL_CALL isTransparent() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL isTransparent() override; // XWindow @@ -259,99 +251,97 @@ public: sal_Int32 nY , sal_Int32 nWidth , sal_Int32 nHeight , - sal_Int16 nFlags ) throw( css::uno::RuntimeException, std::exception ) override; + sal_Int16 nFlags ) override; - virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setVisible( sal_Bool bVisible ) override; - virtual void SAL_CALL setEnable( sal_Bool bEnable ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setEnable( sal_Bool bEnable ) override; - virtual void SAL_CALL setFocus() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setFocus() override; - virtual css::awt::Rectangle SAL_CALL getPosSize() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::awt::Rectangle SAL_CALL getPosSize() override; virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL addKeyListener( - const css::uno::Reference< css::awt::XKeyListener >& xListener ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::awt::XKeyListener >& xListener ) override; virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; // XView virtual void SAL_CALL draw( sal_Int32 nX , - sal_Int32 nY ) throw( css::uno::RuntimeException, std::exception ) override; + sal_Int32 nY ) override; virtual sal_Bool SAL_CALL setGraphics( const css::uno::Reference< css::awt::XGraphics >& xDevice - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL setZoom( float fZoomX , - float fZoomY ) throw( css::uno::RuntimeException, std::exception ) override; + float fZoomY ) override; - virtual css::uno::Reference< css::awt::XGraphics > SAL_CALL getGraphics() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::awt::XGraphics > SAL_CALL getGraphics() override; - virtual css::awt::Size SAL_CALL getSize() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::awt::Size SAL_CALL getSize() override; // css::lang::XEventListener virtual void SAL_CALL disposing( const css::lang::EventObject& rSource - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; // XPaintListener virtual void SAL_CALL windowPaint( const css::awt::PaintEvent& rEvent - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; // XWindowListener - virtual void SAL_CALL windowResized( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL windowShown( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL windowHidden( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL windowResized( const css::awt::WindowEvent& aEvent ) override; + virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& aEvent ) override; + virtual void SAL_CALL windowShown( const css::lang::EventObject& aEvent ) override; + virtual void SAL_CALL windowHidden( const css::lang::EventObject& aEvent ) override; protected: using OComponentHelper::disposing; diff --git a/UnoControls/inc/multiplexer.hxx b/UnoControls/inc/multiplexer.hxx index f238293444f1..6229b5a5b17e 100644 --- a/UnoControls/inc/multiplexer.hxx +++ b/UnoControls/inc/multiplexer.hxx @@ -100,8 +100,7 @@ public: @onerror A RuntimeException is thrown. */ - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; /**_______________________________________________________________________________________________________ @short increment refcount @@ -154,88 +153,65 @@ public: // XEventListener - virtual void SAL_CALL disposing(const css::lang::EventObject& aSource) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& aSource) override; // XFocusListener - virtual void SAL_CALL focusGained(const css::awt::FocusEvent& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL focusGained(const css::awt::FocusEvent& aEvent ) override; - virtual void SAL_CALL focusLost(const css::awt::FocusEvent& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL focusLost(const css::awt::FocusEvent& aEvent ) override; // XWindowListener - virtual void SAL_CALL windowResized(const css::awt::WindowEvent& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL windowResized(const css::awt::WindowEvent& aEvent ) override; - virtual void SAL_CALL windowMoved(const css::awt::WindowEvent& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL windowMoved(const css::awt::WindowEvent& aEvent ) override; - virtual void SAL_CALL windowShown(const css::lang::EventObject& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL windowShown(const css::lang::EventObject& aEvent ) override; - virtual void SAL_CALL windowHidden(const css::lang::EventObject& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL windowHidden(const css::lang::EventObject& aEvent ) override; // XKeyListener - virtual void SAL_CALL keyPressed( const css::awt::KeyEvent& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL keyPressed( const css::awt::KeyEvent& aEvent ) override; - virtual void SAL_CALL keyReleased( const css::awt::KeyEvent& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL keyReleased( const css::awt::KeyEvent& aEvent ) override; // XMouseListener - virtual void SAL_CALL mousePressed(const css::awt::MouseEvent& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL mousePressed(const css::awt::MouseEvent& aEvent ) override; - virtual void SAL_CALL mouseReleased(const css::awt::MouseEvent& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL mouseReleased(const css::awt::MouseEvent& aEvent ) override; - virtual void SAL_CALL mouseEntered(const css::awt::MouseEvent& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL mouseEntered(const css::awt::MouseEvent& aEvent ) override; - virtual void SAL_CALL mouseExited(const css::awt::MouseEvent& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL mouseExited(const css::awt::MouseEvent& aEvent ) override; // XMouseMotionListener - virtual void SAL_CALL mouseDragged(const css::awt::MouseEvent& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL mouseDragged(const css::awt::MouseEvent& aEvent ) override; - virtual void SAL_CALL mouseMoved(const css::awt::MouseEvent& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL mouseMoved(const css::awt::MouseEvent& aEvent ) override; // XPaintListener - virtual void SAL_CALL windowPaint(const css::awt::PaintEvent& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL windowPaint(const css::awt::PaintEvent& aEvent ) override; // XTopWindowListener - virtual void SAL_CALL windowOpened( const css::lang::EventObject& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL windowOpened( const css::lang::EventObject& aEvent ) override; - virtual void SAL_CALL windowClosing( const css::lang::EventObject& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL windowClosing( const css::lang::EventObject& aEvent ) override; - virtual void SAL_CALL windowClosed( const css::lang::EventObject& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL windowClosed( const css::lang::EventObject& aEvent ) override; - virtual void SAL_CALL windowMinimized( const css::lang::EventObject& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL windowMinimized( const css::lang::EventObject& aEvent ) override; - virtual void SAL_CALL windowNormalized( const css::lang::EventObject& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL windowNormalized( const css::lang::EventObject& aEvent ) override; - virtual void SAL_CALL windowActivated( const css::lang::EventObject& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL windowActivated( const css::lang::EventObject& aEvent ) override; - virtual void SAL_CALL windowDeactivated( const css::lang::EventObject& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL windowDeactivated( const css::lang::EventObject& aEvent ) override; // protected methods diff --git a/UnoControls/source/base/basecontainercontrol.cxx b/UnoControls/source/base/basecontainercontrol.cxx index cb00544b67d6..a6fb9b97447a 100644 --- a/UnoControls/source/base/basecontainercontrol.cxx +++ b/UnoControls/source/base/basecontainercontrol.cxx @@ -48,7 +48,7 @@ BaseContainerControl::~BaseContainerControl() // XInterface -Any SAL_CALL BaseContainerControl::queryInterface( const Type& rType ) throw( RuntimeException, std::exception ) +Any SAL_CALL BaseContainerControl::queryInterface( const Type& rType ) { // Attention: // Don't use mutex or guard in this method!!! Is a method of XInterface. @@ -71,7 +71,7 @@ Any SAL_CALL BaseContainerControl::queryInterface( const Type& rType ) throw( Ru // XTypeProvider -Sequence< Type > SAL_CALL BaseContainerControl::getTypes() throw( RuntimeException, std::exception ) +Sequence< Type > SAL_CALL BaseContainerControl::getTypes() { // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! @@ -101,7 +101,7 @@ Sequence< Type > SAL_CALL BaseContainerControl::getTypes() throw( RuntimeExcepti // XAggregation -Any SAL_CALL BaseContainerControl::queryAggregation( const Type& aType ) throw( RuntimeException, std::exception ) +Any SAL_CALL BaseContainerControl::queryAggregation( const Type& aType ) { // Ask for my own supported interfaces ... // Attention: XTypeProvider and XInterface are supported by OComponentHelper! @@ -127,7 +127,7 @@ Any SAL_CALL BaseContainerControl::queryAggregation( const Type& aType ) throw( // XControl void SAL_CALL BaseContainerControl::createPeer( const Reference< XToolkit >& xToolkit , - const Reference< XWindowPeer >& xParent ) throw( RuntimeException, std::exception ) + const Reference< XWindowPeer >& xParent ) { if ( !getPeer().is() ) { @@ -151,7 +151,7 @@ void SAL_CALL BaseContainerControl::createPeer( const Reference< XToolkit >& // XControl -sal_Bool SAL_CALL BaseContainerControl::setModel( const Reference< XControlModel >& ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL BaseContainerControl::setModel( const Reference< XControlModel >& ) { // This object has NO model. return false; @@ -159,7 +159,7 @@ sal_Bool SAL_CALL BaseContainerControl::setModel( const Reference< XControlModel // XControl -Reference< XControlModel > SAL_CALL BaseContainerControl::getModel() throw( RuntimeException, std::exception ) +Reference< XControlModel > SAL_CALL BaseContainerControl::getModel() { // This object has NO model. // return (XControlModel*)this; @@ -168,7 +168,7 @@ Reference< XControlModel > SAL_CALL BaseContainerControl::getModel() throw( Runt // XComponent -void SAL_CALL BaseContainerControl::dispose() throw( RuntimeException, std::exception ) +void SAL_CALL BaseContainerControl::dispose() { // Tell everything that this container is now gone. // It's faster if you listen to both the control and the container. @@ -207,7 +207,7 @@ void SAL_CALL BaseContainerControl::dispose() throw( RuntimeException, std::exce // XEventListener -void SAL_CALL BaseContainerControl::disposing( const EventObject& rEvent ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseContainerControl::disposing( const EventObject& rEvent ) { Reference< XControl > xControl( rEvent.Source, UNO_QUERY ); @@ -217,7 +217,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, std::exception ) +void SAL_CALL BaseContainerControl::addControl ( const OUString& rName, const Reference< XControl > & rControl ) { if ( !rControl.is () ) return; @@ -271,7 +271,7 @@ void SAL_CALL BaseContainerControl::addControl ( const OUString& rName, const Re // XControlContainer -void SAL_CALL BaseContainerControl::removeControl ( const Reference< XControl > & rControl ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseContainerControl::removeControl ( const Reference< XControl > & rControl ) { if ( rControl.is() ) { @@ -322,7 +322,7 @@ void SAL_CALL BaseContainerControl::removeControl ( const Reference< XControl > // XControlContainer -void SAL_CALL BaseContainerControl::setStatusText ( const OUString& rStatusText ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseContainerControl::setStatusText ( const OUString& rStatusText ) { // go down to each parent Reference< XControlContainer > xContainer ( getContext(), UNO_QUERY ); @@ -335,7 +335,7 @@ void SAL_CALL BaseContainerControl::setStatusText ( const OUString& rStatusText // XControlContainer -Reference< XControl > SAL_CALL BaseContainerControl::getControl ( const OUString& rName ) throw( RuntimeException, std::exception ) +Reference< XControl > SAL_CALL BaseContainerControl::getControl ( const OUString& rName ) { // Ready for multithreading MutexGuard aGuard ( Mutex::getGlobalMutex() ); @@ -361,7 +361,7 @@ Reference< XControl > SAL_CALL BaseContainerControl::getControl ( const OUString // XControlContainer -Sequence< Reference< XControl > > SAL_CALL BaseContainerControl::getControls () throw( RuntimeException, std::exception ) +Sequence< Reference< XControl > > SAL_CALL BaseContainerControl::getControls () { // Ready for multithreading MutexGuard aGuard ( Mutex::getGlobalMutex() ); @@ -384,7 +384,7 @@ Sequence< Reference< XControl > > SAL_CALL BaseContainerControl::getControls () // XWindow -void SAL_CALL BaseContainerControl::setVisible ( sal_Bool bVisible ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseContainerControl::setVisible ( sal_Bool bVisible ) { // override baseclass definition BaseControl::setVisible ( bVisible ); diff --git a/UnoControls/source/base/basecontrol.cxx b/UnoControls/source/base/basecontrol.cxx index 98d927aa2b1f..81a79a4da107 100644 --- a/UnoControls/source/base/basecontrol.cxx +++ b/UnoControls/source/base/basecontrol.cxx @@ -70,7 +70,7 @@ BaseControl::~BaseControl() // XInterface -Any SAL_CALL BaseControl::queryInterface( const Type& rType ) throw( RuntimeException, std::exception ) +Any SAL_CALL BaseControl::queryInterface( const Type& rType ) { Any aReturn; if ( m_xDelegator.is() ) @@ -112,7 +112,7 @@ void SAL_CALL BaseControl::release() throw() // XTypeProvider -Sequence< Type > SAL_CALL BaseControl::getTypes() throw( RuntimeException, std::exception ) +Sequence< Type > SAL_CALL BaseControl::getTypes() { // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! @@ -147,14 +147,14 @@ Sequence< Type > SAL_CALL BaseControl::getTypes() throw( RuntimeException, std:: // XTypeProvider -Sequence< sal_Int8 > SAL_CALL BaseControl::getImplementationId() throw( RuntimeException, std::exception ) +Sequence< sal_Int8 > SAL_CALL BaseControl::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } // XAggregation -void SAL_CALL BaseControl::setDelegator( const Reference< XInterface >& xDel ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::setDelegator( const Reference< XInterface >& xDel ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -163,7 +163,7 @@ void SAL_CALL BaseControl::setDelegator( const Reference< XInterface >& xDel ) t // XAggregation -Any SAL_CALL BaseControl::queryAggregation( const Type& aType ) throw( RuntimeException, std::exception ) +Any SAL_CALL BaseControl::queryAggregation( const Type& aType ) { // Ask for my own supported interfaces ... // Attention: XTypeProvider and XInterface are supported by OComponentHelper! @@ -192,28 +192,28 @@ Any SAL_CALL BaseControl::queryAggregation( const Type& aType ) throw( RuntimeEx // XServiceInfo -OUString SAL_CALL BaseControl::getImplementationName() throw( RuntimeException, std::exception ) +OUString SAL_CALL BaseControl::getImplementationName() { return OUString(); } // XServiceInfo -sal_Bool SAL_CALL BaseControl::supportsService( const OUString& sServiceName ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL BaseControl::supportsService( const OUString& sServiceName ) { return cppu::supportsService(this, sServiceName); } // XServiceInfo -Sequence< OUString > SAL_CALL BaseControl::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL BaseControl::getSupportedServiceNames() { return Sequence< OUString >(); } // XComponent -void SAL_CALL BaseControl::dispose() throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::dispose() { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -258,7 +258,7 @@ void SAL_CALL BaseControl::dispose() throw( RuntimeException, std::exception ) // XComponent -void SAL_CALL BaseControl::addEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::addEventListener( const Reference< XEventListener >& xListener ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -267,7 +267,7 @@ void SAL_CALL BaseControl::addEventListener( const Reference< XEventListener >& // XComponent -void SAL_CALL BaseControl::removeEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::removeEventListener( const Reference< XEventListener >& xListener ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -277,7 +277,7 @@ void SAL_CALL BaseControl::removeEventListener( const Reference< XEventListener // XControl void SAL_CALL BaseControl::createPeer( const Reference< XToolkit >& xToolkit , - const Reference< XWindowPeer >& xParentPeer ) throw( RuntimeException, std::exception ) + const Reference< XWindowPeer >& xParentPeer ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -337,7 +337,7 @@ void SAL_CALL BaseControl::createPeer( const Reference< XToolkit >& xToo // XControl -void SAL_CALL BaseControl::setContext( const Reference< XInterface >& xContext ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::setContext( const Reference< XInterface >& xContext ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -346,7 +346,7 @@ void SAL_CALL BaseControl::setContext( const Reference< XInterface >& xContext ) // XControl -void SAL_CALL BaseControl::setDesignMode( sal_Bool bOn ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::setDesignMode( sal_Bool bOn ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -355,7 +355,7 @@ void SAL_CALL BaseControl::setDesignMode( sal_Bool bOn ) throw( RuntimeException // XControl -Reference< XInterface > SAL_CALL BaseControl::getContext() throw( RuntimeException, std::exception ) +Reference< XInterface > SAL_CALL BaseControl::getContext() { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -364,7 +364,7 @@ Reference< XInterface > SAL_CALL BaseControl::getContext() throw( RuntimeExcepti // XControl -Reference< XWindowPeer > SAL_CALL BaseControl::getPeer() throw( RuntimeException, std::exception ) +Reference< XWindowPeer > SAL_CALL BaseControl::getPeer() { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -373,7 +373,7 @@ Reference< XWindowPeer > SAL_CALL BaseControl::getPeer() throw( RuntimeException // XControl -Reference< XView > SAL_CALL BaseControl::getView() throw( RuntimeException, std::exception ) +Reference< XView > SAL_CALL BaseControl::getView() { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -382,7 +382,7 @@ Reference< XView > SAL_CALL BaseControl::getView() throw( RuntimeException, std: // XControl -sal_Bool SAL_CALL BaseControl::isDesignMode() throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL BaseControl::isDesignMode() { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -391,7 +391,7 @@ sal_Bool SAL_CALL BaseControl::isDesignMode() throw( RuntimeException, std::exce // XControl -sal_Bool SAL_CALL BaseControl::isTransparent() throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL BaseControl::isTransparent() { return false; } @@ -402,7 +402,7 @@ void SAL_CALL BaseControl::setPosSize( sal_Int32 nX , sal_Int32 nY , sal_Int32 nWidth , sal_Int32 nHeight , - sal_Int16 nFlags ) throw( RuntimeException, std::exception ) + sal_Int16 nFlags ) { // - change size and position of window and save the values @@ -443,7 +443,7 @@ void SAL_CALL BaseControl::setPosSize( sal_Int32 nX , // XWindow -void SAL_CALL BaseControl::setVisible( sal_Bool bVisible ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::setVisible( sal_Bool bVisible ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -460,7 +460,7 @@ void SAL_CALL BaseControl::setVisible( sal_Bool bVisible ) throw( RuntimeExcepti // XWindow -void SAL_CALL BaseControl::setEnable( sal_Bool bEnable ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::setEnable( sal_Bool bEnable ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -477,7 +477,7 @@ void SAL_CALL BaseControl::setEnable( sal_Bool bEnable ) throw( RuntimeException // XWindow -void SAL_CALL BaseControl::setFocus() throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::setFocus() { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -490,7 +490,7 @@ void SAL_CALL BaseControl::setFocus() throw( RuntimeException, std::exception ) // XWindow -Rectangle SAL_CALL BaseControl::getPosSize() throw( RuntimeException, std::exception ) +Rectangle SAL_CALL BaseControl::getPosSize() { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -499,84 +499,84 @@ Rectangle SAL_CALL BaseControl::getPosSize() throw( RuntimeException, std::excep // XWindow -void SAL_CALL BaseControl::addWindowListener( const Reference< XWindowListener >& xListener ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::addWindowListener( const Reference< XWindowListener >& xListener ) { impl_getMultiplexer()->advise( cppu::UnoType<XWindowListener>::get(), xListener ); } // XWindow -void SAL_CALL BaseControl::addFocusListener( const Reference< XFocusListener >& xListener ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::addFocusListener( const Reference< XFocusListener >& xListener ) { impl_getMultiplexer()->advise( cppu::UnoType<XFocusListener>::get(), xListener ); } // XWindow -void SAL_CALL BaseControl::addKeyListener( const Reference< XKeyListener >& xListener ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::addKeyListener( const Reference< XKeyListener >& xListener ) { impl_getMultiplexer()->advise( cppu::UnoType<XKeyListener>::get(), xListener ); } // XWindow -void SAL_CALL BaseControl::addMouseListener( const Reference< XMouseListener >& xListener ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::addMouseListener( const Reference< XMouseListener >& xListener ) { impl_getMultiplexer()->advise( cppu::UnoType<XMouseListener>::get(), xListener ); } // XWindow -void SAL_CALL BaseControl::addMouseMotionListener( const Reference< XMouseMotionListener >& xListener ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::addMouseMotionListener( const Reference< XMouseMotionListener >& xListener ) { impl_getMultiplexer()->advise( cppu::UnoType<XMouseMotionListener>::get(), xListener ); } // XWindow -void SAL_CALL BaseControl::addPaintListener( const Reference< XPaintListener >& xListener ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::addPaintListener( const Reference< XPaintListener >& xListener ) { impl_getMultiplexer()->advise( cppu::UnoType<XPaintListener>::get(), xListener ); } // XWindow -void SAL_CALL BaseControl::removeWindowListener( const Reference< XWindowListener >& xListener ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::removeWindowListener( const Reference< XWindowListener >& xListener ) { impl_getMultiplexer()->unadvise( cppu::UnoType<XWindowListener>::get(), xListener ); } // XWindow -void SAL_CALL BaseControl::removeFocusListener( const Reference< XFocusListener >& xListener ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::removeFocusListener( const Reference< XFocusListener >& xListener ) { impl_getMultiplexer()->unadvise( cppu::UnoType<XFocusListener>::get(), xListener ); } // XWindow -void SAL_CALL BaseControl::removeKeyListener( const Reference< XKeyListener >& xListener ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::removeKeyListener( const Reference< XKeyListener >& xListener ) { impl_getMultiplexer()->unadvise( cppu::UnoType<XKeyListener>::get(), xListener ); } // XWindow -void SAL_CALL BaseControl::removeMouseListener( const Reference< XMouseListener >& xListener ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::removeMouseListener( const Reference< XMouseListener >& xListener ) { impl_getMultiplexer()->unadvise( cppu::UnoType<XMouseListener>::get(), xListener ); } // XWindow -void SAL_CALL BaseControl::removeMouseMotionListener( const Reference< XMouseMotionListener >& xListener ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::removeMouseMotionListener( const Reference< XMouseMotionListener >& xListener ) { impl_getMultiplexer()->unadvise( cppu::UnoType<XMouseMotionListener>::get(), xListener ); } // XWindow -void SAL_CALL BaseControl::removePaintListener( const Reference< XPaintListener >& xListener ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::removePaintListener( const Reference< XPaintListener >& xListener ) { impl_getMultiplexer()->unadvise( cppu::UnoType<XPaintListener>::get(), xListener ); } @@ -584,7 +584,7 @@ void SAL_CALL BaseControl::removePaintListener( const Reference< XPaintListener // XView void SAL_CALL BaseControl::draw( sal_Int32 nX , - sal_Int32 nY ) throw( RuntimeException, std::exception ) + sal_Int32 nY ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -597,7 +597,7 @@ void SAL_CALL BaseControl::draw( sal_Int32 nX , // XView -sal_Bool SAL_CALL BaseControl::setGraphics( const Reference< XGraphics >& xDevice ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL BaseControl::setGraphics( const Reference< XGraphics >& xDevice ) { // - set the graphics for an view // - in this class exist 2 graphics-member ... one for peer[_xGraphicsPeer] and one for view[_xGraphicsView] @@ -618,14 +618,14 @@ sal_Bool SAL_CALL BaseControl::setGraphics( const Reference< XGraphics >& xDevic // XView void SAL_CALL BaseControl::setZoom( float /*fZoomX*/ , - float /*fZoomY*/ ) throw( RuntimeException, std::exception ) + float /*fZoomY*/ ) { // Not implemented yet } // XView -Reference< XGraphics > SAL_CALL BaseControl::getGraphics() throw( RuntimeException, std::exception ) +Reference< XGraphics > SAL_CALL BaseControl::getGraphics() { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -634,7 +634,7 @@ Reference< XGraphics > SAL_CALL BaseControl::getGraphics() throw( RuntimeExcepti // XView -Size SAL_CALL BaseControl::getSize() throw( RuntimeException, std::exception ) +Size SAL_CALL BaseControl::getSize() { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -643,7 +643,7 @@ Size SAL_CALL BaseControl::getSize() throw( RuntimeException, std::exception ) // XEventListener -void SAL_CALL BaseControl::disposing( const EventObject& /*aSource*/ ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::disposing( const EventObject& /*aSource*/ ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -665,7 +665,7 @@ void SAL_CALL BaseControl::disposing( const EventObject& /*aSource*/ ) throw( Ru // XPaintListener -void SAL_CALL BaseControl::windowPaint( const PaintEvent& /*aEvent*/ ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::windowPaint( const PaintEvent& /*aEvent*/ ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -678,7 +678,7 @@ void SAL_CALL BaseControl::windowPaint( const PaintEvent& /*aEvent*/ ) throw( Ru // XWindowListener -void SAL_CALL BaseControl::windowResized( const WindowEvent& aEvent ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::windowResized( const WindowEvent& aEvent ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -693,7 +693,7 @@ void SAL_CALL BaseControl::windowResized( const WindowEvent& aEvent ) throw( Run // XWindowListener -void SAL_CALL BaseControl::windowMoved( const WindowEvent& aEvent ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::windowMoved( const WindowEvent& aEvent ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -708,13 +708,13 @@ void SAL_CALL BaseControl::windowMoved( const WindowEvent& aEvent ) throw( Runti // XWindowListener -void SAL_CALL BaseControl::windowShown( const EventObject& /*aEvent*/ ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::windowShown( const EventObject& /*aEvent*/ ) { } // XWindowListener -void SAL_CALL BaseControl::windowHidden( const EventObject& /*aEvent*/ ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::windowHidden( const EventObject& /*aEvent*/ ) { } diff --git a/UnoControls/source/base/multiplexer.cxx b/UnoControls/source/base/multiplexer.cxx index fbf13bff4957..d19e930ea2b0 100644 --- a/UnoControls/source/base/multiplexer.cxx +++ b/UnoControls/source/base/multiplexer.cxx @@ -91,7 +91,7 @@ OMRCListenerMultiplexerHelper::~OMRCListenerMultiplexerHelper() // XInterface -Any SAL_CALL OMRCListenerMultiplexerHelper::queryInterface( const Type& rType ) throw( RuntimeException, std::exception ) +Any SAL_CALL OMRCListenerMultiplexerHelper::queryInterface( const Type& rType ) { // Attention: // Don't use mutex or guard in this method!!! Is a method of XInterface. @@ -219,7 +219,7 @@ void OMRCListenerMultiplexerHelper::unadvise( const Type& // XEventListener -void SAL_CALL OMRCListenerMultiplexerHelper::disposing( const EventObject& /*aSource*/ ) throw( RuntimeException, std::exception ) +void SAL_CALL OMRCListenerMultiplexerHelper::disposing( const EventObject& /*aSource*/ ) { MutexGuard aGuard( m_aMutex ); // peer is disposed, clear the reference @@ -228,154 +228,154 @@ void SAL_CALL OMRCListenerMultiplexerHelper::disposing( const EventObject& /*aSo // XFcousListener -void OMRCListenerMultiplexerHelper::focusGained(const FocusEvent& aEvent ) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::focusGained(const FocusEvent& aEvent ) { MULTIPLEX( XFocusListener, focusGained, FocusEvent, aEvent ) } // XFcousListener -void OMRCListenerMultiplexerHelper::focusLost(const FocusEvent& aEvent ) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::focusLost(const FocusEvent& aEvent ) { MULTIPLEX( XFocusListener, focusLost, FocusEvent, aEvent ) } // XWindowListener -void OMRCListenerMultiplexerHelper::windowResized(const WindowEvent& aEvent ) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::windowResized(const WindowEvent& aEvent ) { MULTIPLEX( XWindowListener, windowResized, WindowEvent, aEvent ) } // XWindowListener -void OMRCListenerMultiplexerHelper::windowMoved(const WindowEvent& aEvent ) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::windowMoved(const WindowEvent& aEvent ) { MULTIPLEX( XWindowListener, windowMoved, WindowEvent, aEvent ) } // XWindowListener -void OMRCListenerMultiplexerHelper::windowShown(const EventObject& aEvent ) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::windowShown(const EventObject& aEvent ) { MULTIPLEX( XWindowListener, windowShown, EventObject, aEvent ) } // XWindowListener -void OMRCListenerMultiplexerHelper::windowHidden(const EventObject& aEvent ) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::windowHidden(const EventObject& aEvent ) { MULTIPLEX( XWindowListener, windowHidden, EventObject, aEvent ) } // XKeyListener -void OMRCListenerMultiplexerHelper::keyPressed(const KeyEvent& aEvent) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::keyPressed(const KeyEvent& aEvent) { MULTIPLEX( XKeyListener, keyPressed, KeyEvent, aEvent ) } // XKeyListener -void OMRCListenerMultiplexerHelper::keyReleased(const KeyEvent& aEvent) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::keyReleased(const KeyEvent& aEvent) { MULTIPLEX( XKeyListener, keyReleased, KeyEvent, aEvent ) } // XMouseListener -void OMRCListenerMultiplexerHelper::mousePressed(const MouseEvent& aEvent) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::mousePressed(const MouseEvent& aEvent) { MULTIPLEX( XMouseListener, mousePressed, MouseEvent, aEvent ) } // XMouseListener -void OMRCListenerMultiplexerHelper::mouseReleased(const MouseEvent& aEvent) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::mouseReleased(const MouseEvent& aEvent) { MULTIPLEX( XMouseListener, mouseReleased, MouseEvent, aEvent ) } // XMouseListener -void OMRCListenerMultiplexerHelper::mouseEntered(const MouseEvent& aEvent) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::mouseEntered(const MouseEvent& aEvent) { MULTIPLEX( XMouseListener, mouseEntered, MouseEvent, aEvent ) } // XMouseListener -void OMRCListenerMultiplexerHelper::mouseExited(const MouseEvent& aEvent) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::mouseExited(const MouseEvent& aEvent) { MULTIPLEX( XMouseListener, mouseExited, MouseEvent, aEvent ) } // XMouseMotionListener -void OMRCListenerMultiplexerHelper::mouseDragged(const MouseEvent& aEvent) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::mouseDragged(const MouseEvent& aEvent) { MULTIPLEX( XMouseMotionListener, mouseDragged, MouseEvent, aEvent ) } // XMouseMotionListener -void OMRCListenerMultiplexerHelper::mouseMoved(const MouseEvent& aEvent) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::mouseMoved(const MouseEvent& aEvent) { MULTIPLEX( XMouseMotionListener, mouseMoved, MouseEvent, aEvent ) } // XPaintListener -void OMRCListenerMultiplexerHelper::windowPaint(const PaintEvent& aEvent) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::windowPaint(const PaintEvent& aEvent) { MULTIPLEX( XPaintListener, windowPaint, PaintEvent, aEvent ) } // XTopWindowListener -void OMRCListenerMultiplexerHelper::windowOpened(const EventObject& aEvent) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::windowOpened(const EventObject& aEvent) { MULTIPLEX( XTopWindowListener, windowOpened, EventObject, aEvent ) } // XTopWindowListener -void OMRCListenerMultiplexerHelper::windowClosing( const EventObject& aEvent ) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::windowClosing( const EventObject& aEvent ) { MULTIPLEX( XTopWindowListener, windowClosing, EventObject, aEvent ) } // XTopWindowListener -void OMRCListenerMultiplexerHelper::windowClosed( const EventObject& aEvent ) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::windowClosed( const EventObject& aEvent ) { MULTIPLEX( XTopWindowListener, windowClosed, EventObject, aEvent ) } // XTopWindowListener -void OMRCListenerMultiplexerHelper::windowMinimized( const EventObject& aEvent ) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::windowMinimized( const EventObject& aEvent ) { MULTIPLEX( XTopWindowListener, windowMinimized, EventObject, aEvent ) } // XTopWindowListener -void OMRCListenerMultiplexerHelper::windowNormalized( const EventObject& aEvent ) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::windowNormalized( const EventObject& aEvent ) { MULTIPLEX( XTopWindowListener, windowNormalized, EventObject, aEvent ) } // XTopWindowListener -void OMRCListenerMultiplexerHelper::windowActivated( const EventObject& aEvent ) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::windowActivated( const EventObject& aEvent ) { MULTIPLEX( XTopWindowListener, windowActivated, EventObject, aEvent ) } // XTopWindowListener -void OMRCListenerMultiplexerHelper::windowDeactivated( const EventObject& aEvent ) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::windowDeactivated( const EventObject& aEvent ) { MULTIPLEX( XTopWindowListener, windowDeactivated, EventObject, aEvent ) } diff --git a/UnoControls/source/base/registercontrols.cxx b/UnoControls/source/base/registercontrols.cxx index 09de6a5716f9..4b83ed611d12 100644 --- a/UnoControls/source/base/registercontrols.cxx +++ b/UnoControls/source/base/registercontrols.cxx @@ -35,7 +35,6 @@ namespace { css::uno::Reference<css::uno::XInterface> SAL_CALL FrameControl_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rServiceManager) - throw (css::uno::Exception) { return static_cast<cppu::OWeakObject *>( new unocontrols::FrameControl( @@ -46,7 +45,6 @@ css::uno::Reference<css::uno::XInterface> SAL_CALL FrameControl_createInstance( css::uno::Reference<css::uno::XInterface> SAL_CALL ProgressBar_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rServiceManager) - throw (css::uno::Exception) { return static_cast<cppu::OWeakObject *>( new unocontrols::ProgressBar( @@ -58,7 +56,6 @@ css::uno::Reference<css::uno::XInterface> SAL_CALL ProgressMonitor_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rServiceManager) - throw (css::uno::Exception) { return static_cast<cppu::OWeakObject *>( new unocontrols::ProgressMonitor( @@ -70,7 +67,6 @@ css::uno::Reference<css::uno::XInterface> SAL_CALL StatusIndicator_createInstance( css::uno::Reference<css::lang::XMultiServiceFactory> const & rServiceManager) - throw (css::uno::Exception) { return static_cast<cppu::OWeakObject *>( new unocontrols::StatusIndicator( diff --git a/UnoControls/source/controls/OConnectionPointContainerHelper.cxx b/UnoControls/source/controls/OConnectionPointContainerHelper.cxx index ee1827691d6b..f631759ae87c 100644 --- a/UnoControls/source/controls/OConnectionPointContainerHelper.cxx +++ b/UnoControls/source/controls/OConnectionPointContainerHelper.cxx @@ -46,7 +46,7 @@ OConnectionPointContainerHelper::~OConnectionPointContainerHelper() // XInterface -Any SAL_CALL OConnectionPointContainerHelper::queryInterface( const Type& aType ) throw( RuntimeException, std::exception ) +Any SAL_CALL OConnectionPointContainerHelper::queryInterface( const Type& aType ) { // Attention: // Don't use mutex or guard in this method!!! Is a method of XInterface. @@ -91,7 +91,7 @@ void SAL_CALL OConnectionPointContainerHelper::release() throw() // XConnectionPointContainer -Sequence< Type > SAL_CALL OConnectionPointContainerHelper::getConnectionPointTypes() throw( RuntimeException, std::exception ) +Sequence< Type > SAL_CALL OConnectionPointContainerHelper::getConnectionPointTypes() { // Container is threadsafe himself ! return m_aMultiTypeContainer.getContainedTypes(); @@ -99,7 +99,7 @@ Sequence< Type > SAL_CALL OConnectionPointContainerHelper::getConnectionPointTyp // XConnectionPointContainer -Reference< XConnectionPoint > SAL_CALL OConnectionPointContainerHelper::queryConnectionPoint( const Type& aType ) throw( RuntimeException, std::exception ) +Reference< XConnectionPoint > SAL_CALL OConnectionPointContainerHelper::queryConnectionPoint( const Type& aType ) { // Set default return value, if method failed. Reference< XConnectionPoint > xConnectionPoint; @@ -121,7 +121,7 @@ Reference< XConnectionPoint > SAL_CALL OConnectionPointContainerHelper::queryCon // XConnectionPointContainer void SAL_CALL OConnectionPointContainerHelper::advise( const Type& aType , - const Reference< XInterface >& xListener ) throw( RuntimeException, std::exception ) + const Reference< XInterface >& xListener ) { // Container is threadsafe himself ! m_aMultiTypeContainer.addInterface( aType, xListener ); @@ -130,7 +130,7 @@ void SAL_CALL OConnectionPointContainerHelper::advise( const Type& // XConnectionPointContainer void SAL_CALL OConnectionPointContainerHelper::unadvise( const Type& aType , - const Reference< XInterface >& xListener ) throw( RuntimeException, std::exception ) + const Reference< XInterface >& xListener ) { // Container is threadsafe himself ! m_aMultiTypeContainer.removeInterface( aType, xListener ); diff --git a/UnoControls/source/controls/OConnectionPointHelper.cxx b/UnoControls/source/controls/OConnectionPointHelper.cxx index 28692a405b38..6d51bb236408 100644 --- a/UnoControls/source/controls/OConnectionPointHelper.cxx +++ b/UnoControls/source/controls/OConnectionPointHelper.cxx @@ -51,7 +51,7 @@ OConnectionPointHelper::~OConnectionPointHelper() // XInterface -Any SAL_CALL OConnectionPointHelper::queryInterface( const Type& aType ) throw( RuntimeException, std::exception ) +Any SAL_CALL OConnectionPointHelper::queryInterface( const Type& aType ) { // Attention: // Don't use mutex or guard in this method!!! Is a method of XInterface. @@ -96,7 +96,7 @@ void SAL_CALL OConnectionPointHelper::release() throw() // XConnectionPoint -Type SAL_CALL OConnectionPointHelper::getConnectionType() throw( RuntimeException, std::exception ) +Type SAL_CALL OConnectionPointHelper::getConnectionType() { // Ready for multithreading MutexGuard aGuard( m_aSharedMutex ); @@ -118,7 +118,7 @@ Type SAL_CALL OConnectionPointHelper::getConnectionType() throw( RuntimeExceptio // XConnectionPoint -Reference< XConnectionPointContainer > SAL_CALL OConnectionPointHelper::getConnectionPointContainer() throw( RuntimeException, std::exception ) +Reference< XConnectionPointContainer > SAL_CALL OConnectionPointHelper::getConnectionPointContainer() { // Ready for multithreading MutexGuard aGuard( m_aSharedMutex ); @@ -128,9 +128,7 @@ Reference< XConnectionPointContainer > SAL_CALL OConnectionPointHelper::getConne // XConnectionPoint -void SAL_CALL OConnectionPointHelper::advise( const Reference< XInterface >& xListener ) throw( ListenerExistException , - InvalidListenerException , - RuntimeException, std::exception ) +void SAL_CALL OConnectionPointHelper::advise( const Reference< XInterface >& xListener ) { // Ready for multithreading MutexGuard aGuard( m_aSharedMutex ); @@ -161,7 +159,7 @@ void SAL_CALL OConnectionPointHelper::advise( const Reference< XInterface >& xLi // XConnectionPoint -void SAL_CALL OConnectionPointHelper::unadvise( const Reference< XInterface >& xListener ) throw( RuntimeException, std::exception ) +void SAL_CALL OConnectionPointHelper::unadvise( const Reference< XInterface >& xListener ) { // Ready for multithreading MutexGuard aGuard( m_aSharedMutex ); @@ -180,7 +178,7 @@ void SAL_CALL OConnectionPointHelper::unadvise( const Reference< XInterface >& x // XConnectionPoint -Sequence< Reference< XInterface > > SAL_CALL OConnectionPointHelper::getConnections() throw( RuntimeException, std::exception ) +Sequence< Reference< XInterface > > SAL_CALL OConnectionPointHelper::getConnections() { // Ready for multithreading MutexGuard aGuard( m_aSharedMutex ); diff --git a/UnoControls/source/controls/framecontrol.cxx b/UnoControls/source/controls/framecontrol.cxx index 091a86dec91d..ed9b15e2870a 100644 --- a/UnoControls/source/controls/framecontrol.cxx +++ b/UnoControls/source/controls/framecontrol.cxx @@ -60,7 +60,7 @@ FrameControl::~FrameControl() // XInterface -Any SAL_CALL FrameControl::queryInterface( const Type& rType ) throw( RuntimeException, std::exception ) +Any SAL_CALL FrameControl::queryInterface( const Type& rType ) { // Attention: // Don't use mutex or guard in this method!!! Is a method of XInterface. @@ -105,7 +105,7 @@ void SAL_CALL FrameControl::release() throw() // XTypeProvider -Sequence< Type > SAL_CALL FrameControl::getTypes() throw( RuntimeException, std::exception ) +Sequence< Type > SAL_CALL FrameControl::getTypes() { // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! @@ -136,7 +136,7 @@ Sequence< Type > SAL_CALL FrameControl::getTypes() throw( RuntimeException, std: // XAggregation -Any SAL_CALL FrameControl::queryAggregation( const Type& aType ) throw( RuntimeException, std::exception ) +Any SAL_CALL FrameControl::queryAggregation( const Type& aType ) { // Ask for my own supported interfaces ... // Attention: XTypeProvider and XInterface are supported by OComponentHelper! @@ -161,13 +161,11 @@ Any SAL_CALL FrameControl::queryAggregation( const Type& aType ) throw( RuntimeE } OUString FrameControl::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return impl_getStaticImplementationName(); } css::uno::Sequence<OUString> FrameControl::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { return impl_getStaticSupportedServiceNames(); } @@ -175,7 +173,7 @@ css::uno::Sequence<OUString> FrameControl::getSupportedServiceNames() // XControl void SAL_CALL FrameControl::createPeer( const Reference< XToolkit >& xToolkit , - const Reference< XWindowPeer >& xParentPeer ) throw( RuntimeException, std::exception ) + const Reference< XWindowPeer >& xParentPeer ) { BaseControl::createPeer( xToolkit, xParentPeer ); if ( impl_getPeerWindow().is() ) @@ -189,7 +187,7 @@ void SAL_CALL FrameControl::createPeer( const Reference< XToolkit >& xToo // XControl -sal_Bool SAL_CALL FrameControl::setModel( const Reference< XControlModel >& /*xModel*/ ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL FrameControl::setModel( const Reference< XControlModel >& /*xModel*/ ) { // We have no model. return false; @@ -197,7 +195,7 @@ sal_Bool SAL_CALL FrameControl::setModel( const Reference< XControlModel >& /*xM // XControl -Reference< XControlModel > SAL_CALL FrameControl::getModel() throw( RuntimeException, std::exception ) +Reference< XControlModel > SAL_CALL FrameControl::getModel() { // We have no model. return Reference< XControlModel >(); @@ -205,7 +203,7 @@ Reference< XControlModel > SAL_CALL FrameControl::getModel() throw( RuntimeExcep // XControl -void SAL_CALL FrameControl::dispose() throw( RuntimeException, std::exception ) +void SAL_CALL FrameControl::dispose() { impl_deleteFrame(); BaseControl::dispose(); @@ -213,7 +211,7 @@ void SAL_CALL FrameControl::dispose() throw( RuntimeException, std::exception ) // XView -sal_Bool SAL_CALL FrameControl::setGraphics( const Reference< XGraphics >& /*xDevice*/ ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL FrameControl::setGraphics( const Reference< XGraphics >& /*xDevice*/ ) { // it is not possible to print this control return false; @@ -221,7 +219,7 @@ sal_Bool SAL_CALL FrameControl::setGraphics( const Reference< XGraphics >& /*xDe // XView -Reference< XGraphics > SAL_CALL FrameControl::getGraphics() throw( RuntimeException, std::exception ) +Reference< XGraphics > SAL_CALL FrameControl::getGraphics() { // when it's not possible to set graphics ! then it's possible to return null return Reference< XGraphics >(); @@ -229,7 +227,7 @@ Reference< XGraphics > SAL_CALL FrameControl::getGraphics() throw( RuntimeExcept // XConnectionPointContainer -Sequence< Type > SAL_CALL FrameControl::getConnectionPointTypes() throw( RuntimeException, std::exception ) +Sequence< Type > SAL_CALL FrameControl::getConnectionPointTypes() { // Forwarded to helper class return m_aConnectionPointContainer->getConnectionPointTypes(); @@ -237,7 +235,7 @@ Sequence< Type > SAL_CALL FrameControl::getConnectionPointTypes() throw( Runtime // XConnectionPointContainer -Reference< XConnectionPoint > SAL_CALL FrameControl::queryConnectionPoint( const Type& aType ) throw( RuntimeException, std::exception ) +Reference< XConnectionPoint > SAL_CALL FrameControl::queryConnectionPoint( const Type& aType ) { // Forwarded to helper class return m_aConnectionPointContainer->queryConnectionPoint( aType ); @@ -246,7 +244,7 @@ Reference< XConnectionPoint > SAL_CALL FrameControl::queryConnectionPoint( const // XConnectionPointContainer void SAL_CALL FrameControl::advise( const Type& aType , - const Reference< XInterface >& xListener ) throw( RuntimeException, std::exception ) + const Reference< XInterface >& xListener ) { // Forwarded to helper class m_aConnectionPointContainer->advise( aType, xListener ); @@ -255,7 +253,7 @@ void SAL_CALL FrameControl::advise( const Type& aType // XConnectionPointContainer void SAL_CALL FrameControl::unadvise( const Type& aType , - const Reference< XInterface >& xListener ) throw( RuntimeException, std::exception ) + const Reference< XInterface >& xListener ) { // Forwarded to helper class m_aConnectionPointContainer->unadvise( aType, xListener ); @@ -281,7 +279,7 @@ const OUString FrameControl::impl_getStaticImplementationName() sal_Bool FrameControl::convertFastPropertyValue( Any& rConvertedValue , Any& rOldValue , sal_Int32 nHandle , - const Any& rValue ) throw( IllegalArgumentException ) + const Any& rValue ) { bool bReturn = false; switch (nHandle) @@ -309,7 +307,6 @@ sal_Bool FrameControl::convertFastPropertyValue( Any& rConvertedVa void FrameControl::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , const Any& rValue ) - throw ( css::uno::Exception, std::exception ) { // this method only set the value MutexGuard aGuard (m_aMutex); @@ -374,7 +371,7 @@ IPropertyArrayHelper& FrameControl::getInfoHelper() // OPropertySetHelper -Reference< XPropertySetInfo > SAL_CALL FrameControl::getPropertySetInfo() throw( RuntimeException, std::exception ) +Reference< XPropertySetInfo > SAL_CALL FrameControl::getPropertySetInfo() { // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! diff --git a/UnoControls/source/controls/progressbar.cxx b/UnoControls/source/controls/progressbar.cxx index 7fa718d6a064..99ae92d97d98 100644 --- a/UnoControls/source/controls/progressbar.cxx +++ b/UnoControls/source/controls/progressbar.cxx @@ -59,7 +59,7 @@ ProgressBar::~ProgressBar() // XInterface -Any SAL_CALL ProgressBar::queryInterface( const Type& rType ) throw( RuntimeException, std::exception ) +Any SAL_CALL ProgressBar::queryInterface( const Type& rType ) { // Attention: // Don't use mutex or guard in this method!!! Is a method of XInterface. @@ -104,7 +104,7 @@ void SAL_CALL ProgressBar::release() throw() // XTypeProvider -Sequence< Type > SAL_CALL ProgressBar::getTypes() throw( RuntimeException, std::exception ) +Sequence< Type > SAL_CALL ProgressBar::getTypes() { // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! @@ -134,7 +134,7 @@ Sequence< Type > SAL_CALL ProgressBar::getTypes() throw( RuntimeException, std:: // XAggregation -Any SAL_CALL ProgressBar::queryAggregation( const Type& aType ) throw( RuntimeException, std::exception ) +Any SAL_CALL ProgressBar::queryAggregation( const Type& aType ) { // Ask for my own supported interfaces ... // Attention: XTypeProvider and XInterface are supported by OComponentHelper! @@ -156,7 +156,7 @@ Any SAL_CALL ProgressBar::queryAggregation( const Type& aType ) throw( RuntimeEx // XProgressBar -void SAL_CALL ProgressBar::setForegroundColor( sal_Int32 nColor ) throw( RuntimeException, std::exception ) +void SAL_CALL ProgressBar::setForegroundColor( sal_Int32 nColor ) { // Ready for multithreading MutexGuard aGuard (m_aMutex); @@ -170,7 +170,7 @@ void SAL_CALL ProgressBar::setForegroundColor( sal_Int32 nColor ) throw( Runtime // XProgressBar -void SAL_CALL ProgressBar::setBackgroundColor ( sal_Int32 nColor ) throw( RuntimeException, std::exception ) +void SAL_CALL ProgressBar::setBackgroundColor ( sal_Int32 nColor ) { // Ready for multithreading MutexGuard aGuard (m_aMutex); @@ -184,7 +184,7 @@ void SAL_CALL ProgressBar::setBackgroundColor ( sal_Int32 nColor ) throw( Runtim // XProgressBar -void SAL_CALL ProgressBar::setValue ( sal_Int32 nValue ) throw( RuntimeException, std::exception ) +void SAL_CALL ProgressBar::setValue ( sal_Int32 nValue ) { // This method is defined for follow things: // 1) Values >= _nMinRange @@ -213,7 +213,7 @@ void SAL_CALL ProgressBar::setValue ( sal_Int32 nValue ) throw( RuntimeException // XProgressBar -void SAL_CALL ProgressBar::setRange ( sal_Int32 nMin, sal_Int32 nMax ) throw( RuntimeException, std::exception ) +void SAL_CALL ProgressBar::setRange ( sal_Int32 nMin, sal_Int32 nMax ) { // This method is defined for follow things: // 1) All values of sal_Int32 @@ -255,7 +255,7 @@ void SAL_CALL ProgressBar::setRange ( sal_Int32 nMin, sal_Int32 nMax ) throw( Ru // XProgressBar -sal_Int32 SAL_CALL ProgressBar::getValue () throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL ProgressBar::getValue () { // Ready for multithreading MutexGuard aGuard (m_aMutex); @@ -271,7 +271,7 @@ void SAL_CALL ProgressBar::setPosSize ( sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nFlags -) throw( RuntimeException, std::exception ) +) { // Take old size BEFORE you set the new values at baseclass! // You will control changes. At the other way, the values are the same! @@ -291,7 +291,7 @@ void SAL_CALL ProgressBar::setPosSize ( // XControl -sal_Bool SAL_CALL ProgressBar::setModel( const Reference< XControlModel >& /*xModel*/ ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL ProgressBar::setModel( const Reference< XControlModel >& /*xModel*/ ) { // A model is not possible for this control. return false; @@ -299,7 +299,7 @@ sal_Bool SAL_CALL ProgressBar::setModel( const Reference< XControlModel >& /*xMo // XControl -Reference< XControlModel > SAL_CALL ProgressBar::getModel() throw( RuntimeException, std::exception ) +Reference< XControlModel > SAL_CALL ProgressBar::getModel() { // A model is not possible for this control. return Reference< XControlModel >(); diff --git a/UnoControls/source/controls/progressmonitor.cxx b/UnoControls/source/controls/progressmonitor.cxx index 79bc853265d9..06a7d404d90b 100644 --- a/UnoControls/source/controls/progressmonitor.cxx +++ b/UnoControls/source/controls/progressmonitor.cxx @@ -103,7 +103,7 @@ ProgressMonitor::~ProgressMonitor() } // XInterface -Any SAL_CALL ProgressMonitor::queryInterface( const Type& rType ) throw( RuntimeException, std::exception ) +Any SAL_CALL ProgressMonitor::queryInterface( const Type& rType ) { // Attention: // Don't use mutex or guard in this method!!! Is a method of XInterface. @@ -145,7 +145,7 @@ void SAL_CALL ProgressMonitor::release() throw() } // XTypeProvider -Sequence< Type > SAL_CALL ProgressMonitor::getTypes() throw( RuntimeException, std::exception ) +Sequence< Type > SAL_CALL ProgressMonitor::getTypes() { // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! @@ -175,7 +175,7 @@ Sequence< Type > SAL_CALL ProgressMonitor::getTypes() throw( RuntimeException, s } // XAggregation -Any SAL_CALL ProgressMonitor::queryAggregation( const Type& aType ) throw( RuntimeException, std::exception ) +Any SAL_CALL ProgressMonitor::queryAggregation( const Type& aType ) { // Ask for my own supported interfaces ... // Attention: XTypeProvider and XInterface are supported by OComponentHelper! @@ -201,7 +201,7 @@ void SAL_CALL ProgressMonitor::addText( const OUString& rTopic, const OUString& rText, sal_Bool bbeforeProgress -) throw( RuntimeException, std::exception ) +) { // Safe impossible cases // Check valid call of this method. @@ -240,7 +240,7 @@ void SAL_CALL ProgressMonitor::addText( } // XProgressMonitor -void SAL_CALL ProgressMonitor::removeText ( const OUString& rTopic, sal_Bool bbeforeProgress ) throw( RuntimeException, std::exception ) +void SAL_CALL ProgressMonitor::removeText ( const OUString& rTopic, sal_Bool bbeforeProgress ) { // Safe impossible cases // Check valid call of this method. @@ -283,7 +283,7 @@ void SAL_CALL ProgressMonitor::updateText ( const OUString& rTopic, const OUString& rText, sal_Bool bbeforeProgress -) throw( RuntimeException, std::exception ) +) { // Safe impossible cases // Check valid call of this method. @@ -307,7 +307,7 @@ void SAL_CALL ProgressMonitor::updateText ( } // XProgressBar -void SAL_CALL ProgressMonitor::setForegroundColor ( sal_Int32 nColor ) throw( RuntimeException, std::exception ) +void SAL_CALL ProgressMonitor::setForegroundColor ( sal_Int32 nColor ) { // Ready for multithreading MutexGuard aGuard ( m_aMutex ); @@ -316,7 +316,7 @@ void SAL_CALL ProgressMonitor::setForegroundColor ( sal_Int32 nColor ) throw( Ru } // XProgressBar -void SAL_CALL ProgressMonitor::setBackgroundColor ( sal_Int32 nColor ) throw( RuntimeException, std::exception ) +void SAL_CALL ProgressMonitor::setBackgroundColor ( sal_Int32 nColor ) { // Ready for multithreading MutexGuard aGuard ( m_aMutex ); @@ -325,7 +325,7 @@ void SAL_CALL ProgressMonitor::setBackgroundColor ( sal_Int32 nColor ) throw( Ru } // XProgressBar -void SAL_CALL ProgressMonitor::setValue ( sal_Int32 nValue ) throw( RuntimeException, std::exception ) +void SAL_CALL ProgressMonitor::setValue ( sal_Int32 nValue ) { // Ready for multithreading MutexGuard aGuard ( m_aMutex ); @@ -334,7 +334,7 @@ void SAL_CALL ProgressMonitor::setValue ( sal_Int32 nValue ) throw( RuntimeExcep } // XProgressBar -void SAL_CALL ProgressMonitor::setRange ( sal_Int32 nMin, sal_Int32 nMax ) throw( RuntimeException, std::exception ) +void SAL_CALL ProgressMonitor::setRange ( sal_Int32 nMin, sal_Int32 nMax ) { // Ready for multithreading MutexGuard aGuard ( m_aMutex ); @@ -343,7 +343,7 @@ void SAL_CALL ProgressMonitor::setRange ( sal_Int32 nMin, sal_Int32 nMax ) throw } // XProgressBar -sal_Int32 SAL_CALL ProgressMonitor::getValue () throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL ProgressMonitor::getValue () { // Ready for multithreading MutexGuard aGuard ( m_aMutex ); @@ -352,7 +352,7 @@ sal_Int32 SAL_CALL ProgressMonitor::getValue () throw( RuntimeException, std::ex } // XButton -void SAL_CALL ProgressMonitor::addActionListener ( const css::uno::Reference< XActionListener > & rListener ) throw( RuntimeException, std::exception ) +void SAL_CALL ProgressMonitor::addActionListener ( const css::uno::Reference< XActionListener > & rListener ) { // Ready for multithreading MutexGuard aGuard ( m_aMutex ); @@ -364,7 +364,7 @@ void SAL_CALL ProgressMonitor::addActionListener ( const css::uno::Reference< XA } // XButton -void SAL_CALL ProgressMonitor::removeActionListener ( const css::uno::Reference< XActionListener > & rListener ) throw( RuntimeException, std::exception ) +void SAL_CALL ProgressMonitor::removeActionListener ( const css::uno::Reference< XActionListener > & rListener ) { // Ready for multithreading MutexGuard aGuard ( m_aMutex ); @@ -376,7 +376,7 @@ void SAL_CALL ProgressMonitor::removeActionListener ( const css::uno::Reference< } // XButton -void SAL_CALL ProgressMonitor::setLabel ( const OUString& rLabel ) throw( RuntimeException, std::exception ) +void SAL_CALL ProgressMonitor::setLabel ( const OUString& rLabel ) { // Ready for multithreading MutexGuard aGuard ( m_aMutex ); @@ -388,7 +388,7 @@ void SAL_CALL ProgressMonitor::setLabel ( const OUString& rLabel ) throw( Runtim } // XButton -void SAL_CALL ProgressMonitor::setActionCommand ( const OUString& rCommand ) throw( RuntimeException, std::exception ) +void SAL_CALL ProgressMonitor::setActionCommand ( const OUString& rCommand ) { // Ready for multithreading MutexGuard aGuard ( m_aMutex ); @@ -400,13 +400,13 @@ void SAL_CALL ProgressMonitor::setActionCommand ( const OUString& rCommand ) thr } // XLayoutConstrains -Size SAL_CALL ProgressMonitor::getMinimumSize () throw( RuntimeException, std::exception ) +Size SAL_CALL ProgressMonitor::getMinimumSize () { return Size (PROGRESSMONITOR_DEFAULT_WIDTH, PROGRESSMONITOR_DEFAULT_HEIGHT); } // XLayoutConstrains -Size SAL_CALL ProgressMonitor::getPreferredSize () throw( RuntimeException, std::exception ) +Size SAL_CALL ProgressMonitor::getPreferredSize () { // Ready for multithreading ClearableMutexGuard aGuard ( m_aMutex ); @@ -450,13 +450,13 @@ Size SAL_CALL ProgressMonitor::getPreferredSize () throw( RuntimeException, std: } // XLayoutConstrains -Size SAL_CALL ProgressMonitor::calcAdjustedSize ( const Size& /*rNewSize*/ ) throw( RuntimeException, std::exception ) +Size SAL_CALL ProgressMonitor::calcAdjustedSize ( const Size& /*rNewSize*/ ) { return getPreferredSize (); } // XControl -void SAL_CALL ProgressMonitor::createPeer ( const css::uno::Reference< XToolkit > & rToolkit, const css::uno::Reference< XWindowPeer > & rParent ) throw( RuntimeException, std::exception ) +void SAL_CALL ProgressMonitor::createPeer ( const css::uno::Reference< XToolkit > & rToolkit, const css::uno::Reference< XWindowPeer > & rParent ) { if (!getPeer().is()) { @@ -471,14 +471,14 @@ void SAL_CALL ProgressMonitor::createPeer ( const css::uno::Reference< XToolkit } // XControl -sal_Bool SAL_CALL ProgressMonitor::setModel ( const css::uno::Reference< XControlModel > & /*rModel*/ ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL ProgressMonitor::setModel ( const css::uno::Reference< XControlModel > & /*rModel*/ ) { // We have no model. return false; } // XControl -css::uno::Reference< XControlModel > SAL_CALL ProgressMonitor::getModel () throw( RuntimeException, std::exception ) +css::uno::Reference< XControlModel > SAL_CALL ProgressMonitor::getModel () { // We have no model. // return (XControlModel*)this; @@ -486,7 +486,7 @@ css::uno::Reference< XControlModel > SAL_CALL ProgressMonitor::getModel () throw } // XComponent -void SAL_CALL ProgressMonitor::dispose () throw( RuntimeException, std::exception ) +void SAL_CALL ProgressMonitor::dispose () { // Ready for multithreading MutexGuard aGuard ( m_aMutex ); @@ -518,7 +518,7 @@ void SAL_CALL ProgressMonitor::dispose () throw( RuntimeException, std::exceptio } // XWindow -void SAL_CALL ProgressMonitor::setPosSize ( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nFlags ) throw( RuntimeException, std::exception ) +void SAL_CALL ProgressMonitor::setPosSize ( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nFlags ) { Rectangle aBasePosSize = getPosSize (); BaseContainerControl::setPosSize (nX, nY, nWidth, nHeight, nFlags); diff --git a/UnoControls/source/controls/statusindicator.cxx b/UnoControls/source/controls/statusindicator.cxx index a9c901dad70a..5b303f2a63f5 100644 --- a/UnoControls/source/controls/statusindicator.cxx +++ b/UnoControls/source/controls/statusindicator.cxx @@ -68,7 +68,7 @@ StatusIndicator::~StatusIndicator() {} // XInterface -Any SAL_CALL StatusIndicator::queryInterface( const Type& rType ) throw( RuntimeException, std::exception ) +Any SAL_CALL StatusIndicator::queryInterface( const Type& rType ) { // Attention: // Don't use mutex or guard in this method!!! Is a method of XInterface. @@ -113,7 +113,7 @@ void SAL_CALL StatusIndicator::release() throw() // XTypeProvider -Sequence< Type > SAL_CALL StatusIndicator::getTypes() throw( RuntimeException, std::exception ) +Sequence< Type > SAL_CALL StatusIndicator::getTypes() { // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! @@ -143,7 +143,7 @@ Sequence< Type > SAL_CALL StatusIndicator::getTypes() throw( RuntimeException, s // XAggregation -Any SAL_CALL StatusIndicator::queryAggregation( const Type& aType ) throw( RuntimeException, std::exception ) +Any SAL_CALL StatusIndicator::queryAggregation( const Type& aType ) { // Ask for my own supported interfaces ... // Attention: XTypeProvider and XInterface are supported by OComponentHelper! @@ -165,7 +165,7 @@ Any SAL_CALL StatusIndicator::queryAggregation( const Type& aType ) throw( Runti // XStatusIndicator -void SAL_CALL StatusIndicator::start( const OUString& sText, sal_Int32 nRange ) throw( RuntimeException, std::exception ) +void SAL_CALL StatusIndicator::start( const OUString& sText, sal_Int32 nRange ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -179,7 +179,7 @@ void SAL_CALL StatusIndicator::start( const OUString& sText, sal_Int32 nRange ) // XStatusIndicator -void SAL_CALL StatusIndicator::end() throw( RuntimeException, std::exception ) +void SAL_CALL StatusIndicator::end() { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -192,7 +192,7 @@ void SAL_CALL StatusIndicator::end() throw( RuntimeException, std::exception ) // XStatusIndicator -void SAL_CALL StatusIndicator::setText( const OUString& sText ) throw( RuntimeException, std::exception ) +void SAL_CALL StatusIndicator::setText( const OUString& sText ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -203,7 +203,7 @@ void SAL_CALL StatusIndicator::setText( const OUString& sText ) throw( RuntimeEx // XStatusIndicator -void SAL_CALL StatusIndicator::setValue( sal_Int32 nValue ) throw( RuntimeException, std::exception ) +void SAL_CALL StatusIndicator::setValue( sal_Int32 nValue ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -214,7 +214,7 @@ void SAL_CALL StatusIndicator::setValue( sal_Int32 nValue ) throw( RuntimeExcept // XStatusIndicator -void SAL_CALL StatusIndicator::reset() throw( RuntimeException, std::exception ) +void SAL_CALL StatusIndicator::reset() { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -227,14 +227,14 @@ void SAL_CALL StatusIndicator::reset() throw( RuntimeException, std::exception ) // XLayoutConstrains -Size SAL_CALL StatusIndicator::getMinimumSize () throw( RuntimeException, std::exception ) +Size SAL_CALL StatusIndicator::getMinimumSize () { return Size (STATUSINDICATOR_DEFAULT_WIDTH, STATUSINDICATOR_DEFAULT_HEIGHT); } // XLayoutConstrains -Size SAL_CALL StatusIndicator::getPreferredSize () throw( RuntimeException, std::exception ) +Size SAL_CALL StatusIndicator::getPreferredSize () { // Ready for multithreading ClearableMutexGuard aGuard ( m_aMutex ); @@ -265,7 +265,7 @@ Size SAL_CALL StatusIndicator::getPreferredSize () throw( RuntimeException, std: // XLayoutConstrains -Size SAL_CALL StatusIndicator::calcAdjustedSize ( const Size& /*rNewSize*/ ) throw( RuntimeException, std::exception ) +Size SAL_CALL StatusIndicator::calcAdjustedSize ( const Size& /*rNewSize*/ ) { return getPreferredSize (); } @@ -275,7 +275,7 @@ Size SAL_CALL StatusIndicator::calcAdjustedSize ( const Size& /*rNewSize*/ ) thr void SAL_CALL StatusIndicator::createPeer ( const css::uno::Reference< XToolkit > & rToolkit, const css::uno::Reference< XWindowPeer > & rParent -) throw( RuntimeException, std::exception ) +) { if( !getPeer().is() ) { @@ -291,7 +291,7 @@ void SAL_CALL StatusIndicator::createPeer ( // XControl -sal_Bool SAL_CALL StatusIndicator::setModel ( const css::uno::Reference< XControlModel > & /*rModel*/ ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL StatusIndicator::setModel ( const css::uno::Reference< XControlModel > & /*rModel*/ ) { // We have no model. return false; @@ -299,7 +299,7 @@ sal_Bool SAL_CALL StatusIndicator::setModel ( const css::uno::Reference< XContro // XControl -css::uno::Reference< XControlModel > SAL_CALL StatusIndicator::getModel () throw( RuntimeException, std::exception ) +css::uno::Reference< XControlModel > SAL_CALL StatusIndicator::getModel () { // We have no model. // return (XControlModel*)this; @@ -308,7 +308,7 @@ css::uno::Reference< XControlModel > SAL_CALL StatusIndicator::getModel () throw // XComponent -void SAL_CALL StatusIndicator::dispose () throw( RuntimeException, std::exception ) +void SAL_CALL StatusIndicator::dispose () { // Ready for multithreading MutexGuard aGuard ( m_aMutex ); @@ -334,7 +334,7 @@ void SAL_CALL StatusIndicator::setPosSize ( sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nFlags -) throw( RuntimeException, std::exception ) +) { Rectangle aBasePosSize = getPosSize (); BaseContainerControl::setPosSize (nX, nY, nWidth, nHeight, nFlags); diff --git a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx index 31a95f5e42a4..abc4191e7bde 100644 --- a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx +++ b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx @@ -56,8 +56,7 @@ public: @onerror A RuntimeException is thrown. */ - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; /**_______________________________________________________________________________________________________ @short increment refcount @@ -79,22 +78,21 @@ public: // XConnectionPointContainer - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getConnectionPointTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getConnectionPointTypes() override; virtual css::uno::Reference< css::lang::XConnectionPoint > SAL_CALL queryConnectionPoint( const css::uno::Type& aType - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL advise( const css::uno::Type& aType , const css::uno::Reference< css::uno::XInterface >& xListener - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL unadvise( const css::uno::Type& aType , const css::uno::Reference< css::uno::XInterface >& xListener - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; // public but impl method! // Is necessary to get container member at OConnectionPoint-instance. diff --git a/UnoControls/source/inc/OConnectionPointHelper.hxx b/UnoControls/source/inc/OConnectionPointHelper.hxx index 371b70facdfa..2e86fc29f302 100644 --- a/UnoControls/source/inc/OConnectionPointHelper.hxx +++ b/UnoControls/source/inc/OConnectionPointHelper.hxx @@ -61,8 +61,7 @@ public: @onerror A RuntimeException is thrown. */ - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; /**_______________________________________________________________________________________________________ @short increment refcount @@ -84,25 +83,17 @@ public: // XConnectionPoint - virtual css::uno::Type SAL_CALL getConnectionType() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Type SAL_CALL getConnectionType() override; - virtual css::uno::Reference< css::lang::XConnectionPointContainer > SAL_CALL getConnectionPointContainer() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::lang::XConnectionPointContainer > SAL_CALL getConnectionPointContainer() override; virtual void SAL_CALL advise( const css::uno::Reference< css::uno::XInterface >& xListener - ) throw ( - css::lang::ListenerExistException, - css::lang::InvalidListenerException , - css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL unadvise( const css::uno::Reference< css::uno::XInterface >& xListener ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL unadvise( const css::uno::Reference< css::uno::XInterface >& xListener ) override; - virtual css::uno::Sequence< css::uno::Reference< css::uno::XInterface > > SAL_CALL getConnections() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Reference< css::uno::XInterface > > SAL_CALL getConnections() override; private: diff --git a/UnoControls/source/inc/framecontrol.hxx b/UnoControls/source/inc/framecontrol.hxx index ff28dadcf858..f087a1a43107 100644 --- a/UnoControls/source/inc/framecontrol.hxx +++ b/UnoControls/source/inc/framecontrol.hxx @@ -71,7 +71,7 @@ public: virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; /**_______________________________________________________________________________________________________ @short increment refcount @@ -93,66 +93,60 @@ public: // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // XAggregation css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getImplementationName() override; - css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XControl virtual void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& xToolkit , const css::uno::Reference< css::awt::XWindowPeer >& xParent - ) throw ( css::uno::RuntimeException, std::exception ) override; + ) override; virtual sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& xModel - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; - virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel() override; // XComponent - virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispose() override; // XView virtual sal_Bool SAL_CALL setGraphics( const css::uno::Reference< css::awt::XGraphics >& xDevice - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; - virtual css::uno::Reference< css::awt::XGraphics > SAL_CALL getGraphics() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::awt::XGraphics > SAL_CALL getGraphics() override; // XConnectionPointContainer - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getConnectionPointTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getConnectionPointTypes() override; virtual css::uno::Reference< css::lang::XConnectionPoint > SAL_CALL queryConnectionPoint( const css::uno::Type& aType - ) throw ( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL advise( const css::uno::Type& aType , const css::uno::Reference< css::uno::XInterface >& xListener - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL unadvise( const css::uno::Type& aType , const css::uno::Reference< css::uno::XInterface >& xListener - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; // impl but public methods to register service! @@ -172,12 +166,12 @@ protected: css::uno::Any& rOldValue , sal_Int32 nHandle , const css::uno::Any& rValue - ) throw( css::lang::IllegalArgumentException ) override; + ) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , const css::uno::Any& rValue - ) throw ( css::uno::Exception, std::exception ) override; + ) override; virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue , sal_Int32 nHandle ) const override; @@ -186,8 +180,7 @@ protected: // XPropertySet - css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw( css::uno::RuntimeException, std::exception ) override; + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override; // BaseControl diff --git a/UnoControls/source/inc/progressbar.hxx b/UnoControls/source/inc/progressbar.hxx index e7523d778fba..768f273dc087 100644 --- a/UnoControls/source/inc/progressbar.hxx +++ b/UnoControls/source/inc/progressbar.hxx @@ -56,8 +56,7 @@ public: // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; /**_______________________________________________________________________________________________________ @short increment refcount @@ -79,30 +78,26 @@ public: // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // XAggregation - css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType ) - throw( css::uno::RuntimeException, std::exception ) override; + css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType ) override; // XProgressBar - virtual void SAL_CALL setForegroundColor( sal_Int32 nColor ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setForegroundColor( sal_Int32 nColor ) override; - virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor ) override; - virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setValue( sal_Int32 nValue ) override; virtual void SAL_CALL setRange( sal_Int32 nMin , sal_Int32 nMax - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; - virtual sal_Int32 SAL_CALL getValue() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getValue() override; // XWindow @@ -112,16 +107,15 @@ public: sal_Int32 nWidth , sal_Int32 nHeight , sal_Int16 nFlags - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; // XControl virtual sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& xModel - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; - virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel() override; // BaseControl diff --git a/UnoControls/source/inc/progressmonitor.hxx b/UnoControls/source/inc/progressmonitor.hxx index 04044cc50fe2..027a8d3fdc9e 100644 --- a/UnoControls/source/inc/progressmonitor.hxx +++ b/UnoControls/source/inc/progressmonitor.hxx @@ -121,8 +121,7 @@ public: @onerror A RuntimeException is thrown. */ - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; /**_______________________________________________________________________________________________________ @short increment refcount @@ -152,12 +151,11 @@ public: @onerror A RuntimeException is thrown. */ - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // XAggregation - virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType ) override; // XProgressMonitor @@ -182,72 +180,68 @@ public: const OUString& sTopic , const OUString& sText , sal_Bool bbeforeProgress - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL removeText( const OUString& sTopic , sal_Bool bbeforeProgress - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL updateText( const OUString& sTopic , const OUString& sText , sal_Bool bbeforeProgress - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; // XProgressBar - virtual void SAL_CALL setForegroundColor( sal_Int32 nColor ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setForegroundColor( sal_Int32 nColor ) override; - virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor ) override; - virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setValue( sal_Int32 nValue ) override; virtual void SAL_CALL setRange( sal_Int32 nMin , - sal_Int32 nMax ) throw( css::uno::RuntimeException, std::exception ) override; + sal_Int32 nMax ) override; - virtual sal_Int32 SAL_CALL getValue() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getValue() override; // XButton virtual void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& xListener - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& xListener - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; - virtual void SAL_CALL setLabel( const OUString& sLabel ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setLabel( const OUString& sLabel ) override; - virtual void SAL_CALL setActionCommand( const OUString& sCommand ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setActionCommand( const OUString& sCommand ) override; // XLayoutConstrains - virtual css::awt::Size SAL_CALL getMinimumSize() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::awt::Size SAL_CALL getMinimumSize() override; - virtual css::awt::Size SAL_CALL getPreferredSize() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::awt::Size SAL_CALL getPreferredSize() override; - virtual css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) override; // XControl virtual void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& xToolkit , const css::uno::Reference< css::awt::XWindowPeer >& xParent - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; - virtual sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& xModel ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& xModel ) override; - virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel() override; // XComponent - virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispose() override; // XWindow @@ -255,7 +249,7 @@ public: sal_Int32 nY , sal_Int32 nWidth , sal_Int32 nHeight , - sal_Int16 nFlags ) throw( css::uno::RuntimeException, std::exception ) override; + sal_Int16 nFlags ) override; // BaseControl diff --git a/UnoControls/source/inc/statusindicator.hxx b/UnoControls/source/inc/statusindicator.hxx index b1e377c46f4d..cf49fd558684 100644 --- a/UnoControls/source/inc/statusindicator.hxx +++ b/UnoControls/source/inc/statusindicator.hxx @@ -78,8 +78,7 @@ class StatusIndicator : public css::awt::XLayoutConstrains @onerror A RuntimeException is thrown. */ - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; /**_______________________________________________________________________________________________________ @short increment refcount @@ -109,54 +108,49 @@ class StatusIndicator : public css::awt::XLayoutConstrains @onerror A RuntimeException is thrown. */ - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // XAggregation - virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType ) override; // XStatusIndicator virtual void SAL_CALL start( const OUString& sText , sal_Int32 nRange - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; - virtual void SAL_CALL end() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL end() override; - virtual void SAL_CALL reset() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL reset() override; - virtual void SAL_CALL setText( const OUString& sText ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setText( const OUString& sText ) override; - virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setValue( sal_Int32 nValue ) override; // XLayoutConstrains - virtual css::awt::Size SAL_CALL getMinimumSize() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::awt::Size SAL_CALL getMinimumSize() override; - virtual css::awt::Size SAL_CALL getPreferredSize() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::awt::Size SAL_CALL getPreferredSize() override; - virtual css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) override; // XControl virtual void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& xToolkit , const css::uno::Reference< css::awt::XWindowPeer >& xParent - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; - virtual sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& xModel ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& xModel ) override; - virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel() override; // XComponent - virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispose() override; // XWindow @@ -164,7 +158,7 @@ class StatusIndicator : public css::awt::XLayoutConstrains sal_Int32 nY , sal_Int32 nWidth , sal_Int32 nHeight , - sal_Int16 nFlags ) throw( css::uno::RuntimeException, std::exception ) override; + sal_Int16 nFlags ) override; // BaseControl |