coverity#983702 Uncaught exception

Change-Id: I3a0b4c8fe4208d0945860f6b4e1b31852aef8502

9 files changed, 40 insertions, 18 deletions

diff --git a/comphelper/source/container/containermultiplexer.cxx b/comphelper/source/container/containermultiplexer.cxx
index d74b62fff802..d8c416242d33 100644
--- a/comphelper/source/container/containermultiplexer.cxx
+++ b/comphelper/source/container/containermultiplexer.cxx
@@ -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)
     {
     }
 
diff --git a/comphelper/source/misc/SelectionMultiplex.cxx b/comphelper/source/misc/SelectionMultiplex.cxx
index de24434b0a47..335cbf97d42a 100644
--- a/comphelper/source/misc/SelectionMultiplex.cxx
+++ b/comphelper/source/misc/SelectionMultiplex.cxx
@@ -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
 }
diff --git a/comphelper/source/property/propmultiplex.cxx b/comphelper/source/property/propmultiplex.cxx
index f04a4cc88097..dbeee362caa8 100644
--- a/comphelper/source/property/propmultiplex.cxx
+++ b/comphelper/source/property/propmultiplex.cxx
@@ -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
 }
diff --git a/include/comphelper/SelectionMultiplex.hxx b/include/comphelper/SelectionMultiplex.hxx
index e9ceb1b6246d..c4675ed7da48 100644
--- a/include/comphelper/SelectionMultiplex.hxx
+++ b/include/comphelper/SelectionMultiplex.hxx
@@ -53,7 +53,8 @@ namespace comphelper
         virtual ~OSelectionChangeListener();
 
         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:
         // pseudo-private. Making it private now could break compatibility
diff --git a/include/comphelper/containermultiplexer.hxx b/include/comphelper/containermultiplexer.hxx
index 3ae623f8013f..eaaaa4dde5d3 100644
--- a/include/comphelper/containermultiplexer.hxx
+++ b/include/comphelper/containermultiplexer.hxx
@@ -50,10 +50,18 @@ namespace comphelper
         OContainerListener(::osl::Mutex& _rMutex);
         virtual ~OContainerListener();
 
-        virtual void _elementInserted( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException);
-        virtual void _elementRemoved( const ::com::sun::star::container::ContainerEvent& _Event ) throw(::com::sun::star::uno::RuntimeException);
-        virtual void _elementReplaced( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException);
-        virtual void _disposing(const ::com::sun::star::lang::EventObject& _rSource) throw( ::com::sun::star::uno::RuntimeException);
+        virtual void _elementInserted( const ::com::sun::star::container::ContainerEvent& _rEvent )
+            throw (::com::sun::star::uno::RuntimeException,
+                   std::exception);
+        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:
         void setAdapter(OContainerListenerAdapter* _pAdapter);
diff --git a/include/comphelper/propmultiplex.hxx b/include/comphelper/propmultiplex.hxx
index 83b9a905c2cf..d00550b18ef8 100644
--- a/include/comphelper/propmultiplex.hxx
+++ b/include/comphelper/propmultiplex.hxx
@@ -52,7 +52,8 @@ namespace comphelper
         virtual ~OPropertyChangeListener();
 
         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:
         /** If the derivee also owns the mutex which we know as reference, then call this within your
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index c949185326f5..47e53714929f 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -133,7 +133,8 @@ class NavigatorTree :   public ::cppu::BaseMutex
 
         // OContainerListener
         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 _disposing(const lang::EventObject& _rSource)
             throw (uno::RuntimeException, std::exception);
@@ -167,7 +168,8 @@ protected:
     virtual sal_Int8    ExecuteDrop( const ExecuteDropEvent& _rEvt );
 
     // OSelectionChangeListener
-    virtual void _disposing(const lang::EventObject& _rSource) throw( uno::RuntimeException);
+    virtual void _disposing(const lang::EventObject& _rSource)
+        throw (uno::RuntimeException, std::exception);
 
     // OPropertyChangeListener
     virtual void _propertyChanged(const beans::PropertyChangeEvent& _rEvent) throw( uno::RuntimeException);
@@ -843,7 +845,8 @@ void NavigatorTree::UserData::_elementInserted( const container::ContainerEvent&
     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 );
 }
@@ -853,7 +856,8 @@ void NavigatorTree::UserData::_elementReplaced( const container::ContainerEvent&
     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 );
 }
diff --git a/sd/source/ui/unoidl/unomodule.cxx b/sd/source/ui/unoidl/unomodule.cxx
index 23518f444cc3..eef013d3a160 100644
--- a/sd/source/ui/unoidl/unomodule.cxx
+++ b/sd/source/ui/unoidl/unomodule.cxx
@@ -52,7 +52,8 @@ uno::Reference< uno::XInterface > SAL_CALL SdUnoModule_createInstance(
 }
 
     // 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!
     // May the outside dispatch container will be updated by a CONTEXT_CHANGED
diff --git a/sd/source/ui/unoidl/unomodule.hxx b/sd/source/ui/unoidl/unomodule.hxx
index 206da27853ae..01a28af2abde 100644
--- a/sd/source/ui/unoidl/unomodule.hxx
+++ b/sd/source/ui/unoidl/unomodule.hxx
@@ -58,7 +58,8 @@ public:
                             {}
 
     // 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
     virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw( css::uno::RuntimeException );