diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-05-24 15:29:20 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-05-24 16:11:00 +0100 |
| commit | 025387b6e73b15bb3d0263def21f5b5b3ee1d764 (patch) | |
| tree | 3c79b9d97eea77d7d017b94904a8a255c7088759 /extensions | |
| parent | 3467112fbd38d0dac343c21d5e91e6e3554f6827 (diff) | |
coverity#983672 Uncaught exception
Change-Id: I1b2ff484906ba3dc85fa4926dbbf45c91a57c6be
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/scanner/scanner.hxx | 2 | ||||
| -rw-r--r-- | extensions/source/scanner/scanunx.cxx | 3 | ||||
| -rw-r--r-- | extensions/source/scanner/scanwin.cxx | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/extensions/source/scanner/scanner.hxx b/extensions/source/scanner/scanner.hxx index 200eee1e38f4..19e7761bdf61 100644 --- a/extensions/source/scanner/scanner.hxx +++ b/extensions/source/scanner/scanner.hxx @@ -60,7 +60,7 @@ public: // XScannerManager virtual Sequence< ScannerContext > SAL_CALL getAvailableScanners() throw(std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL configureScanner( ScannerContext& scanner_context ) throw( ScannerException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL configureScannerAndScan( ScannerContext& scanner_context, const Reference< com::sun::star::lang::XEventListener >& rxListener ) throw( ScannerException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL configureScannerAndScan( ScannerContext& scanner_context, const Reference< com::sun::star::lang::XEventListener >& rxListener ) throw (ScannerException, RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL startScan( const ScannerContext& scanner_context, const Reference< com::sun::star::lang::XEventListener >& rxListener ) throw( ScannerException, std::exception ) SAL_OVERRIDE; virtual ScanError SAL_CALL getError( const ScannerContext& scanner_context ) throw( ScannerException, std::exception ) SAL_OVERRIDE; virtual Reference< css::awt::XBitmap > SAL_CALL getBitmap( const ScannerContext& scanner_context ) throw( ScannerException, std::exception ) SAL_OVERRIDE; diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx index d7b0d6ad138e..c57e9d8e7660 100644 --- a/extensions/source/scanner/scanunx.cxx +++ b/extensions/source/scanner/scanunx.cxx @@ -267,7 +267,8 @@ Sequence< ScannerContext > ScannerManager::getAvailableScanners() throw(std::exc sal_Bool ScannerManager::configureScannerAndScan( ScannerContext& scanner_context, - const Reference< com::sun::star::lang::XEventListener >& listener ) throw( ScannerException, std::exception ) + const Reference< com::sun::star::lang::XEventListener >& listener ) + throw (ScannerException, RuntimeException, std::exception) { bool bRet; bool bScan; diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx index b441c99c3196..ca03b5574a20 100644 --- a/extensions/source/scanner/scanwin.cxx +++ b/extensions/source/scanner/scanwin.cxx @@ -872,7 +872,7 @@ uno::Sequence< ScannerContext > SAL_CALL ScannerManager::getAvailableScanners() } sal_Bool SAL_CALL ScannerManager::configureScannerAndScan( ScannerContext& rContext, const uno::Reference< lang::XEventListener >& ) - throw( ScannerException ) + throw (ScannerException, RuntimeException, std::exception) { osl::MutexGuard aGuard( maProtector ); uno::Reference< XScannerManager > xThis( this ); |