clang-tidy bugprone-parent-virtual-call in canvas

Change-Id: Ibaaec56e7cb42d113be07bb719de3534de24833c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155615
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

3 files changed, 54 insertions, 12 deletions

diff --git a/canvas/source/vcl/canvas.hxx b/canvas/source/vcl/canvas.hxx
index 8bcbc1f49894..ead9411475a2 100644
--- a/canvas/source/vcl/canvas.hxx
+++ b/canvas/source/vcl/canvas.hxx
@@ -90,10 +90,24 @@ namespace vclcanvas
 
         // Forwarding the XComponent implementation to the
         // cppu::ImplHelper templated base
-        //                                    Classname     Base doing refcounting        Base implementing the XComponent interface
-        //                                       |                 |                            |
-        //                                       V                 V                            V
-        DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( Canvas,   GraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase )
+        virtual void SAL_CALL acquire() noexcept override { GraphicDeviceBase_Base::acquire(); }
+        virtual void SAL_CALL release() noexcept override { GraphicDeviceBase_Base::release(); }
+        virtual css::uno::Any  SAL_CALL queryInterface(const css::uno::Type& _rType) override
+            { return GraphicDeviceBase_Base::queryInterface(_rType); }
+        virtual void SAL_CALL dispose() override
+        {
+            CanvasBaseT::dispose();
+        }
+        virtual void SAL_CALL addEventListener(
+            css::uno::Reference< css::lang::XEventListener > const & xListener ) override
+        {
+            CanvasBaseT::addEventListener(xListener);
+        }
+        virtual void SAL_CALL removeEventListener(
+            css::uno::Reference< css::lang::XEventListener > const & xListener ) override
+        {
+            CanvasBaseT::removeEventListener(xListener);
+        }
 
         // XServiceName
         virtual OUString SAL_CALL getServiceName(  ) override;
diff --git a/canvas/source/vcl/canvascustomsprite.hxx b/canvas/source/vcl/canvascustomsprite.hxx
index 1a7d3ccfb69e..1c220f38860a 100644
--- a/canvas/source/vcl/canvascustomsprite.hxx
+++ b/canvas/source/vcl/canvascustomsprite.hxx
@@ -86,10 +86,24 @@ namespace vclcanvas
 
         // Forwarding the XComponent implementation to the
         // cppu::ImplHelper templated base
-        //                                    Classname           Base doing refcount          Base implementing the XComponent interface
-        //                                          |                    |                         |
-        //                                          V                    V                         V
-        DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasCustomSprite, CanvasCustomSpriteBase_Base, ::cppu::WeakComponentImplHelperBase )
+        virtual void SAL_CALL acquire() noexcept override { CanvasCustomSpriteBase_Base::acquire(); }
+        virtual void SAL_CALL release() noexcept override { CanvasCustomSpriteBase_Base::release(); }
+        virtual css::uno::Any  SAL_CALL queryInterface(const css::uno::Type& _rType) override
+            { return CanvasCustomSpriteBase_Base::queryInterface(_rType); }
+        virtual void SAL_CALL dispose() override
+        {
+            PartialWeakComponentImplHelper::dispose();
+        }
+        virtual void SAL_CALL addEventListener(
+            css::uno::Reference< css::lang::XEventListener > const & xListener ) override
+        {
+            WeakComponentImplHelper::addEventListener(xListener);
+        }
+        virtual void SAL_CALL removeEventListener(
+            css::uno::Reference< css::lang::XEventListener > const & xListener ) override
+        {
+            WeakComponentImplHelper::removeEventListener(xListener);
+        }
 
         // XServiceInfo
         virtual OUString SAL_CALL getImplementationName() override;
diff --git a/canvas/source/vcl/spritecanvas.hxx b/canvas/source/vcl/spritecanvas.hxx
index 8f7c76880f51..1f4d1c502184 100644
--- a/canvas/source/vcl/spritecanvas.hxx
+++ b/canvas/source/vcl/spritecanvas.hxx
@@ -118,10 +118,24 @@ namespace vclcanvas
 
         // Forwarding the XComponent implementation to the
         // cppu::ImplHelper templated base
-        //                                    Classname     Base doing refcounting        Base implementing the XComponent interface
-        //                                       |                 |                            |
-        //                                       V                 V                            V
-        DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( SpriteCanvas, WindowGraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase )
+        virtual void SAL_CALL acquire() noexcept override { WindowGraphicDeviceBase_Base::acquire(); }
+        virtual void SAL_CALL release() noexcept override { WindowGraphicDeviceBase_Base::release(); }
+        virtual css::uno::Any  SAL_CALL queryInterface(const css::uno::Type& _rType) override
+            { return WindowGraphicDeviceBase_Base::queryInterface(_rType); }
+        virtual void SAL_CALL dispose() override
+        {
+            WeakComponentImplHelper::dispose();
+        }
+        virtual void SAL_CALL addEventListener(
+            css::uno::Reference< css::lang::XEventListener > const & xListener ) override
+        {
+            WeakComponentImplHelper::addEventListener(xListener);
+        }
+        virtual void SAL_CALL removeEventListener(
+            css::uno::Reference< css::lang::XEventListener > const & xListener ) override
+        {
+            WeakComponentImplHelper::removeEventListener(xListener);
+        }
 
         // XBufferController (partial)
         virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) override;