summaryrefslogtreecommitdiff
path: root/UnoControls/inc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-01-26 12:28:58 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-01-26 12:54:43 +0000
commite57ca02849c3d87142ff5ff9099a212e72b8139c (patch)
treebcce66b27261553c308779f3e8663a269ed3a671 /UnoControls/inc
parent8802ebd5172ec4bc412a59d136c82b77ab452281 (diff)
Remove dynamic exception specifications
...(for now, from LIBO_INTERNAL_CODE only). See the mail thread starting at <https://lists.freedesktop.org/archives/libreoffice/2017-January/076665.html> "Dynamic Exception Specifications" for details. Most changes have been done automatically by the rewriting loplugin:dynexcspec (after enabling the rewriting mode, to be committed shortly). The way it only removes exception specs from declarations if it also sees a definition, it identified some dead declarations-w/o-definitions (that have been removed manually) and some cases where a definition appeared in multiple include files (which have also been cleaned up manually). There's also been cases of macro paramters (that were used to abstract over exception specs) that have become unused now (and been removed). Furthermore, some code needed to be cleaned up manually (avmedia/source/quicktime/ and connectivity/source/drivers/kab/), as I had no configurations available that would actually build that code. Missing @throws documentation has not been applied in such manual clean-up. Change-Id: I3408691256c9b0c12bc5332de976743626e13960 Reviewed-on: https://gerrit.libreoffice.org/33574 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'UnoControls/inc')
-rw-r--r--UnoControls/inc/basecontainercontrol.hxx31
-rw-r--r--UnoControls/inc/basecontrol.hxx108
-rw-r--r--UnoControls/inc/multiplexer.hxx72
3 files changed, 87 insertions, 124 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