diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-02-25 13:13:09 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-25 14:27:40 +0000 |
| commit | 0d39bb06509a4b782123e14a98b1b3e699c235ab (patch) | |
| tree | 4c6d2caf5b98724605c806cbc78a21f87497c154 /sw | |
| parent | 062249564863659e6e10f9ab34c74792dcbef8dd (diff) | |
coverity#738285 Uncaught exception
Change-Id: I56803135e3740ad72c8abe56ff124dbaa91a5411
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/unotbl.hxx | 4 | ||||
| -rw-r--r-- | sw/source/core/unocore/unotbl.cxx | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx index fd898ef7a963..f6fc9e73be1f 100644 --- a/sw/inc/unotbl.hxx +++ b/sw/inc/unotbl.hxx @@ -236,7 +236,9 @@ public: virtual sal_Bool SAL_CALL goDown( sal_Int16 nCount, sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL gotoStart( sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL gotoEnd( sal_Bool bExpand ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL mergeRange( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL mergeRange() + throw (::com::sun::star::uno::RuntimeException, + std::exception); virtual sal_Bool SAL_CALL splitRange( sal_Int16 Count, sal_Bool Horizontal ) throw(::com::sun::star::uno::RuntimeException); //XPropertySet diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index 15fb2af6f780..148d26254657 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -1748,7 +1748,8 @@ void SwXTextTableCursor::gotoEnd(sal_Bool Expand) throw( uno::RuntimeException ) } } -sal_Bool SwXTextTableCursor::mergeRange(void) throw( uno::RuntimeException ) +sal_Bool SwXTextTableCursor::mergeRange() + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; sal_Bool bRet = sal_False; |