diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-10-07 14:22:47 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-10-08 08:25:24 +0200 |
| commit | e1771399490fe0d2c40fb250f03c362128916223 (patch) | |
| tree | fca6f200c9480ddad56584ab5447c4f769608f8a /include/toolkit | |
| parent | 2c181658e11623d750d8b4d4f971a52d0f10d1a7 (diff) | |
use cppu::WeakImplHelper in VCLXBitmap
Change-Id: I789646591caca8ee164d32e07b050b862f627973
Reviewed-on: https://gerrit.libreoffice.org/80385
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/toolkit')
| -rw-r--r-- | include/toolkit/awt/vclxbitmap.hxx | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/include/toolkit/awt/vclxbitmap.hxx b/include/toolkit/awt/vclxbitmap.hxx index 22b339f96194..d2ff89c2845c 100644 --- a/include/toolkit/awt/vclxbitmap.hxx +++ b/include/toolkit/awt/vclxbitmap.hxx @@ -25,7 +25,7 @@ #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <comphelper/servicehelper.hxx> -#include <cppuhelper/weak.hxx> +#include <cppuhelper/implbase.hxx> #include <osl/mutex.hxx> #include <vcl/bitmapex.hxx> @@ -33,11 +33,10 @@ // class VCLXBitmap -class VCLXBitmap final : public css::awt::XBitmap, - public css::awt::XDisplayBitmap, - public css::lang::XTypeProvider, - public css::lang::XUnoTunnel, - public ::cppu::OWeakObject +class VCLXBitmap final : public cppu::WeakImplHelper< + css::awt::XBitmap, + css::awt::XDisplayBitmap, + css::lang::XUnoTunnel> { ::osl::Mutex maMutex; BitmapEx maBitmap; @@ -49,19 +48,9 @@ public: void SetBitmap( const BitmapEx& rBmp ) { maBitmap = rBmp; } const BitmapEx& GetBitmap() const { return maBitmap; } - - // css::uno::XInterface - css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; - void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } - void SAL_CALL release() throw() override { OWeakObject::release(); } - // css::lang::XUnoTunnel UNO3_GETIMPLEMENTATION_DECL(VCLXBitmap) - // css::lang::XTypeProvider - css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; - css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; - // css::awt::XBitmap css::awt::Size SAL_CALL getSize() override; css::uno::Sequence< sal_Int8 > SAL_CALL getDIB() override; |