coverity#983672 Uncaught exception

Change-Id: I1b2ff484906ba3dc85fa4926dbbf45c91a57c6be
This commit is contained in:
Caolán McNamara 2014-05-24 15:29:20 +01:00
parent 3467112fbd
commit 025387b6e7
3 changed files with 4 additions and 3 deletions

View file

@ -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;

View file

@ -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;

View file

@ -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 );