summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-01-25 12:58:53 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-01-25 12:59:18 +0000
commit5ec2e8111a8143b5c943285070a0157d09ea12a5 (patch)
treee8081010f7c2d906d0b4050666e1faf9f925116e
parente166b36a056181b80860affece4f9ac2c8ef6c9f (diff)
coverity#1158372 Uncaught exception
Change-Id: I1eacc1e0db5d4674bed639a9fb5eda07601ed585
-rw-r--r--sc/source/ui/Accessibility/AccessiblePreviewTable.cxx7
-rw-r--r--sc/source/ui/Accessibility/AccessibleTableBase.cxx14
-rw-r--r--sc/source/ui/inc/AccessiblePreviewTable.hxx10
-rw-r--r--sc/source/ui/inc/AccessibleTableBase.hxx15
4 files changed, 28 insertions, 18 deletions
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
index 4264192d4299..f8668a18ea6f 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
@@ -391,7 +391,7 @@ sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleIndex( sal_Int32 nRow,
}
sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleRow( sal_Int32 nChildIndex )
- throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
+ throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
IsObjectValid();
@@ -410,7 +410,7 @@ sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleRow( sal_Int32 nChildI
}
sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleColumn( sal_Int32 nChildIndex )
- throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
+ throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
IsObjectValid();
@@ -493,7 +493,8 @@ void SAL_CALL ScAccessiblePreviewTable::grabFocus() throw (uno::RuntimeException
//===== XAccessibleContext ==============================================
-sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleChildCount() throw (uno::RuntimeException)
+sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleChildCount()
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
IsObjectValid();
diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
index 4363f282c68d..4ce69dac5148 100644
--- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
@@ -299,7 +299,7 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleIndex( sal_Int32 nRow, sa
}
sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleRow( sal_Int32 nChildIndex )
- throw (uno::RuntimeException, lang::IndexOutOfBoundsException)
+ throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception)
{
SolarMutexGuard aGuard;
IsObjectValid();
@@ -311,7 +311,7 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleRow( sal_Int32 nChildInde
}
sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleColumn( sal_Int32 nChildIndex )
- throw (uno::RuntimeException, lang::IndexOutOfBoundsException)
+ throw (uno::RuntimeException, lang::IndexOutOfBoundsException, std::exception)
{
SolarMutexGuard aGuard;
IsObjectValid();
@@ -324,9 +324,8 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleColumn( sal_Int32 nChildI
// ===== XAccessibleContext ==============================================
-sal_Int32 SAL_CALL
- ScAccessibleTableBase::getAccessibleChildCount(void)
- throw (uno::RuntimeException)
+sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleChildCount()
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
IsObjectValid();
@@ -345,7 +344,8 @@ sal_Int32 SAL_CALL
uno::Reference< XAccessible > SAL_CALL
ScAccessibleTableBase::getAccessibleChild(sal_Int32 nIndex)
throw (uno::RuntimeException,
- lang::IndexOutOfBoundsException)
+ lang::IndexOutOfBoundsException,
+ std::exception)
{
SolarMutexGuard aGuard;
IsObjectValid();
@@ -410,7 +410,7 @@ void SAL_CALL
sal_Bool SAL_CALL
ScAccessibleTableBase::isAccessibleChildSelected( sal_Int32 nChildIndex )
- throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
+ throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception)
{
// I don't need to guard, because the called functions have a guard
if (nChildIndex < 0 || nChildIndex >= getAccessibleChildCount())
diff --git a/sc/source/ui/inc/AccessiblePreviewTable.hxx b/sc/source/ui/inc/AccessiblePreviewTable.hxx
index 45de00949163..13e8a8f75cba 100644
--- a/sc/source/ui/inc/AccessiblePreviewTable.hxx
+++ b/sc/source/ui/inc/AccessiblePreviewTable.hxx
@@ -117,10 +117,12 @@ public:
::com::sun::star::uno::RuntimeException);
virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException);
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException);
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
//===== XAccessibleComponent ============================================
@@ -131,7 +133,9 @@ public:
//===== XAccessibleContext ==============================================
- virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Int32 SAL_CALL getAccessibleChildCount()
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL
getAccessibleChild( sal_Int32 i )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
diff --git a/sc/source/ui/inc/AccessibleTableBase.hxx b/sc/source/ui/inc/AccessibleTableBase.hxx
index 6f3562561095..7a912292dbf4 100644
--- a/sc/source/ui/inc/AccessibleTableBase.hxx
+++ b/sc/source/ui/inc/AccessibleTableBase.hxx
@@ -180,13 +180,15 @@ public:
virtual sal_Int32 SAL_CALL
getAccessibleRow( sal_Int32 nChildIndex )
throw (::com::sun::star::uno::RuntimeException,
- ::com::sun::star::lang::IndexOutOfBoundsException);
+ ::com::sun::star::lang::IndexOutOfBoundsException,
+ std::exception);
/// Returns the column number of an index in the table.
virtual sal_Int32 SAL_CALL
getAccessibleColumn( sal_Int32 nChildIndex )
throw (::com::sun::star::uno::RuntimeException,
- ::com::sun::star::lang::IndexOutOfBoundsException);
+ ::com::sun::star::lang::IndexOutOfBoundsException,
+ std::exception);
//===== XAccessibleContext ==============================================
@@ -194,14 +196,16 @@ public:
// is overloaded to calculate this on demand
virtual sal_Int32 SAL_CALL
getAccessibleChildCount(void)
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
/// Return the specified child or NULL if index is invalid.
// is overloaded to calculate this on demand
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
getAccessibleChild(sal_Int32 nIndex)
throw (::com::sun::star::uno::RuntimeException,
- ::com::sun::star::lang::IndexOutOfBoundsException);
+ ::com::sun::star::lang::IndexOutOfBoundsException,
+ std::exception);
virtual sal_Bool SAL_CALL selectRow( sal_Int32 row )
throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException,
std::exception);
@@ -250,7 +254,8 @@ public:
virtual sal_Bool SAL_CALL
isAccessibleChildSelected( sal_Int32 nChildIndex )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException);
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL
clearAccessibleSelection( )