diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-10-07 14:29:16 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-10-07 22:02:32 +0200 |
| commit | 09e0e415e1fe1821a2ee5b12dab9b20fd7c46641 (patch) | |
| tree | 9eea75d0162af906573df5900e5e740f492a1c23 /include/toolkit | |
| parent | b3d077a9201d10f2243a7e187af93feb9bfd26ff (diff) | |
use cppu::WeakImplHelper in VCLXGraphics
Change-Id: If862818ef3eb534493ac61d5071ec1adf590ebf2
Reviewed-on: https://gerrit.libreoffice.org/80388
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/toolkit')
| -rw-r--r-- | include/toolkit/awt/vclxgraphics.hxx | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/include/toolkit/awt/vclxgraphics.hxx b/include/toolkit/awt/vclxgraphics.hxx index 1482bad16b3e..85464ae37e56 100644 --- a/include/toolkit/awt/vclxgraphics.hxx +++ b/include/toolkit/awt/vclxgraphics.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 <vcl/font.hxx> #include <tools/color.hxx> @@ -54,10 +54,9 @@ namespace o3tl // class VCLXGraphics -class VCLXGraphics : public css::awt::XGraphics2, - public css::lang::XTypeProvider, - public css::lang::XUnoTunnel, - public ::cppu::OWeakObject +class VCLXGraphics : public cppu::WeakImplHelper< + css::awt::XGraphics2, + css::lang::XUnoTunnel> { private: // used to return same reference on each call to getDevice() @@ -84,18 +83,9 @@ public: void SetOutputDevice( OutputDevice* pOutDev ); OutputDevice* GetOutputDevice() const { return mpOutputDevice; } - // 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(VCLXGraphics) - // css::lang::XTypeProvider - css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; - css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; - // css::awt::XGraphics Attributes virtual css::uno::Reference< css::awt::XDevice > SAL_CALL getDevice() override; virtual void SAL_CALL setTextColor( ::sal_Int32 _textcolor ) override; |