diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-25 21:31:58 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-26 18:22:20 +0100 |
commit | 5e21a413c788f839a66d9e4c14e745ed18058db8 (patch) | |
tree | d4451246461346a425ad6f796e08bf1514cdd942 /sd/source/ui/tools | |
parent | 6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff) |
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'sd/source/ui/tools')
-rw-r--r-- | sd/source/ui/tools/EventMultiplexer.cxx | 20 | ||||
-rw-r--r-- | sd/source/ui/tools/PropertySet.cxx | 14 | ||||
-rw-r--r-- | sd/source/ui/tools/SlotStateListener.cxx | 4 |
3 files changed, 19 insertions, 19 deletions
diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx index 5052e60758ad..ca64375b3aaf 100644 --- a/sd/source/ui/tools/EventMultiplexer.cxx +++ b/sd/source/ui/tools/EventMultiplexer.cxx @@ -83,20 +83,20 @@ public: //===== lang::XEventListener ============================================== virtual void SAL_CALL disposing (const ::com::sun::star::lang::EventObject& rEventObject) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //===== beans::XPropertySetListener ======================================= virtual void SAL_CALL propertyChange ( const com::sun::star::beans::PropertyChangeEvent& rEvent) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //===== view::XSelectionChangeListener ==================================== virtual void SAL_CALL selectionChanged ( const com::sun::star::lang::EventObject& rEvent) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //===== frame::XFrameActionListener ====================================== /** For certain actions the listener connects to a new controller of the @@ -105,13 +105,13 @@ public: */ virtual void SAL_CALL frameAction (const ::com::sun::star::frame::FrameActionEvent& rEvent) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //===== drawing::framework::XConfigurationChangeListener ================== virtual void SAL_CALL notifyConfigurationChange ( const ::com::sun::star::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL disposing (void); @@ -514,7 +514,7 @@ void EventMultiplexer::Implementation::DisconnectFromController (void) void SAL_CALL EventMultiplexer::Implementation::disposing ( const lang::EventObject& rEventObject) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (mbListeningToController) { @@ -541,7 +541,7 @@ void SAL_CALL EventMultiplexer::Implementation::disposing ( void SAL_CALL EventMultiplexer::Implementation::propertyChange ( const beans::PropertyChangeEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -567,7 +567,7 @@ void SAL_CALL EventMultiplexer::Implementation::propertyChange ( void SAL_CALL EventMultiplexer::Implementation::frameAction ( const frame::FrameActionEvent& rEvent) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { Reference<frame::XFrame> xFrame (mxFrameWeak); if (rEvent.Frame == xFrame) @@ -602,7 +602,7 @@ void SAL_CALL EventMultiplexer::Implementation::frameAction ( void SAL_CALL EventMultiplexer::Implementation::selectionChanged ( const lang::EventObject& ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { CallListeners (EventMultiplexerEvent::EID_EDIT_VIEW_SELECTION); } @@ -614,7 +614,7 @@ void SAL_CALL EventMultiplexer::Implementation::selectionChanged ( void SAL_CALL EventMultiplexer::Implementation::notifyConfigurationChange ( const ConfigurationChangeEvent& rEvent) - throw (RuntimeException) + throw (RuntimeException, std::exception) { sal_Int32 nEventType = 0; rEvent.UserData >>= nEventType; diff --git a/sd/source/ui/tools/PropertySet.cxx b/sd/source/ui/tools/PropertySet.cxx index f16f2439cb77..6632a4be8e4d 100644 --- a/sd/source/ui/tools/PropertySet.cxx +++ b/sd/source/ui/tools/PropertySet.cxx @@ -50,7 +50,7 @@ void SAL_CALL PropertySet::disposing (void) //----- XPropertySet ---------------------------------------------------------- Reference<beans::XPropertySetInfo> SAL_CALL PropertySet::getPropertySetInfo (void) - throw(RuntimeException) + throw(RuntimeException, std::exception) { return NULL; } @@ -65,7 +65,7 @@ void SAL_CALL PropertySet::setPropertyValue ( css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -92,7 +92,7 @@ void SAL_CALL PropertySet::setPropertyValue ( Any SAL_CALL PropertySet::getPropertyValue (const OUString& rsPropertyName) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -107,7 +107,7 @@ void SAL_CALL PropertySet::addPropertyChangeListener ( const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { if ( ! rxListener.is()) throw lang::IllegalArgumentException(); @@ -129,7 +129,7 @@ void SAL_CALL PropertySet::removePropertyChangeListener ( const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener) throw(beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { ::std::pair<ChangeListenerContainer::iterator,ChangeListenerContainer::iterator> aRange (mpChangeListeners->equal_range(rsPropertyName)); @@ -160,7 +160,7 @@ void SAL_CALL PropertySet::addVetoableChangeListener ( const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { // Constraint properties are not supported and thus no vetoable // listeners. @@ -176,7 +176,7 @@ void SAL_CALL PropertySet::removeVetoableChangeListener ( const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { // Constraint properties are not supported and thus no vetoable // listeners. diff --git a/sd/source/ui/tools/SlotStateListener.cxx b/sd/source/ui/tools/SlotStateListener.cxx index 00833dd2c270..09f7c454f3b1 100644 --- a/sd/source/ui/tools/SlotStateListener.cxx +++ b/sd/source/ui/tools/SlotStateListener.cxx @@ -145,7 +145,7 @@ uno::Reference<frame::XDispatch> void SlotStateListener::statusChanged ( const frame::FeatureStateEvent& rState) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); OUString sSlotName (rState.FeatureURL.Complete); @@ -180,7 +180,7 @@ void SlotStateListener::ReleaseListeners (void) void SAL_CALL SlotStateListener::disposing ( const lang::EventObject& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } |