diff options
| -rw-r--r-- | extensions/source/scanner/sane.hxx | 8 | ||||
| -rw-r--r-- | extensions/source/scanner/scanunx.cxx | 11 |
2 files changed, 1 insertions, 18 deletions
diff --git a/extensions/source/scanner/sane.hxx b/extensions/source/scanner/sane.hxx index 504ede7804f2..b96e89cced3a 100644 --- a/extensions/source/scanner/sane.hxx +++ b/extensions/source/scanner/sane.hxx @@ -29,7 +29,7 @@ // - BitmapTransporter - -class BitmapTransporter : public OWeakObject, public css::awt::XBitmap +class BitmapTransporter: public cppu::WeakImplHelper<css::awt::XBitmap> { SvMemoryStream m_aStream; osl::Mutex m_aProtector; @@ -39,12 +39,6 @@ public: BitmapTransporter(); virtual ~BitmapTransporter(); - - // XInterface - virtual Any SAL_CALL queryInterface( const Type & rType ) throw( RuntimeException, std::exception ) override; - virtual void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } - virtual void SAL_CALL release() throw() override { OWeakObject::release(); } - virtual css::awt::Size SAL_CALL getSize() throw(std::exception) override; virtual Sequence< sal_Int8 > SAL_CALL getDIB() throw(std::exception) override; virtual Sequence< sal_Int8 > SAL_CALL getMaskDIB() throw(std::exception) override { return Sequence< sal_Int8 >(); } diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx index f43d2b467207..aae2b25f6e27 100644 --- a/extensions/source/scanner/scanunx.cxx +++ b/extensions/source/scanner/scanunx.cxx @@ -41,17 +41,6 @@ BitmapTransporter::~BitmapTransporter() #endif } - - -Any SAL_CALL BitmapTransporter::queryInterface( const Type& rType ) throw( RuntimeException, std::exception ) -{ - const Any aRet( cppu::queryInterface( rType, static_cast< css::awt::XBitmap* >( this ) ) ); - - return( aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ) ); -} - - - css::awt::Size BitmapTransporter::getSize() throw(std::exception) { osl::MutexGuard aGuard( m_aProtector ); |