diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-02-25 13:49:28 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-25 14:27:44 +0000 |
| commit | d6740ca95eb795992ceb4834b1b36bfdfa2faa4a (patch) | |
| tree | 3d3ac2bfa0814643179ff0b48890c5c79a07ea92 | |
| parent | b2a19533927ff32809e47ef0c1e627b69a26da63 (diff) | |
coverity#738351 Uncaught exception
Change-Id: I007084047ea6640afbb4b6a451565d6561174b5c
| -rw-r--r-- | sw/source/ui/inc/unomailmerge.hxx | 6 | ||||
| -rw-r--r-- | sw/source/ui/uno/unomailmerge.cxx | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/sw/source/ui/inc/unomailmerge.hxx b/sw/source/ui/inc/unomailmerge.hxx index 09d4bebf683d..0c37e2457537 100644 --- a/sw/source/ui/inc/unomailmerge.hxx +++ b/sw/source/ui/inc/unomailmerge.hxx @@ -156,7 +156,11 @@ public: void LaunchMailMergeEvent( const com::sun::star::text::MailMergeEvent &rData ) const; // XJob - virtual ::com::sun::star::uno::Any SAL_CALL execute( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Arguments ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL execute( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Arguments ) + throw (::com::sun::star::lang::IllegalArgumentException, + ::com::sun::star::uno::Exception, + ::com::sun::star::uno::RuntimeException, + std::exception); // XCancellable virtual void SAL_CALL cancel() throw (com::sun::star::uno::RuntimeException); diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx index 2e839d761df8..a2dcd068a4c8 100644 --- a/sw/source/ui/uno/unomailmerge.cxx +++ b/sw/source/ui/uno/unomailmerge.cxx @@ -433,7 +433,8 @@ private: uno::Any SAL_CALL SwXMailMerge::execute( const uno::Sequence< beans::NamedValue >& rArguments ) - throw (IllegalArgumentException, Exception, RuntimeException) + throw (IllegalArgumentException, Exception, + RuntimeException, std::exception) { SolarMutexGuard aGuard; MailMergeExecuteFinalizer aFinalizer(this); |