From be634d021229408bf9e30b4cb75be5debf9a3ffd Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Mon, 7 Oct 2019 14:25:14 +0200
Subject: use cppu::WeakImplHelper in VCLXDevice

Change-Id: Ia83cc372d53db41edc8199077db91cb7b1d06e24
Reviewed-on: https://gerrit.libreoffice.org/80386
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 include/toolkit/awt/vclxdevice.hxx | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

(limited to 'include/toolkit')

diff --git a/include/toolkit/awt/vclxdevice.hxx b/include/toolkit/awt/vclxdevice.hxx
index b99b5bce6b7f..07cd499cacfb 100644
--- a/include/toolkit/awt/vclxdevice.hxx
+++ b/include/toolkit/awt/vclxdevice.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/virdev.hxx>
 #include <vcl/vclptr.hxx>
 
@@ -33,11 +33,10 @@
 
 /// A UNO wrapper for the VCL OutputDevice
 class TOOLKIT_DLLPUBLIC VCLXDevice :
-                    public css::awt::XDevice,
-                    public css::lang::XTypeProvider,
-                    public css::lang::XUnoTunnel,
-                    public css::awt::XUnitConversion,
-                    public ::cppu::OWeakObject
+                    public cppu::WeakImplHelper<
+                        css::awt::XDevice,
+                        css::lang::XUnoTunnel,
+                        css::awt::XUnitConversion>
 {
     friend class VCLXGraphics;
     friend class VCLXVirtualDevice;
@@ -52,18 +51,9 @@ public:
     void                    SetOutputDevice( const VclPtr<OutputDevice> &pOutDev ) { mpOutputDevice = pOutDev; }
     const VclPtr<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(VCLXDevice)
 
-    // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
-
     // css::awt::XDevice,
     css::uno::Reference< css::awt::XGraphics >    SAL_CALL createGraphics(  ) override;
     css::uno::Reference< css::awt::XDevice >      SAL_CALL createDevice( sal_Int32 nWidth, sal_Int32 nHeight ) override;
-- 
cgit