diff options
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 | 22 | ||||
-rw-r--r-- | sd/source/ui/tools/SlotStateListener.cxx | 3 |
3 files changed, 5 insertions, 40 deletions
diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx index cb21b379a049..6496ac33f805 100644 --- a/sd/source/ui/tools/EventMultiplexer.cxx +++ b/sd/source/ui/tools/EventMultiplexer.cxx @@ -77,20 +77,17 @@ public: //===== lang::XEventListener ============================================== virtual void SAL_CALL - disposing (const css::lang::EventObject& rEventObject) - throw (css::uno::RuntimeException, std::exception) override; + disposing (const css::lang::EventObject& rEventObject) override; //===== beans::XPropertySetListener ======================================= virtual void SAL_CALL propertyChange ( - const css::beans::PropertyChangeEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + const css::beans::PropertyChangeEvent& rEvent) override; //===== view::XSelectionChangeListener ==================================== virtual void SAL_CALL selectionChanged ( - const css::lang::EventObject& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& rEvent) override; //===== frame::XFrameActionListener ====================================== /** For certain actions the listener connects to a new controller of the @@ -98,14 +95,12 @@ public: in the center pane is replaced by another view shell. */ virtual void SAL_CALL - frameAction (const css::frame::FrameActionEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + frameAction (const css::frame::FrameActionEvent& rEvent) override; //===== drawing::framework::XConfigurationChangeListener ================== virtual void SAL_CALL notifyConfigurationChange ( - const css::drawing::framework::ConfigurationChangeEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + const css::drawing::framework::ConfigurationChangeEvent& rEvent) override; virtual void SAL_CALL disposing() override; @@ -430,7 +425,6 @@ void EventMultiplexer::Implementation::DisconnectFromController() void SAL_CALL EventMultiplexer::Implementation::disposing ( const lang::EventObject& rEventObject) - throw (RuntimeException, std::exception) { if (mbListeningToController) { @@ -454,7 +448,6 @@ void SAL_CALL EventMultiplexer::Implementation::disposing ( void SAL_CALL EventMultiplexer::Implementation::propertyChange ( const beans::PropertyChangeEvent& rEvent) - throw (RuntimeException, std::exception) { if (rBHelper.bDisposed || rBHelper.bInDispose) { @@ -482,7 +475,6 @@ void SAL_CALL EventMultiplexer::Implementation::propertyChange ( void SAL_CALL EventMultiplexer::Implementation::frameAction ( const frame::FrameActionEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) { Reference<frame::XFrame> xFrame (mxFrameWeak); if (rEvent.Frame == xFrame) @@ -514,7 +506,6 @@ void SAL_CALL EventMultiplexer::Implementation::frameAction ( void SAL_CALL EventMultiplexer::Implementation::selectionChanged ( const lang::EventObject& ) - throw (css::uno::RuntimeException, std::exception) { CallListeners (EventMultiplexerEventId::EditViewSelection); } @@ -523,7 +514,6 @@ void SAL_CALL EventMultiplexer::Implementation::selectionChanged ( void SAL_CALL EventMultiplexer::Implementation::notifyConfigurationChange ( const ConfigurationChangeEvent& rEvent) - 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 b386f53a5e56..59d25cb0618c 100644 --- a/sd/source/ui/tools/PropertySet.cxx +++ b/sd/source/ui/tools/PropertySet.cxx @@ -42,7 +42,6 @@ void SAL_CALL PropertySet::disposing() //----- XPropertySet ---------------------------------------------------------- Reference<beans::XPropertySetInfo> SAL_CALL PropertySet::getPropertySetInfo() - throw(RuntimeException, std::exception) { return nullptr; } @@ -50,11 +49,6 @@ Reference<beans::XPropertySetInfo> SAL_CALL PropertySet::getPropertySetInfo() void SAL_CALL PropertySet::setPropertyValue ( const OUString& rsPropertyName, const css::uno::Any& rsPropertyValue) - throw(css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -76,9 +70,6 @@ void SAL_CALL PropertySet::setPropertyValue ( } Any SAL_CALL PropertySet::getPropertyValue (const OUString& rsPropertyName) - throw(css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -88,9 +79,6 @@ Any SAL_CALL PropertySet::getPropertyValue (const OUString& rsPropertyName) void SAL_CALL PropertySet::addPropertyChangeListener ( const OUString& rsPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener) - throw(css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { if ( ! rxListener.is()) throw lang::IllegalArgumentException(); @@ -107,9 +95,6 @@ void SAL_CALL PropertySet::addPropertyChangeListener ( void SAL_CALL PropertySet::removePropertyChangeListener ( const OUString& rsPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener) - throw(beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { ::std::pair<ChangeListenerContainer::iterator,ChangeListenerContainer::iterator> aRange (mpChangeListeners->equal_range(rsPropertyName)); @@ -135,9 +120,6 @@ void SAL_CALL PropertySet::removePropertyChangeListener ( void SAL_CALL PropertySet::addVetoableChangeListener ( const OUString& rsPropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener) - throw(css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { // Constraint properties are not supported and thus no vetoable // listeners. @@ -148,9 +130,6 @@ void SAL_CALL PropertySet::addVetoableChangeListener ( void SAL_CALL PropertySet::removeVetoableChangeListener ( const OUString& rsPropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener) - throw(css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { // Constraint properties are not supported and thus no vetoable // listeners. @@ -173,7 +152,6 @@ void PropertySet::CallListeners ( } void PropertySet::ThrowIfDisposed() - throw (css::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) { diff --git a/sd/source/ui/tools/SlotStateListener.cxx b/sd/source/ui/tools/SlotStateListener.cxx index e827ff4ec723..1d359ace214d 100644 --- a/sd/source/ui/tools/SlotStateListener.cxx +++ b/sd/source/ui/tools/SlotStateListener.cxx @@ -118,7 +118,6 @@ uno::Reference<frame::XDispatch> void SlotStateListener::statusChanged ( const frame::FeatureStateEvent& rState) - throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); OUString sSlotName (rState.FeatureURL.Complete); @@ -146,12 +145,10 @@ void SlotStateListener::ReleaseListeners() void SAL_CALL SlotStateListener::disposing ( const lang::EventObject& ) - throw (uno::RuntimeException, std::exception) { } void SlotStateListener::ThrowIfDisposed() - throw (lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) { |