Kaydet (Commit) 6fbe00f9 authored tarafından Caolán McNamara's avatar Caolán McNamara

coverity#983702 Uncaught exception

Change-Id: I3a0b4c8fe4208d0945860f6b4e1b31852aef8502
üst 5da1ef56
...@@ -50,22 +50,26 @@ namespace comphelper ...@@ -50,22 +50,26 @@ namespace comphelper
} }
void OContainerListener::_elementInserted( const ContainerEvent& /*_rEvent*/ ) throw(RuntimeException) void OContainerListener::_elementInserted( const ContainerEvent& /*_rEvent*/ )
throw (RuntimeException, std::exception)
{ {
} }
void OContainerListener::_elementRemoved( const ContainerEvent& ) throw(RuntimeException) void OContainerListener::_elementRemoved( const ContainerEvent& )
throw (RuntimeException, std::exception)
{ {
} }
void OContainerListener::_elementReplaced( const ContainerEvent& /*_rEvent*/ ) throw(RuntimeException) void OContainerListener::_elementReplaced( const ContainerEvent& /*_rEvent*/ )
throw (RuntimeException, std::exception)
{ {
} }
void OContainerListener::_disposing(const EventObject& ) throw( RuntimeException) void OContainerListener::_disposing(const EventObject& )
throw (RuntimeException, std::exception)
{ {
} }
......
...@@ -41,7 +41,8 @@ OSelectionChangeListener::~OSelectionChangeListener() ...@@ -41,7 +41,8 @@ OSelectionChangeListener::~OSelectionChangeListener()
} }
void OSelectionChangeListener::_disposing(const EventObject&) throw( RuntimeException) void OSelectionChangeListener::_disposing(const EventObject&)
throw (RuntimeException, std::exception)
{ {
// nothing to do here // nothing to do here
} }
......
...@@ -40,7 +40,8 @@ OPropertyChangeListener::~OPropertyChangeListener() ...@@ -40,7 +40,8 @@ OPropertyChangeListener::~OPropertyChangeListener()
} }
void OPropertyChangeListener::_disposing(const EventObject&) throw( RuntimeException) void OPropertyChangeListener::_disposing(const EventObject&)
throw (RuntimeException, std::exception)
{ {
// nothing to do here // nothing to do here
} }
......
...@@ -53,7 +53,8 @@ namespace comphelper ...@@ -53,7 +53,8 @@ namespace comphelper
virtual ~OSelectionChangeListener(); virtual ~OSelectionChangeListener();
virtual void _selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException) = 0; virtual void _selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException) = 0;
virtual void _disposing(const ::com::sun::star::lang::EventObject& _rSource) throw( ::com::sun::star::uno::RuntimeException); virtual void _disposing(const ::com::sun::star::lang::EventObject& _rSource)
throw (::com::sun::star::uno::RuntimeException, std::exception);
protected: protected:
// pseudo-private. Making it private now could break compatibility // pseudo-private. Making it private now could break compatibility
......
...@@ -50,10 +50,18 @@ namespace comphelper ...@@ -50,10 +50,18 @@ namespace comphelper
OContainerListener(::osl::Mutex& _rMutex); OContainerListener(::osl::Mutex& _rMutex);
virtual ~OContainerListener(); virtual ~OContainerListener();
virtual void _elementInserted( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException); virtual void _elementInserted( const ::com::sun::star::container::ContainerEvent& _rEvent )
virtual void _elementRemoved( const ::com::sun::star::container::ContainerEvent& _Event ) throw(::com::sun::star::uno::RuntimeException); throw (::com::sun::star::uno::RuntimeException,
virtual void _elementReplaced( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException); std::exception);
virtual void _disposing(const ::com::sun::star::lang::EventObject& _rSource) throw( ::com::sun::star::uno::RuntimeException); virtual void _elementRemoved( const ::com::sun::star::container::ContainerEvent& _Event )
throw (::com::sun::star::uno::RuntimeException,
std::exception);
virtual void _elementReplaced( const ::com::sun::star::container::ContainerEvent& _rEvent )
throw (::com::sun::star::uno::RuntimeException,
std::exception);
virtual void _disposing(const ::com::sun::star::lang::EventObject& _rSource)
throw (::com::sun::star::uno::RuntimeException,
std::exception);
protected: protected:
void setAdapter(OContainerListenerAdapter* _pAdapter); void setAdapter(OContainerListenerAdapter* _pAdapter);
......
...@@ -52,7 +52,8 @@ namespace comphelper ...@@ -52,7 +52,8 @@ namespace comphelper
virtual ~OPropertyChangeListener(); virtual ~OPropertyChangeListener();
virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( ::com::sun::star::uno::RuntimeException) = 0; virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( ::com::sun::star::uno::RuntimeException) = 0;
virtual void _disposing(const ::com::sun::star::lang::EventObject& _rSource) throw( ::com::sun::star::uno::RuntimeException); virtual void _disposing(const ::com::sun::star::lang::EventObject& _rSource)
throw( ::com::sun::star::uno::RuntimeException, std::exception);
protected: protected:
/** If the derivee also owns the mutex which we know as reference, then call this within your /** If the derivee also owns the mutex which we know as reference, then call this within your
......
...@@ -133,7 +133,8 @@ class NavigatorTree : public ::cppu::BaseMutex ...@@ -133,7 +133,8 @@ class NavigatorTree : public ::cppu::BaseMutex
// OContainerListener // OContainerListener
virtual void _elementInserted( const container::ContainerEvent& _rEvent ) throw(uno::RuntimeException); virtual void _elementInserted( const container::ContainerEvent& _rEvent ) throw(uno::RuntimeException);
virtual void _elementRemoved( const container::ContainerEvent& _Event ) throw(uno::RuntimeException); virtual void _elementRemoved( const container::ContainerEvent& _Event )
throw (uno::RuntimeException, std::exception);
virtual void _elementReplaced( const container::ContainerEvent& _rEvent ) throw(uno::RuntimeException); virtual void _elementReplaced( const container::ContainerEvent& _rEvent ) throw(uno::RuntimeException);
virtual void _disposing(const lang::EventObject& _rSource) virtual void _disposing(const lang::EventObject& _rSource)
throw (uno::RuntimeException, std::exception); throw (uno::RuntimeException, std::exception);
...@@ -167,7 +168,8 @@ protected: ...@@ -167,7 +168,8 @@ protected:
virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& _rEvt ); virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& _rEvt );
// OSelectionChangeListener // OSelectionChangeListener
virtual void _disposing(const lang::EventObject& _rSource) throw( uno::RuntimeException); virtual void _disposing(const lang::EventObject& _rSource)
throw (uno::RuntimeException, std::exception);
// OPropertyChangeListener // OPropertyChangeListener
virtual void _propertyChanged(const beans::PropertyChangeEvent& _rEvent) throw( uno::RuntimeException); virtual void _propertyChanged(const beans::PropertyChangeEvent& _rEvent) throw( uno::RuntimeException);
...@@ -843,7 +845,8 @@ void NavigatorTree::UserData::_elementInserted( const container::ContainerEvent& ...@@ -843,7 +845,8 @@ void NavigatorTree::UserData::_elementInserted( const container::ContainerEvent&
m_pTree->_elementInserted( _rEvent ); m_pTree->_elementInserted( _rEvent );
} }
void NavigatorTree::UserData::_elementRemoved( const container::ContainerEvent& _rEvent ) throw(uno::RuntimeException) void NavigatorTree::UserData::_elementRemoved( const container::ContainerEvent& _rEvent )
throw (uno::RuntimeException, std::exception)
{ {
m_pTree->_elementRemoved( _rEvent ); m_pTree->_elementRemoved( _rEvent );
} }
...@@ -853,7 +856,8 @@ void NavigatorTree::UserData::_elementReplaced( const container::ContainerEvent& ...@@ -853,7 +856,8 @@ void NavigatorTree::UserData::_elementReplaced( const container::ContainerEvent&
m_pTree->_elementReplaced( _rEvent ); m_pTree->_elementReplaced( _rEvent );
} }
void NavigatorTree::UserData::_disposing(const lang::EventObject& _rSource) throw( uno::RuntimeException) void NavigatorTree::UserData::_disposing(const lang::EventObject& _rSource)
throw (uno::RuntimeException, std::exception)
{ {
m_pTree->_disposing( _rSource ); m_pTree->_disposing( _rSource );
} }
......
...@@ -52,7 +52,8 @@ uno::Reference< uno::XInterface > SAL_CALL SdUnoModule_createInstance( ...@@ -52,7 +52,8 @@ uno::Reference< uno::XInterface > SAL_CALL SdUnoModule_createInstance(
} }
// XNotifyingDispatch // XNotifyingDispatch
void SAL_CALL SdUnoModule::dispatchWithNotification( const util::URL& aURL, const uno::Sequence< beans::PropertyValue >& aArgs, const uno::Reference< frame::XDispatchResultListener >& xListener ) throw (uno::RuntimeException) void SAL_CALL SdUnoModule::dispatchWithNotification( const util::URL& aURL, const uno::Sequence< beans::PropertyValue >& aArgs, const uno::Reference< frame::XDispatchResultListener >& xListener )
throw (uno::RuntimeException, std::exception)
{ {
// there is no guarantee, that we are holded alive during this method! // there is no guarantee, that we are holded alive during this method!
// May the outside dispatch container will be updated by a CONTEXT_CHANGED // May the outside dispatch container will be updated by a CONTEXT_CHANGED
......
...@@ -58,7 +58,8 @@ public: ...@@ -58,7 +58,8 @@ public:
{} {}
// XnotifyingDispatch // XnotifyingDispatch
virtual void SAL_CALL dispatchWithNotification( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments, const css::uno::Reference< css::frame::XDispatchResultListener >& Listener ) throw (css::uno::RuntimeException); virtual void SAL_CALL dispatchWithNotification( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments, const css::uno::Reference< css::frame::XDispatchResultListener >& Listener )
throw (css::uno::RuntimeException, std::exception);
// XDispatch // XDispatch
virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw( css::uno::RuntimeException ); virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw( css::uno::RuntimeException );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment