diff options
Diffstat (limited to 'extensions/source/scanner/scanunx.cxx')
| -rw-r--r-- | extensions/source/scanner/scanunx.cxx | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx index aae2b25f6e27..33075998caa0 100644 --- a/extensions/source/scanner/scanunx.cxx +++ b/extensions/source/scanner/scanunx.cxx @@ -34,6 +34,7 @@ BitmapTransporter::BitmapTransporter() #endif } + BitmapTransporter::~BitmapTransporter() { #if OSL_DEBUG_LEVEL > 1 @@ -41,6 +42,7 @@ BitmapTransporter::~BitmapTransporter() #endif } + css::awt::Size BitmapTransporter::getSize() throw(std::exception) { osl::MutexGuard aGuard( m_aProtector ); @@ -64,7 +66,6 @@ css::awt::Size BitmapTransporter::getSize() throw(std::exception) } - Sequence< sal_Int8 > BitmapTransporter::getDIB() throw(std::exception) { osl::MutexGuard aGuard( m_aProtector ); @@ -83,9 +84,6 @@ Sequence< sal_Int8 > BitmapTransporter::getDIB() throw(std::exception) } -// - SaneHolder - - - struct SaneHolder { Sane m_aSane; @@ -97,6 +95,7 @@ struct SaneHolder SaneHolder() : m_nError(ScanError_ScanErrorNone), m_bBusy(false) {} }; + namespace { typedef std::vector< std::shared_ptr<SaneHolder> > sanevec; @@ -130,9 +129,6 @@ namespace } -// - ScannerThread - - - class ScannerThread : public osl::Thread { std::shared_ptr<SaneHolder> m_pHolder; @@ -150,7 +146,6 @@ public: }; - ScannerThread::ScannerThread( std::shared_ptr<SaneHolder> pHolder, const Reference< css::lang::XEventListener >& listener, @@ -162,6 +157,7 @@ ScannerThread::ScannerThread( #endif } + ScannerThread::~ScannerThread() { #if OSL_DEBUG_LEVEL > 1 @@ -169,6 +165,7 @@ ScannerThread::~ScannerThread() #endif } + void ScannerThread::run() { osl_setThreadName("ScannerThread"); @@ -200,15 +197,13 @@ void ScannerThread::run() } -// - ScannerManager - - - void ScannerManager::AcquireData() { osl::MutexGuard aGuard( theSaneProtector::get() ); theSanes::get().acquire(); } + void ScannerManager::ReleaseData() { osl::MutexGuard aGuard( theSaneProtector::get() ); @@ -216,7 +211,6 @@ void ScannerManager::ReleaseData() } - css::awt::Size ScannerManager::getSize() throw(std::exception) { css::awt::Size aRet; @@ -225,14 +219,12 @@ css::awt::Size ScannerManager::getSize() throw(std::exception) } - Sequence< sal_Int8 > ScannerManager::getDIB() throw(std::exception) { return Sequence< sal_Int8 >(); } - Sequence< ScannerContext > ScannerManager::getAvailableScanners() throw(std::exception) { osl::MutexGuard aGuard( theSaneProtector::get() ); @@ -257,7 +249,6 @@ Sequence< ScannerContext > ScannerManager::getAvailableScanners() throw(std::exc } - sal_Bool ScannerManager::configureScannerAndScan( ScannerContext& scanner_context, const Reference< css::lang::XEventListener >& listener ) throw (ScannerException, RuntimeException, std::exception) @@ -300,7 +291,6 @@ sal_Bool ScannerManager::configureScannerAndScan( ScannerContext& scanner_contex } - void ScannerManager::startScan( const ScannerContext& scanner_context, const Reference< css::lang::XEventListener >& listener ) throw( ScannerException, std::exception ) { @@ -331,7 +321,6 @@ void ScannerManager::startScan( const ScannerContext& scanner_context, } - ScanError ScannerManager::getError( const ScannerContext& scanner_context ) throw( ScannerException, std::exception ) { osl::MutexGuard aGuard( theSaneProtector::get() ); @@ -350,7 +339,6 @@ ScanError ScannerManager::getError( const ScannerContext& scanner_context ) thro } - Reference< css::awt::XBitmap > ScannerManager::getBitmap( const ScannerContext& scanner_context ) throw( ScannerException, std::exception ) { osl::MutexGuard aGuard( theSaneProtector::get() ); |