diff options
Diffstat (limited to 'UnoControls/source/inc')
-rw-r--r-- | UnoControls/source/inc/OConnectionPointContainerHelper.hxx | 12 | ||||
-rw-r--r-- | UnoControls/source/inc/OConnectionPointHelper.hxx | 19 | ||||
-rw-r--r-- | UnoControls/source/inc/framecontrol.hxx | 43 | ||||
-rw-r--r-- | UnoControls/source/inc/progressbar.hxx | 28 | ||||
-rw-r--r-- | UnoControls/source/inc/progressmonitor.hxx | 52 | ||||
-rw-r--r-- | UnoControls/source/inc/statusindicator.hxx | 38 |
6 files changed, 78 insertions, 114 deletions
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 |