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>

4 files changed, 72 insertions, 16 deletions

diff --git a/canvas/source/cairo/cairo_canvas.hxx b/canvas/source/cairo/cairo_canvas.hxx
index 0c41a8a5c0d3..5d0b8e348caf 100644
--- a/canvas/source/cairo/cairo_canvas.hxx
+++ b/canvas/source/cairo/cairo_canvas.hxx
@@ -109,10 +109,24 @@ namespace cairocanvas
 
         // 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
+        {
+            CanvasBaseSurfaceProvider_Base::dispose();
+        }
+        virtual void SAL_CALL addEventListener(
+            css::uno::Reference< css::lang::XEventListener > const & xListener ) override
+        {
+            CanvasBaseSurfaceProvider_Base::addEventListener(xListener);
+        }
+        virtual void SAL_CALL removeEventListener(
+            css::uno::Reference< css::lang::XEventListener > const & xListener ) override
+        {
+            CanvasBaseSurfaceProvider_Base::removeEventListener(xListener);
+        }
 
         // XServiceName
         virtual OUString SAL_CALL getServiceName(  ) override;
diff --git a/canvas/source/cairo/cairo_canvasbitmap.hxx b/canvas/source/cairo/cairo_canvasbitmap.hxx
index f2371821023f..9e6d1d8a28cd 100644
--- a/canvas/source/cairo/cairo_canvasbitmap.hxx
+++ b/canvas/source/cairo/cairo_canvasbitmap.hxx
@@ -78,10 +78,24 @@ namespace cairocanvas
 
         // 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( CanvasBitmap, CanvasBitmapBase_Base, ::cppu::WeakComponentImplHelperBase )
+        virtual void SAL_CALL acquire() noexcept override { CanvasBitmapBase_Base::acquire(); }
+        virtual void SAL_CALL release() noexcept override { CanvasBitmapBase_Base::release(); }
+        virtual css::uno::Any  SAL_CALL queryInterface(const css::uno::Type& _rType) override
+            { return CanvasBitmapBase_Base::queryInterface(_rType); }
+        virtual void SAL_CALL dispose() override
+        {
+            CanvasBitmapSpriteSurface_Base::dispose();
+        }
+        virtual void SAL_CALL addEventListener(
+            css::uno::Reference< css::lang::XEventListener > const & xListener ) override
+        {
+            CanvasBitmapSpriteSurface_Base::addEventListener(xListener);
+        }
+        virtual void SAL_CALL removeEventListener(
+            css::uno::Reference< css::lang::XEventListener > const & xListener ) override
+        {
+            CanvasBitmapSpriteSurface_Base::removeEventListener(xListener);
+        }
 
         // XServiceInfo
         virtual OUString SAL_CALL getImplementationName(  ) override;
diff --git a/canvas/source/cairo/cairo_canvascustomsprite.hxx b/canvas/source/cairo/cairo_canvascustomsprite.hxx
index ffe766ab0966..6a392b13c6f1 100644
--- a/canvas/source/cairo/cairo_canvascustomsprite.hxx
+++ b/canvas/source/cairo/cairo_canvascustomsprite.hxx
@@ -103,10 +103,24 @@ namespace cairocanvas
 
         // 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
+        {
+            CanvasCustomSpriteBase_Base::dispose();
+        }
+        virtual void SAL_CALL addEventListener(
+            css::uno::Reference< css::lang::XEventListener > const & xListener ) override
+        {
+            CanvasCustomSpriteBase_Base::removeEventListener(xListener);
+        }
+        virtual void SAL_CALL removeEventListener(
+            css::uno::Reference< css::lang::XEventListener > const & xListener ) override
+        {
+            CanvasCustomSpriteBase_Base::removeEventListener(xListener);
+        }
 
         // XServiceInfo
         virtual OUString SAL_CALL getImplementationName() override;
diff --git a/canvas/source/cairo/cairo_spritecanvas.hxx b/canvas/source/cairo/cairo_spritecanvas.hxx
index 7790e68904b0..3468dc0674d8 100644
--- a/canvas/source/cairo/cairo_spritecanvas.hxx
+++ b/canvas/source/cairo/cairo_spritecanvas.hxx
@@ -110,10 +110,24 @@ namespace cairocanvas
 
         // 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
+        {
+            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);
+        }
 
         // XBufferController (partial)
         virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) override;