diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-26 22:02:37 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-28 08:44:46 +0100 |
| commit | 61057a61aba6ff032a50c3ee3629387c1669404d (patch) | |
| tree | e618c1834cebd2962f6bf2eaa52033259d9a9e23 /extensions | |
| parent | 018b561aa456fc18858060ec2810df856f152ed3 (diff) | |
-Werror,-Wmicrosoft-exception-spec
Change-Id: I0a4256047ae0142a03903101036d2a3c8d17429b
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/scanner/scanwin.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx index 0ce2ab719b5d..4c8858f5a216 100644 --- a/extensions/source/scanner/scanwin.cxx +++ b/extensions/source/scanner/scanwin.cxx @@ -769,7 +769,7 @@ void ScannerManager::ReleaseData() } } -awt::Size ScannerManager::getSize() throw() +awt::Size ScannerManager::getSize() throw(std::exception) { awt::Size aRet; HGLOBAL hDIB = (HGLOBAL)(sal_IntPtr) mpData; @@ -794,7 +794,7 @@ awt::Size ScannerManager::getSize() throw() return aRet; } -uno::Sequence< sal_Int8 > ScannerManager::getDIB() throw() +uno::Sequence< sal_Int8 > ScannerManager::getDIB() throw(std::exception) { uno::Sequence< sal_Int8 > aRet; @@ -854,7 +854,7 @@ uno::Sequence< sal_Int8 > ScannerManager::getDIB() throw() return aRet; } -uno::Sequence< ScannerContext > SAL_CALL ScannerManager::getAvailableScanners() throw() +uno::Sequence< ScannerContext > SAL_CALL ScannerManager::getAvailableScanners() throw(std::exception) { osl::MutexGuard aGuard( maProtector ); uno::Sequence< ScannerContext > aRet( 1 ); @@ -880,7 +880,7 @@ sal_Bool SAL_CALL ScannerManager::configureScannerAndScan( ScannerContext& rCont } void SAL_CALL ScannerManager::startScan( const ScannerContext& rContext, const uno::Reference< lang::XEventListener >& rxListener ) - throw( ScannerException ) + throw( ScannerException, std::exception ) { osl::MutexGuard aGuard( maProtector ); uno::Reference< XScannerManager > xThis( this ); @@ -893,7 +893,7 @@ void SAL_CALL ScannerManager::startScan( const ScannerContext& rContext, const u } ScanError SAL_CALL ScannerManager::getError( const ScannerContext& rContext ) - throw( ScannerException ) + throw( ScannerException, std::exception ) { osl::MutexGuard aGuard( maProtector ); uno::Reference< XScannerManager > xThis( this ); @@ -905,7 +905,7 @@ ScanError SAL_CALL ScannerManager::getError( const ScannerContext& rContext ) } uno::Reference< awt::XBitmap > SAL_CALL ScannerManager::getBitmap( const ScannerContext& /*rContext*/ ) - throw( ScannerException ) + throw( ScannerException, std::exception ) { osl::MutexGuard aGuard( maProtector ); return uno::Reference< awt::XBitmap >( this ); |