Use cppuhelper::ImplInheritanceHelper for toolkit VCLX window classes

Change-Id: I102b49608b62b351d6a458b3fd56167b136b24e4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143525
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

4 files changed, 35 insertions, 185 deletions

diff --git a/toolkit/inc/awt/vclxcontainer.hxx b/toolkit/inc/awt/vclxcontainer.hxx
index d93c967b8365..248f2e6505dd 100644
--- a/toolkit/inc/awt/vclxcontainer.hxx
+++ b/toolkit/inc/awt/vclxcontainer.hxx
@@ -21,27 +21,18 @@
 
 #include <com/sun/star/awt/XVclContainer.hpp>
 #include <com/sun/star/awt/XVclContainerPeer.hpp>
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <toolkit/awt/vclxwindow.hxx>
 
-class VCLXContainer : public css::awt::XVclContainer,
-                        public css::awt::XVclContainerPeer,
-                        public VCLXWindow
+class VCLXContainer : public cppu::ImplInheritanceHelper<VCLXWindow,
+                        css::awt::XVclContainer,
+                        css::awt::XVclContainerPeer>
 {
 public:
                     VCLXContainer();
                     virtual ~VCLXContainer() override;
 
-    // css::uno::XInterface
-    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
-    void                        SAL_CALL acquire() noexcept override  { OWeakObject::acquire(); }
-    void                        SAL_CALL release() noexcept override  { OWeakObject::release(); }
-
-    // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
-    css::uno::Sequence< sal_Int8 >        SAL_CALL getImplementationId() override;
-
     // css::awt::XVclContainer
     void SAL_CALL addVclContainerListener( const css::uno::Reference< css::awt::XVclContainerListener >& l ) override;
     void SAL_CALL removeVclContainerListener( const css::uno::Reference< css::awt::XVclContainerListener >& l ) override;
diff --git a/toolkit/inc/awt/vclxsystemdependentwindow.hxx b/toolkit/inc/awt/vclxsystemdependentwindow.hxx
index 4bab43c494ee..69eba013c67f 100644
--- a/toolkit/inc/awt/vclxsystemdependentwindow.hxx
+++ b/toolkit/inc/awt/vclxsystemdependentwindow.hxx
@@ -21,26 +21,17 @@
 
 
 #include <com/sun/star/awt/XSystemDependentWindowPeer.hpp>
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <toolkit/awt/vclxwindow.hxx>
 
-class VCLXSystemDependentWindow final : public css::awt::XSystemDependentWindowPeer,
-                                                    public VCLXWindow
+class VCLXSystemDependentWindow final :
+    public cppu::ImplInheritanceHelper<VCLXWindow, css::awt::XSystemDependentWindowPeer>
 {
 public:
     VCLXSystemDependentWindow();
     virtual ~VCLXSystemDependentWindow() override;
 
-    // css::uno::XInterface
-    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
-    void                        SAL_CALL acquire() noexcept override  { OWeakObject::acquire(); }
-    void                        SAL_CALL release() noexcept override  { OWeakObject::release(); }
-
-    // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
-
     // css::awt::XSystemDependentWindowPeer
     css::uno::Any SAL_CALL getWindowHandle( const css::uno::Sequence< sal_Int8 >& ProcessId, sal_Int16 SystemType ) override;
 };
diff --git a/toolkit/inc/awt/vclxtopwindow.hxx b/toolkit/inc/awt/vclxtopwindow.hxx
index ad07c2780cd7..1913c4594f6d 100644
--- a/toolkit/inc/awt/vclxtopwindow.hxx
+++ b/toolkit/inc/awt/vclxtopwindow.hxx
@@ -22,34 +22,21 @@
 
 #include <com/sun/star/awt/XSystemDependentWindowPeer.hpp>
 #include <com/sun/star/awt/XTopWindow2.hpp>
-#include <cppuhelper/weak.hxx>
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <awt/vclxcontainer.hxx>
 
 namespace com::sun::star::awt { class XMenuBar; }
 
-typedef ::cppu::ImplHelper2 <   css::awt::XTopWindow2, css::awt::XSystemDependentWindowPeer
-                            >   VCLXTopWindow_XBase;
 
-
-class VCLXTopWindow: public VCLXTopWindow_XBase,
-                     public VCLXContainer
+class VCLXTopWindow: public cppu::ImplInheritanceHelper<
+                        VCLXContainer, css::awt::XTopWindow2, css::awt::XSystemDependentWindowPeer >
 {
 public:
     VCLXTopWindow();
     virtual ~VCLXTopWindow() override;
 
-    // css::uno::XInterface
-    css::uno::Any  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
-    void SAL_CALL acquire() noexcept override  { OWeakObject::acquire(); }
-    void SAL_CALL release() noexcept override  { OWeakObject::release(); }
-
-    // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
-
     // css::awt::XSystemDependentWindowPeer
     css::uno::Any SAL_CALL getWindowHandle( const css::uno::Sequence< sal_Int8 >& ProcessId, sal_Int16 SystemType ) override;
 
diff --git a/toolkit/inc/awt/vclxwindows.hxx b/toolkit/inc/awt/vclxwindows.hxx
index 46f7b8181c86..ce96248494ea 100644
--- a/toolkit/inc/awt/vclxwindows.hxx
+++ b/toolkit/inc/awt/vclxwindows.hxx
@@ -39,6 +39,7 @@
 #include <com/sun/star/util/Time.hpp>
 #include <com/sun/star/util/Date.hpp>
 
+#include <cppuhelper/implbase.hxx>
 #include <tools/lineend.hxx>
 
 #include <awt/vclxtopwindow.hxx>
@@ -73,22 +74,13 @@ private:
 };
 
 //  class VCLXMessageBox
-class VCLXMessageBox final : public css::awt::XMessageBox,
-                        public VCLXTopWindow
+class VCLXMessageBox final :
+                        public cppu::ImplInheritanceHelper<VCLXTopWindow, css::awt::XMessageBox>
 {
 public:
                         VCLXMessageBox();
                         virtual ~VCLXMessageBox() override;
 
-    // css::uno::XInterface
-    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
-    void                                        SAL_CALL acquire() noexcept override  { OWeakObject::acquire(); }
-    void                                        SAL_CALL release() noexcept override  { OWeakObject::release(); }
-
-    // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
-
 
     // css::awt::XMessageBox
     void SAL_CALL setCaptionText( const OUString& aText ) override;
@@ -112,13 +104,6 @@ public:
     VCLXFrame();
     virtual ~VCLXFrame() override;
 
-    // css::uno::XInterface
-    void                                        SAL_CALL acquire() noexcept override  { OWeakObject::acquire(); }
-    void                                        SAL_CALL release() noexcept override  { OWeakObject::release(); }
-
-    // css::lang::XTypeProvider
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
-
     // css::awt::XView
     void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) override;
 
@@ -130,22 +115,12 @@ public:
 };
 
 //  class VCLXDialog
-class VCLXDialog final : public css::awt::XDialog2,
-                    public VCLXTopWindow
+class VCLXDialog final : public cppu::ImplInheritanceHelper<VCLXTopWindow, css::awt::XDialog2>
 {
 public:
                         VCLXDialog();
                         virtual ~VCLXDialog() override;
 
-    // css::uno::XInterface
-    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
-    void                                        SAL_CALL acquire() noexcept override  { OWeakObject::acquire(); }
-    void                                        SAL_CALL release() noexcept override  { OWeakObject::release(); }
-
-    // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
-
     // css::awt::XDialog2
     virtual void SAL_CALL endDialog( ::sal_Int32 Result ) override;
     virtual void SAL_CALL setHelpId( const OUString& Id ) override;
@@ -176,13 +151,6 @@ public:
                         VCLXTabPage();
                         virtual ~VCLXTabPage() override;
 
-    // css::uno::XInterface
-    void                                        SAL_CALL acquire() noexcept override  { OWeakObject::acquire(); }
-    void                                        SAL_CALL release() noexcept override  { OWeakObject::release(); }
-
-    // css::lang::XTypeProvider
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
-
     // css::awt::XView
     void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) override;
 
@@ -195,7 +163,8 @@ public:
     virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
 };
 
-class VCLXMultiPage final : public css::awt::XSimpleTabController, public VCLXContainer
+class VCLXMultiPage final :
+    public cppu::ImplInheritanceHelper<VCLXContainer, css::awt::XSimpleTabController>
 {
     TabListenerMultiplexer maTabListeners;
     sal_Int32 mTabId;
@@ -205,14 +174,6 @@ public:
     VCLXMultiPage();
     virtual ~VCLXMultiPage() override;
 
-    // css::uno::XInterface
-    css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
-    void SAL_CALL acquire() noexcept override { OWeakObject::acquire(); }
-    void SAL_CALL release() noexcept override { OWeakObject::release(); }
-
-    // css::lang::XTypeProvider
-    css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
-
     // css::lang::XComponent
     void SAL_CALL dispose(  ) override;
 
@@ -242,10 +203,11 @@ public:
     virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
 };
 
-class VCLXMultiLineEdit final : public css::awt::XTextComponent,
-                            public css::awt::XTextArea,
-                            public css::awt::XTextLayoutConstrains,
-                            public VCLXWindow
+class VCLXMultiLineEdit final : public cppu::ImplInheritanceHelper<
+                            VCLXWindow,
+                            css::awt::XTextComponent,
+                            css::awt::XTextArea,
+                            css::awt::XTextLayoutConstrains>
 {
 private:
     TextListenerMultiplexer maTextListeners;
@@ -257,15 +219,6 @@ public:
                     VCLXMultiLineEdit();
                     virtual ~VCLXMultiLineEdit() override;
 
-    // css::uno::XInterface
-    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
-    void                           SAL_CALL acquire() noexcept override  { VCLXWindow::acquire(); }
-    void                           SAL_CALL release() noexcept override  { VCLXWindow::release(); }
-
-    // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
-
     // css::awt::XTextComponent
     void SAL_CALL addTextListener( const css::uno::Reference< css::awt::XTextListener >& l ) override;
     void SAL_CALL removeTextListener( const css::uno::Reference< css::awt::XTextListener >& l ) override;
@@ -304,8 +257,7 @@ public:
 };
 
 //  class VCLXProgressBar
-class VCLXProgressBar final : public css::awt::XProgressBar
-                            , public VCLXWindow
+class VCLXProgressBar final : public cppu::ImplInheritanceHelper<VCLXWindow, css::awt::XProgressBar>
 {
 private:
     sal_Int32   m_nValue;
@@ -318,15 +270,6 @@ public:
                     VCLXProgressBar();
                     virtual ~VCLXProgressBar() override;
 
-    // css::uno::XInterface
-    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
-    void                           SAL_CALL acquire() noexcept override  { VCLXWindow::acquire(); }
-    void                           SAL_CALL release() noexcept override  { VCLXWindow::release(); }
-
-    // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
-
     // css::awt::XProgressBar
     void SAL_CALL setForegroundColor( sal_Int32 nColor ) override;
     void SAL_CALL setBackgroundColor( sal_Int32 nColor ) override;
@@ -372,8 +315,8 @@ public:
 
 //  class VCLXDateField
 
-class VCLXDateField : public css::awt::XDateField,
-                        public VCLXFormattedSpinField
+class VCLXDateField :
+    public cppu::ImplInheritanceHelper<VCLXFormattedSpinField, css::awt::XDateField>
 {
 protected:
     virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override;
@@ -381,15 +324,6 @@ public:
                     VCLXDateField();
                     virtual ~VCLXDateField() override;
 
-    // css::uno::XInterface
-    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
-    void                                        SAL_CALL acquire() noexcept override  { OWeakObject::acquire(); }
-    void                                        SAL_CALL release() noexcept override  { OWeakObject::release(); }
-
-    // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
-
 
     // css::awt::XDateField
     void SAL_CALL setDate( const css::util::Date& Date ) override;
@@ -420,23 +354,14 @@ public:
 
 //  class VCLXTimeField
 
-class VCLXTimeField final : public css::awt::XTimeField,
-                        public VCLXFormattedSpinField
+class VCLXTimeField final :
+    public cppu::ImplInheritanceHelper<VCLXFormattedSpinField, css::awt::XTimeField>
 {
     virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override;
 public:
                     VCLXTimeField();
                     virtual ~VCLXTimeField() override;
 
-    // css::uno::XInterface
-    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
-    void                                        SAL_CALL acquire() noexcept override  { OWeakObject::acquire(); }
-    void                                        SAL_CALL release() noexcept override  { OWeakObject::release(); }
-
-    // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
-
     // css::awt::XTimeField
     void SAL_CALL setTime( const css::util::Time& Time ) override;
     css::util::Time SAL_CALL getTime(  ) override;
@@ -464,22 +389,13 @@ public:
 
 //  class VCLXNumericField
 
-class VCLXNumericField final : public css::awt::XNumericField,
-                            public VCLXFormattedSpinField
+class VCLXNumericField final :
+    public cppu::ImplInheritanceHelper<VCLXFormattedSpinField, css::awt::XNumericField>
 {
 public:
                     VCLXNumericField();
                     virtual ~VCLXNumericField() override;
 
-    // css::uno::XInterface
-    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
-    void                                        SAL_CALL acquire() noexcept override  { OWeakObject::acquire(); }
-    void                                        SAL_CALL release() noexcept override  { OWeakObject::release(); }
-
-    // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
-
     // css::awt::XNumericField
     void SAL_CALL setValue( double Value ) override;
     double SAL_CALL getValue(  ) override;
@@ -511,8 +427,8 @@ public:
 
 class MetricFormatter;
 class MetricField;
-class VCLXMetricField final : public css::awt::XMetricField,
-                        public VCLXFormattedSpinField
+class VCLXMetricField final :
+    public cppu::ImplInheritanceHelper<VCLXFormattedSpinField, css::awt::XMetricField>
 {
     /// @throws css::uno::RuntimeException
     MetricFormatter *GetMetricFormatter();
@@ -523,15 +439,6 @@ public:
     VCLXMetricField();
     virtual ~VCLXMetricField() override;
 
-    // css::uno::XInterface
-    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
-    void                                        SAL_CALL acquire() noexcept override  { OWeakObject::acquire(); }
-    void                                        SAL_CALL release() noexcept override  { OWeakObject::release(); }
-
-    // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
-
     // css::awt::XMetricField
     virtual void SAL_CALL setValue( ::sal_Int64 Value, ::sal_Int16 Unit ) override;
     virtual void SAL_CALL setUserValue( ::sal_Int64 Value, ::sal_Int16 Unit ) override;
@@ -561,22 +468,13 @@ public:
 };
 
 //  class VCLXPatternField
-class VCLXPatternField final :  public css::awt::XPatternField,
-                            public VCLXFormattedSpinField
+class VCLXPatternField final :
+    public cppu::ImplInheritanceHelper<VCLXFormattedSpinField, css::awt::XPatternField>
 {
 public:
                     VCLXPatternField();
                     virtual ~VCLXPatternField() override;
 
-    // css::uno::XInterface
-    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
-    void                                        SAL_CALL acquire() noexcept override  { OWeakObject::acquire(); }
-    void                                        SAL_CALL release() noexcept override  { OWeakObject::release(); }
-
-    // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
-
 
     // css::awt::XPatternField
     void SAL_CALL setMasks( const OUString& EditMask, const OUString& LiteralMask ) override;
@@ -595,7 +493,7 @@ public:
 };
 
 
-class VCLXFileControl final : public css::awt::XTextComponent, public css::awt::XTextLayoutConstrains, public VCLXWindow
+class VCLXFileControl final : public cppu::ImplInheritanceHelper<VCLXWindow, css::awt::XTextComponent, css::awt::XTextLayoutConstrains>
 {
     DECL_LINK(ModifyHdl, Edit&, void);
     void ModifyHdl();
@@ -607,15 +505,6 @@ public:
 
     virtual void SetWindow( const VclPtr< vcl::Window > &pWindow ) override;
 
-    // css::uno::XInterface
-    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
-    void                           SAL_CALL acquire() noexcept override  { VCLXWindow::acquire(); }
-    void                           SAL_CALL release() noexcept override  { VCLXWindow::release(); }
-
-    // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
-
     // css::awt::XTextComponent
     void SAL_CALL addTextListener( const css::uno::Reference< css::awt::XTextListener >& l ) override;
     void SAL_CALL removeTextListener( const css::uno::Reference< css::awt::XTextListener >& l ) override;
@@ -645,21 +534,13 @@ public:
     virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
 };
 
-class SVTXCurrencyField final : public css::awt::XCurrencyField, public SVTXFormattedField
+class SVTXCurrencyField final :
+    public cppu::ImplInheritanceHelper<SVTXFormattedField, css::awt::XCurrencyField>
 {
 public:
                     SVTXCurrencyField();
                     virtual ~SVTXCurrencyField() override;
 
-    // css::uno::XInterface
-    css::uno::Any                  SAL_CALL queryInterface( const css::uno::Type & rType ) override;
-    void                           SAL_CALL acquire() noexcept override  { SVTXFormattedField::acquire(); }
-    void                           SAL_CALL release() noexcept override  { SVTXFormattedField::release(); }
-
-    // css::lang::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
-
     // css::awt::XVclWindowPeer
     void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
     css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;