summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-05-24 14:50:14 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-05-24 16:10:59 +0100
commit99faf61bcdfa69b307fefff1d0611ba45e5a15d9 (patch)
tree189a47149fa39e479a098f839fe8055bacf5ad42
parent372d5d74ad8cfb9b69dc20557359c4a2c1597b57 (diff)
coverity#983961 Uncaught exception
Change-Id: I4316d9b2465f2608ac5d5992b5a2dc07d1713100
-rw-r--r--include/comphelper/MasterPropertySet.hxx4
-rw-r--r--sw/source/core/uibase/uno/SwXDocumentSettings.cxx3
-rw-r--r--sw/source/core/uibase/uno/SwXDocumentSettings.hxx4
3 files changed, 8 insertions, 3 deletions
diff --git a/include/comphelper/MasterPropertySet.hxx b/include/comphelper/MasterPropertySet.hxx
index f0d8e0ced5e8..9ccca3d8984a 100644
--- a/include/comphelper/MasterPropertySet.hxx
+++ b/include/comphelper/MasterPropertySet.hxx
@@ -78,7 +78,9 @@ namespace comphelper
virtual void _preGetValues ()
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) = 0;
virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, ::com::sun::star::uno::Any & rValue )
- throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ) = 0;
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException) = 0;
virtual void _postGetValues ()
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) = 0;
diff --git a/sw/source/core/uibase/uno/SwXDocumentSettings.cxx b/sw/source/core/uibase/uno/SwXDocumentSettings.cxx
index 1643633f3262..94ad4b52bdab 100644
--- a/sw/source/core/uibase/uno/SwXDocumentSettings.cxx
+++ b/sw/source/core/uibase/uno/SwXDocumentSettings.cxx
@@ -832,7 +832,8 @@ void SwXDocumentSettings::_preGetValues ()
}
void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, uno::Any & rValue )
- throw(beans::UnknownPropertyException, lang::WrappedTargetException )
+ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
+ uno::RuntimeException)
{
switch( rInfo.mnHandle )
{
diff --git a/sw/source/core/uibase/uno/SwXDocumentSettings.hxx b/sw/source/core/uibase/uno/SwXDocumentSettings.hxx
index 181f553eb99a..b3759a0f352d 100644
--- a/sw/source/core/uibase/uno/SwXDocumentSettings.hxx
+++ b/sw/source/core/uibase/uno/SwXDocumentSettings.hxx
@@ -61,7 +61,9 @@ protected:
virtual void _preGetValues ()
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE;
virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, ::com::sun::star::uno::Any & rValue )
- throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE;
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException) SAL_OVERRIDE;
virtual void _postGetValues ()
throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE;
protected: