merge classes VCLXTopWindow_Base and VCLXTopWindow

Change-Id: I4c0718d2947449fa076b0afd3046587c73784558
Reviewed-on: https://gerrit.libreoffice.org/84035
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

1 files changed, 16 insertions, 42 deletions

diff --git a/include/toolkit/awt/vclxtopwindow.hxx b/include/toolkit/awt/vclxtopwindow.hxx
index 188f128f793e..9db6e7d51d24 100644
--- a/include/toolkit/awt/vclxtopwindow.hxx
+++ b/include/toolkit/awt/vclxtopwindow.hxx
@@ -24,33 +24,32 @@
 #include <com/sun/star/awt/XTopWindow2.hpp>
 #include <cppuhelper/weak.hxx>
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase2.hxx>
 
 #include <toolkit/awt/vclxcontainer.hxx>
 
 namespace com { namespace sun { namespace star { namespace awt { class XMenuBar; } } } }
 
-typedef ::cppu::ImplHelper1 <   css::awt::XTopWindow2
+typedef ::cppu::ImplHelper2 <   css::awt::XTopWindow2, css::awt::XSystemDependentWindowPeer
                             >   VCLXTopWindow_XBase;
-typedef ::cppu::ImplHelper1 <   css::awt::XSystemDependentWindowPeer
-                            >   VCLXTopWindow_SBase;
 
-class VCLXTopWindow_Base  :public VCLXTopWindow_XBase
-                                            ,public VCLXTopWindow_SBase
-{
-protected:
-    virtual vcl::Window* GetWindowImpl() = 0;
-    virtual ::comphelper::OInterfaceContainerHelper2& GetTopWindowListenersImpl() = 0;
-
-    VCLXTopWindow_Base();
+//  class VCLXTopWindow
 
+class VCLXTopWindow: public VCLXTopWindow_XBase,
+                     public VCLXContainer
+{
 public:
-    virtual ~VCLXTopWindow_Base();
+    VCLXTopWindow();
+    virtual ~VCLXTopWindow() override;
+
+    // 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(); }
 
-    // XInterface equivalents
-    css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
-    // XTypeProvider equivalents
-    css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    // 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;
@@ -69,31 +68,6 @@ public:
     virtual void SAL_CALL setIsMinimized( sal_Bool _isminimized ) override;
     virtual ::sal_Int32 SAL_CALL getDisplay() override;
     virtual void SAL_CALL setDisplay( ::sal_Int32 _display ) override;
-};
-
-
-//  class VCLXTopWindow
-
-
-class VCLXTopWindow: public VCLXTopWindow_Base,
-                     public VCLXContainer
-{
-protected:
-    virtual vcl::Window* GetWindowImpl() override;
-    virtual ::comphelper::OInterfaceContainerHelper2& GetTopWindowListenersImpl() override;
-
-public:
-    VCLXTopWindow();
-    virtual ~VCLXTopWindow() override;
-
-    // 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::XTypeProvider
-    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
-    css::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() override;
 
     static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
     virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }