summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-02-13 13:55:12 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-02-13 14:56:24 +0000
commit4c51f320baf38e07453e8fc991bf47ad6444cff0 (patch)
tree25bf1791d81e72a42c317a2db9726bf281625660
parentbb9a8524d6bd77d6d3e7d99d14efd344552381c8 (diff)
coverity#738262 Uncaught exception
Change-Id: I366f41afdad4f1ef38506d5d20f4293c3dde2d68
-rw-r--r--sw/inc/unotbl.hxx13
-rw-r--r--sw/source/core/unocore/unotbl.cxx19
2 files changed, 24 insertions, 8 deletions
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index 576e421fd9b9..ecea107a89e0 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -364,11 +364,20 @@ public:
virtual void SAL_CALL sort(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xDescriptor) throw( ::com::sun::star::uno::RuntimeException );
//XAutoFormattable
- virtual void SAL_CALL autoFormat(const OUString& aName) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL autoFormat(const OUString& aName)
+ throw (::com::sun::star::lang::IllegalArgumentException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
//XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue )
+ throw(::com::sun::star::beans::UnknownPropertyException,
+ ::com::sun::star::beans::PropertyVetoException,
+ ::com::sun::star::lang::IllegalArgumentException,
+ ::com::sun::star::lang::WrappedTargetException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName )
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 57346fc7bcd7..99132e44b100 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -1361,9 +1361,13 @@ uno::Reference< beans::XPropertySetInfo > SwXTextTableRow::getPropertySetInfo(v
return xRef;
}
-void SwXTextTableRow::setPropertyValue(const OUString& rPropertyName,
- const uno::Any& aValue)
- throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException )
+void SwXTextTableRow::setPropertyValue(const OUString& rPropertyName, const uno::Any& aValue)
+ throw (beans::UnknownPropertyException,
+ beans::PropertyVetoException,
+ lang::IllegalArgumentException,
+ lang::WrappedTargetException,
+ uno::RuntimeException,
+ std::exception)
{
SolarMutexGuard aGuard;
SwFrmFmt* pFmt = GetFrmFmt();
@@ -3023,7 +3027,9 @@ void SwXTextTable::sort(const uno::Sequence< beans::PropertyValue >& rDescriptor
}
}
-void SwXTextTable::autoFormat(const OUString& aName) throw( lang::IllegalArgumentException, uno::RuntimeException )
+void SwXTextTable::autoFormat(const OUString& aName)
+ throw (lang::IllegalArgumentException, uno::RuntimeException,
+ std::exception)
{
SolarMutexGuard aGuard;
SwFrmFmt* pFmt = GetFrmFmt();
@@ -3317,7 +3323,8 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName, const uno::An
uno::Any SwXTextTable::getPropertyValue(const OUString& rPropertyName)
throw (beans::UnknownPropertyException,
lang::WrappedTargetException,
- uno::RuntimeException)
+ uno::RuntimeException,
+ std::exception)
{
SolarMutexGuard aGuard;
uno::Any aRet;
@@ -3813,7 +3820,7 @@ uno::Reference< table::XCell > SwXCellRange::getCellByPosition(sal_Int32 nColum
uno::Reference< table::XCellRange > SwXCellRange::getCellRangeByPosition(
sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom)
- throw (uno::RuntimeException, lang::IndexOutOfBoundsException
+ throw (uno::RuntimeException, lang::IndexOutOfBoundsException,
std::exception)
{
SolarMutexGuard aGuard;