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

This reverts commit eb6110aae0af9e27f71dac95274b8f3879090deb.

There are some odd things gone in with some of these changes that I do understand. Reverting until I have worked it out.

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

8 files changed, 32 insertions, 144 deletions

diff --git a/canvas/source/cairo/cairo_canvas.hxx b/canvas/source/cairo/cairo_canvas.hxx
index 5d0b8e348caf..0c41a8a5c0d3 100644
--- a/canvas/source/cairo/cairo_canvas.hxx
+++ b/canvas/source/cairo/cairo_canvas.hxx
@@ -109,24 +109,10 @@ namespace cairocanvas
 
         // Forwarding the XComponent implementation to the
         // cppu::ImplHelper templated base
-        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);
-        }
+        //                          Classname     Base doing refcounting        Base implementing the XComponent interface
+        //                            |                 |                            |
+        //                            V                 V                            V
+        DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( Canvas, GraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase )
 
         // XServiceName
         virtual OUString SAL_CALL getServiceName(  ) override;
diff --git a/canvas/source/cairo/cairo_canvasbitmap.hxx b/canvas/source/cairo/cairo_canvasbitmap.hxx
index 9e6d1d8a28cd..f2371821023f 100644
--- a/canvas/source/cairo/cairo_canvasbitmap.hxx
+++ b/canvas/source/cairo/cairo_canvasbitmap.hxx
@@ -78,24 +78,10 @@ namespace cairocanvas
 
         // Forwarding the XComponent implementation to the
         // cppu::ImplHelper templated base
-        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);
-        }
+        //                                    Classname     Base doing refcounting        Base implementing the XComponent interface
+        //                                       |                 |                            |
+        //                                       V                 V                            V
+        DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasBitmap, CanvasBitmapBase_Base, ::cppu::WeakComponentImplHelperBase )
 
         // XServiceInfo
         virtual OUString SAL_CALL getImplementationName(  ) override;
diff --git a/canvas/source/cairo/cairo_canvascustomsprite.hxx b/canvas/source/cairo/cairo_canvascustomsprite.hxx
index 6a392b13c6f1..ffe766ab0966 100644
--- a/canvas/source/cairo/cairo_canvascustomsprite.hxx
+++ b/canvas/source/cairo/cairo_canvascustomsprite.hxx
@@ -103,24 +103,10 @@ namespace cairocanvas
 
         // Forwarding the XComponent implementation to the
         // cppu::ImplHelper templated base
-        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);
-        }
+        //                                    Classname           Base doing refcount          Base implementing the XComponent interface
+        //                                          |                    |                         |
+        //                                          V                    V                         V
+        DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasCustomSprite, CanvasCustomSpriteBase_Base, ::cppu::WeakComponentImplHelperBase )
 
         // XServiceInfo
         virtual OUString SAL_CALL getImplementationName() override;
diff --git a/canvas/source/cairo/cairo_spritecanvas.hxx b/canvas/source/cairo/cairo_spritecanvas.hxx
index 3468dc0674d8..7790e68904b0 100644
--- a/canvas/source/cairo/cairo_spritecanvas.hxx
+++ b/canvas/source/cairo/cairo_spritecanvas.hxx
@@ -110,24 +110,10 @@ namespace cairocanvas
 
         // Forwarding the XComponent implementation to the
         // cppu::ImplHelper templated base
-        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);
-        }
+        //                                    Classname     Base doing refcounting        Base implementing the XComponent interface
+        //                                       |                 |                            |
+        //                                       V                 V                            V
+        DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( SpriteCanvas, WindowGraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase )
 
         // XBufferController (partial)
         virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) override;
diff --git a/canvas/source/opengl/ogl_spritecanvas.hxx b/canvas/source/opengl/ogl_spritecanvas.hxx
index bdc849bd3708..33948b2d0cd2 100644
--- a/canvas/source/opengl/ogl_spritecanvas.hxx
+++ b/canvas/source/opengl/ogl_spritecanvas.hxx
@@ -78,24 +78,10 @@ namespace oglcanvas
 
         // Forwarding the XComponent implementation to the
         // cppu::ImplHelper templated base
-        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
-        {
-            SpriteCanvasBaseT::dispose();
-        }
-        virtual void SAL_CALL addEventListener(
-            css::uno::Reference< css::lang::XEventListener > const & xListener ) override
-        {
-            SpriteCanvasBaseT::addEventListener(xListener);
-        }
-        virtual void SAL_CALL removeEventListener(
-            css::uno::Reference< css::lang::XEventListener > const & xListener ) override
-        {
-            SpriteCanvasBaseT::removeEventListener(xListener);
-        }
+        //                                    Classname     Base doing refcounting        Base implementing the XComponent interface
+        //                                       |                 |                            |
+        //                                       V                 V                            V
+        DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( SpriteCanvas, WindowGraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase )
 
         // XBufferController (partial)
         virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) override;
diff --git a/canvas/source/vcl/canvas.hxx b/canvas/source/vcl/canvas.hxx
index ead9411475a2..8bcbc1f49894 100644
--- a/canvas/source/vcl/canvas.hxx
+++ b/canvas/source/vcl/canvas.hxx
@@ -90,24 +90,10 @@ namespace vclcanvas
 
         // Forwarding the XComponent implementation to the
         // cppu::ImplHelper templated base
-        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);
-        }
+        //                                    Classname     Base doing refcounting        Base implementing the XComponent interface
+        //                                       |                 |                            |
+        //                                       V                 V                            V
+        DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( Canvas,   GraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase )
 
         // XServiceName
         virtual OUString SAL_CALL getServiceName(  ) override;
diff --git a/canvas/source/vcl/canvascustomsprite.hxx b/canvas/source/vcl/canvascustomsprite.hxx
index 1c220f38860a..1a7d3ccfb69e 100644
--- a/canvas/source/vcl/canvascustomsprite.hxx
+++ b/canvas/source/vcl/canvascustomsprite.hxx
@@ -86,24 +86,10 @@ namespace vclcanvas
 
         // Forwarding the XComponent implementation to the
         // cppu::ImplHelper templated base
-        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);
-        }
+        //                                    Classname           Base doing refcount          Base implementing the XComponent interface
+        //                                          |                    |                         |
+        //                                          V                    V                         V
+        DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasCustomSprite, CanvasCustomSpriteBase_Base, ::cppu::WeakComponentImplHelperBase )
 
         // XServiceInfo
         virtual OUString SAL_CALL getImplementationName() override;
diff --git a/canvas/source/vcl/spritecanvas.hxx b/canvas/source/vcl/spritecanvas.hxx
index 1f4d1c502184..8f7c76880f51 100644
--- a/canvas/source/vcl/spritecanvas.hxx
+++ b/canvas/source/vcl/spritecanvas.hxx
@@ -118,24 +118,10 @@ namespace vclcanvas
 
         // Forwarding the XComponent implementation to the
         // cppu::ImplHelper templated base
-        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);
-        }
+        //                                    Classname     Base doing refcounting        Base implementing the XComponent interface
+        //                                       |                 |                            |
+        //                                       V                 V                            V
+        DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( SpriteCanvas, WindowGraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase )
 
         // XBufferController (partial)
         virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) override;