summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-11-06 09:26:51 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-11-06 12:15:49 +0000
commit3f8a28f41398774642a36153966f766e5c99d05e (patch)
tree337c94c9549486cc6063b038b53751a24da83b78
parentaa9f75adc228f19161500e0ed019388e335f16a6 (diff)
coverity#1338239 Uncaught exception
Change-Id: I99ea322db83a6deb67483435de1549380bfec7fb
-rw-r--r--include/toolkit/controls/controlmodelcontainerbase.hxx2
-rw-r--r--include/toolkit/controls/dialogcontrol.hxx2
-rw-r--r--toolkit/source/controls/controlmodelcontainerbase.cxx2
-rw-r--r--toolkit/source/controls/dialogcontrol.cxx2
4 files changed, 4 insertions, 4 deletions
diff --git a/include/toolkit/controls/controlmodelcontainerbase.hxx b/include/toolkit/controls/controlmodelcontainerbase.hxx
index 2e1c3ae9de57..87918266d03f 100644
--- a/include/toolkit/controls/controlmodelcontainerbase.hxx
+++ b/include/toolkit/controls/controlmodelcontainerbase.hxx
@@ -261,7 +261,7 @@ public:
// to implement this, certainly Dialog does, lets see about others
virtual void SAL_CALL modified( const css::lang::EventObject& ) throw (css::uno::RuntimeException, std::exception) override {}
protected:
- virtual void ImplModelPropertiesChanged( const css::uno::Sequence< css::beans::PropertyChangeEvent >& rEvents ) throw(css::uno::RuntimeException) override;
+ virtual void ImplModelPropertiesChanged( const css::uno::Sequence< css::beans::PropertyChangeEvent >& rEvents ) throw(css::uno::RuntimeException, std::exception) override;
virtual void removingControl( const css::uno::Reference< css::awt::XControl >& _rxControl ) override;
virtual void addingControl( const css::uno::Reference< css::awt::XControl >& _rxControl ) override;
};
diff --git a/include/toolkit/controls/dialogcontrol.hxx b/include/toolkit/controls/dialogcontrol.hxx
index 17c77e7ae084..62325ac20788 100644
--- a/include/toolkit/controls/dialogcontrol.hxx
+++ b/include/toolkit/controls/dialogcontrol.hxx
@@ -164,7 +164,7 @@ public:
protected:
virtual void PrepareWindowDescriptor( css::awt::WindowDescriptor& rDesc ) override;
- virtual void ImplModelPropertiesChanged( const css::uno::Sequence< css::beans::PropertyChangeEvent >& rEvents ) throw(css::uno::RuntimeException) override;
+ virtual void ImplModelPropertiesChanged( const css::uno::Sequence< css::beans::PropertyChangeEvent >& rEvents ) throw(css::uno::RuntimeException, std::exception) override;
protected:
};
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index 8e62ecbcd507..859fde50fb72 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -1668,7 +1668,7 @@ void ControlContainerBase::elementReplaced( const ContainerEvent& Event ) throw(
}
// XPropertiesChangeListener
-void ControlContainerBase::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent >& rEvents ) throw(RuntimeException)
+void ControlContainerBase::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent >& rEvents ) throw(RuntimeException, std::exception)
{
if( !isDesignMode() && !mbCreatingCompatiblePeer )
{
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index 005984c9ea15..acdffa2e4115 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -650,7 +650,7 @@ throw (RuntimeException, std::exception)
ImplUpdateResourceResolver();
}
-void UnoDialogControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent >& rEvents ) throw(RuntimeException)
+void UnoDialogControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent >& rEvents ) throw(RuntimeException, std::exception)
{
sal_Int32 nLen = rEvents.getLength();
for( sal_Int32 i = 0; i < nLen; i++ )