Adding upstream version 4:7.4.7.upstream/4%7.4.7upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

6 files changed, 1457 insertions, 0 deletions

diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx b/include/toolkit/awt/vclxaccessiblecomponent.hxx
new file mode 100644
index 000000000..b1735f3f2
--- /dev/null
+++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx
@@ -0,0 +1,150 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_TOOLKIT_AWT_VCLXACCESSIBLECOMPONENT_HXX
+#define INCLUDED_TOOLKIT_AWT_VCLXACCESSIBLECOMPONENT_HXX
+
+#include <toolkit/dllapi.h>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <cppuhelper/implbase1.hxx>
+#include <comphelper/accimplaccess.hxx>
+#include <comphelper/accessiblecomponenthelper.hxx>
+
+
+#include <tools/link.hxx>
+#include <vcl/vclptr.hxx>
+
+namespace com::sun::star::accessibility { class XAccessible; }
+
+namespace vcl { class Window; }
+class VCLXWindow;
+class VclWindowEvent;
+
+namespace utl {
+class AccessibleRelationSetHelper;
+class AccessibleStateSetHelper;
+}
+
+
+
+typedef ::cppu::ImplHelper1<
+    css::lang::XServiceInfo > VCLXAccessibleComponent_BASE;
+
+class TOOLKIT_DLLPUBLIC VCLXAccessibleComponent
+        :public comphelper::OAccessibleExtendedComponentHelper
+        ,public ::comphelper::OAccessibleImplementationAccess
+        ,public VCLXAccessibleComponent_BASE
+{
+private:
+    rtl::Reference<VCLXWindow>      m_xVCLXWindow;
+    VclPtr<vcl::Window>             m_xEventSource;
+
+    DECL_DLLPRIVATE_LINK( WindowEventListener, VclWindowEvent&, void );
+    DECL_DLLPRIVATE_LINK( WindowChildEventListener, VclWindowEvent&, void );
+    void            DisconnectEvents();
+
+protected:
+    virtual void    ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
+    virtual void    ProcessWindowChildEvent( const VclWindowEvent& rVclWindowEvent );
+    virtual void    FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet );
+    virtual void    FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+
+    virtual css::uno::Reference< css::accessibility::XAccessible > GetChildAccessible( const VclWindowEvent& rVclWindowEvent );
+
+public:
+    VCLXAccessibleComponent( VCLXWindow* pVCLXWindow );
+    virtual ~VCLXAccessibleComponent() override;
+
+    VCLXWindow*    GetVCLXWindow() const;
+    vcl::Window* GetWindow() const;
+    template< class derived_type > derived_type* GetAs() const {
+        return static_cast< derived_type * >( GetWindow() ); }
+    template< class derived_type > derived_type* GetAsDynamic() const {
+        return dynamic_cast< derived_type * >( GetWindow() ); }
+
+    virtual void SAL_CALL disposing() override;
+
+    // css::uno::XInterface
+    DECLARE_XINTERFACE()
+    // css::lang::XTypeProvider
+    DECLARE_XTYPEPROVIDER()
+
+    // XServiceInfo
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
+
+    // css::accessibility::XAccessibleContext
+    sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
+    css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+    css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
+    sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+    sal_Int16 SAL_CALL getAccessibleRole(  ) override;
+    OUString SAL_CALL getAccessibleDescription(  ) override;
+    OUString SAL_CALL getAccessibleName(  ) override;
+    OUString SAL_CALL getAccessibleId(  ) override;
+    css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
+    css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+    css::lang::Locale SAL_CALL getLocale(  ) override;
+
+    // css::accessibility::XAccessibleComponent
+    css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+    css::awt::Point SAL_CALL getLocationOnScreen(  ) override;
+    void SAL_CALL grabFocus(  ) override;
+    virtual sal_Int32 SAL_CALL getForeground(  ) override;
+    virtual sal_Int32 SAL_CALL getBackground(  ) override;
+
+    // css::accessibility::XAccessibleExtendedComponent
+    virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont(  ) override;
+    virtual OUString SAL_CALL getTitledBorderText(  ) override;
+    virtual OUString SAL_CALL getToolTipText(  ) override;
+
+protected:
+    // base class overridables
+    css::awt::Rectangle implGetBounds(  ) override;
+
+private:
+    /** we may be reparented (if external components use OAccessibleImplementationAccess base class),
+        so this method here returns the parent in the VCL world, in opposite to the parent
+        an external component gave us
+    @precond
+        the caller must ensure thread safety, i.e. our mutex must be locked
+    */
+    css::uno::Reference< css::accessibility::XAccessible >
+            getVclParent() const;
+};
+
+/* ----------------------------------------------------------
+  Accessibility only for the Window hierarchy!
+  Maybe derived classes must overwrite these Accessibility interfaces:
+
+    // XAccessibleContext:
+    sal_Int16 getAccessibleRole() => VCL Window::GetAccessibleRole()
+    OUString getAccessibleDescription() => VCL Window::GetAccessibleDescription
+    OUString getAccessibleName() => VCL Window::GetAccessibleText() => Most windows return Window::GetText()
+    OUString getAccessibleId() => VCL Window::get_id()
+    Reference< XAccessibleRelationSet > getAccessibleRelationSet()
+    Reference< XAccessibleStateSet > getAccessibleStateSet() => override FillAccessibleStateSet( ... )
+
+---------------------------------------------------------- */
+
+
+#endif // INCLUDED_TOOLKIT_AWT_VCLXACCESSIBLECOMPONENT_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxdevice.hxx b/include/toolkit/awt/vclxdevice.hxx
new file mode 100644
index 000000000..c24b79be1
--- /dev/null
+++ b/include/toolkit/awt/vclxdevice.hxx
@@ -0,0 +1,88 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_TOOLKIT_AWT_VCLXDEVICE_HXX
+#define INCLUDED_TOOLKIT_AWT_VCLXDEVICE_HXX
+
+#include <toolkit/dllapi.h>
+#include <com/sun/star/awt/XDevice.hpp>
+#include <com/sun/star/lang/XUnoTunnel.hpp>
+#include <comphelper/servicehelper.hxx>
+#include <cppuhelper/implbase.hxx>
+#include <vcl/virdev.hxx>
+#include <vcl/vclptr.hxx>
+
+#include <com/sun/star/awt/XUnitConversion.hpp>
+
+/// A UNO wrapper for the VCL OutputDevice
+class TOOLKIT_DLLPUBLIC VCLXDevice :
+                    public cppu::WeakImplHelper<
+                        css::awt::XDevice,
+                        css::lang::XUnoTunnel,
+                        css::awt::XUnitConversion>
+{
+    friend class VCLXGraphics;
+    friend class VCLXVirtualDevice;
+
+private:
+    VclPtr<OutputDevice>    mpOutputDevice;
+
+public:
+                            VCLXDevice();
+                            virtual ~VCLXDevice() override;
+
+    void                    SetOutputDevice( const VclPtr<OutputDevice> &pOutDev ) { mpOutputDevice = pOutDev; }
+    const VclPtr<OutputDevice>& GetOutputDevice() const { return mpOutputDevice; }
+
+    // css::lang::XUnoTunnel
+    UNO3_GETIMPLEMENTATION_DECL(VCLXDevice)
+
+    // css::awt::XDevice,
+    css::uno::Reference< css::awt::XGraphics >    SAL_CALL createGraphics(  ) override;
+    css::uno::Reference< css::awt::XDevice >      SAL_CALL createDevice( sal_Int32 nWidth, sal_Int32 nHeight ) override;
+    css::awt::DeviceInfo                                       SAL_CALL getInfo() override;
+    css::uno::Sequence< css::awt::FontDescriptor > SAL_CALL getFontDescriptors(  ) override;
+    css::uno::Reference< css::awt::XFont >        SAL_CALL getFont( const css::awt::FontDescriptor& aDescriptor ) override;
+    css::uno::Reference< css::awt::XBitmap >      SAL_CALL createBitmap( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight ) override;
+    css::uno::Reference< css::awt::XDisplayBitmap > SAL_CALL createDisplayBitmap( const css::uno::Reference< css::awt::XBitmap >& Bitmap ) override;
+
+    // css::awt::XUnitConversion
+    css::awt::Point SAL_CALL convertPointToLogic( const css::awt::Point& aPoint, ::sal_Int16 TargetUnit ) override;
+    css::awt::Point SAL_CALL convertPointToPixel( const css::awt::Point& aPoint, ::sal_Int16 SourceUnit ) override;
+    css::awt::Size SAL_CALL convertSizeToLogic( const css::awt::Size& aSize, ::sal_Int16 TargetUnit ) override;
+    css::awt::Size SAL_CALL convertSizeToPixel( const css::awt::Size& aSize, ::sal_Int16 SourceUnit ) override;
+
+
+};
+
+
+
+
+class VCLXVirtualDevice final : public VCLXDevice
+{
+public:
+                    virtual ~VCLXVirtualDevice() override;
+
+    void            SetVirtualDevice( VirtualDevice* pVDev ) { SetOutputDevice( pVDev ); }
+};
+
+
+#endif // INCLUDED_TOOLKIT_AWT_VCLXDEVICE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxfont.hxx b/include/toolkit/awt/vclxfont.hxx
new file mode 100644
index 000000000..efad4b590
--- /dev/null
+++ b/include/toolkit/awt/vclxfont.hxx
@@ -0,0 +1,78 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_TOOLKIT_AWT_VCLXFONT_HXX
+#define INCLUDED_TOOLKIT_AWT_VCLXFONT_HXX
+
+#include <memory>
+#include <toolkit/dllapi.h>
+#include <com/sun/star/awt/XFont2.hpp>
+#include <com/sun/star/lang/XUnoTunnel.hpp>
+#include <comphelper/servicehelper.hxx>
+#include <cppuhelper/implbase.hxx>
+#include <mutex>
+#include <vcl/font.hxx>
+
+namespace com::sun::star::awt { class XDevice; }
+
+class FontMetric;
+
+
+
+
+class TOOLKIT_DLLPUBLIC VCLXFont final :
+                        public cppu::WeakImplHelper<
+                            css::awt::XFont2,
+                            css::lang::XUnoTunnel>
+{
+    std::mutex    maMutex;
+    css::uno::Reference< css::awt::XDevice> mxDevice;
+    vcl::Font       maFont;
+    std::unique_ptr<FontMetric>
+                    mpFontMetric;
+
+    bool            ImplAssertValidFontMetric();
+
+public:
+                    VCLXFont();
+                    virtual ~VCLXFont() override;
+
+    void            Init( css::awt::XDevice& rxDev, const vcl::Font& rFont );
+    const vcl::Font&     GetFont() const { return maFont; }
+
+    // css::lang::XUnoTunnel
+    UNO3_GETIMPLEMENTATION_DECL(VCLXFont)
+
+    // css::lang::XFont
+    css::awt::FontDescriptor           SAL_CALL getFontDescriptor(  ) override;
+    css::awt::SimpleFontMetric         SAL_CALL getFontMetric(  ) override;
+    sal_Int16                                       SAL_CALL getCharWidth( sal_Unicode c ) override;
+    css::uno::Sequence< sal_Int16 >    SAL_CALL getCharWidths( sal_Unicode nFirst, sal_Unicode nLast ) override;
+    sal_Int32                                       SAL_CALL getStringWidth( const OUString& str ) override;
+    sal_Int32                                       SAL_CALL getStringWidthArray( const OUString& str, css::uno::Sequence< sal_Int32 >& rDXArray ) override;
+    void                                            SAL_CALL getKernPairs( css::uno::Sequence< sal_Unicode >& rnChars1, css::uno::Sequence< sal_Unicode >& rnChars2, css::uno::Sequence< sal_Int16 >& rnKerns ) override;
+
+    // css::lang::XFont2
+    sal_Bool                                        SAL_CALL hasGlyphs( const OUString& aText ) override;
+};
+
+
+#endif // INCLUDED_TOOLKIT_AWT_VCLXFONT_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxmenu.hxx b/include/toolkit/awt/vclxmenu.hxx
new file mode 100644
index 000000000..096c370bc
--- /dev/null
+++ b/include/toolkit/awt/vclxmenu.hxx
@@ -0,0 +1,162 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_TOOLKIT_AWT_VCLXMENU_HXX
+#define INCLUDED_TOOLKIT_AWT_VCLXMENU_HXX
+
+#include <config_options.h>
+#include <toolkit/dllapi.h>
+#include <toolkit/helper/listenermultiplexer.hxx>
+
+#include <com/sun/star/awt/XMenuBar.hpp>
+#include <com/sun/star/awt/XPopupMenu.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/XTypeProvider.hpp>
+#include <com/sun/star/lang/XUnoTunnel.hpp>
+
+#include <comphelper/servicehelper.hxx>
+#include <cppuhelper/weak.hxx>
+#include <mutex>
+
+#include <tools/link.hxx>
+#include <vcl/vclptr.hxx>
+
+#include <vector>
+
+class Menu;
+class MenuBar;
+class PopupMenu;
+class VclMenuEvent;
+
+typedef ::std::vector<
+    css::uno::Reference< css::awt::XPopupMenu >
+> PopupMenuRefList;
+
+typedef void (*MenuUserDataReleaseFunction)(void*);
+
+class TOOLKIT_DLLPUBLIC VCLXMenu :  public css::awt::XMenuBar,
+                                    public css::awt::XPopupMenu,
+                                    public css::lang::XServiceInfo,
+                                    public css::lang::XTypeProvider,
+                                    public css::lang::XUnoTunnel,
+                                    public ::cppu::OWeakObject
+{
+private:
+    std::mutex              maMutex;
+    VclPtr<Menu>            mpMenu;
+    MenuListenerMultiplexer maMenuListeners;
+    PopupMenuRefList        maPopupMenuRefs;
+    sal_Int16               mnDefaultItem;
+
+protected:
+
+    DECL_DLLPRIVATE_LINK( MenuEventListener, VclMenuEvent&, void );
+
+    void ImplCreateMenu( bool bPopup );
+    void ImplAddListener();
+
+public:
+    VCLXMenu();
+    VCLXMenu( Menu* pMenu );
+    virtual ~VCLXMenu() override;
+
+
+    Menu*    GetMenu() const { return mpMenu; }
+    bool IsPopupMenu() const;
+    void setUserValue(sal_uInt16 nItemId, void* nUserValue, MenuUserDataReleaseFunction aFunc);
+    void* getUserValue(sal_uInt16 nItemId);
+
+    // 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::XUnoTunnel
+    UNO3_GETIMPLEMENTATION_DECL(VCLXMenu)
+
+    // css::lang::XTypeProvider
+    css::uno::Sequence< css::uno::Type >  SAL_CALL getTypes() override;
+    css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+
+    // css::awt::XMenu
+    virtual void SAL_CALL addMenuListener( const css::uno::Reference< css::awt::XMenuListener >& xListener ) override;
+    virtual void SAL_CALL removeMenuListener( const css::uno::Reference< css::awt::XMenuListener >& xListener ) override;
+    virtual void SAL_CALL insertItem( sal_Int16 nItemId, const OUString& aText, sal_Int16 nItemStyle, sal_Int16 nPos ) override;
+    virtual void SAL_CALL removeItem( sal_Int16 nPos, sal_Int16 nCount ) override;
+    virtual void SAL_CALL clear( ) override;
+    virtual sal_Int16 SAL_CALL getItemCount(  ) override;
+    virtual sal_Int16 SAL_CALL getItemId( sal_Int16 nPos ) override;
+    virtual sal_Int16 SAL_CALL getItemPos( sal_Int16 nId ) override;
+    virtual css::awt::MenuItemType SAL_CALL getItemType( ::sal_Int16 nItemPos ) override;
+    virtual void SAL_CALL enableItem( sal_Int16 nItemId, sal_Bool bEnable ) override;
+    virtual sal_Bool SAL_CALL isItemEnabled( sal_Int16 nItemId ) override;
+    virtual void SAL_CALL hideDisabledEntries( sal_Bool bHide ) override;
+    virtual void SAL_CALL enableAutoMnemonics( sal_Bool bEnable ) override;
+    virtual void SAL_CALL setItemText( sal_Int16 nItemId, const OUString& aText ) override;
+    virtual OUString SAL_CALL getItemText( sal_Int16 nItemId ) override;
+    virtual void SAL_CALL setCommand( sal_Int16 nItemId, const OUString& aCommand ) override;
+    virtual OUString SAL_CALL getCommand( sal_Int16 nItemId ) override;
+    virtual void SAL_CALL setHelpCommand( sal_Int16 nItemId, const OUString& aHelp ) override;
+    virtual OUString SAL_CALL getHelpCommand( sal_Int16 nItemId ) override;
+    virtual void SAL_CALL setHelpText( ::sal_Int16 nItemId, const OUString& sHelpText ) override;
+    virtual OUString SAL_CALL getHelpText( ::sal_Int16 nItemId ) override;
+    virtual void SAL_CALL setTipHelpText( ::sal_Int16 nItemId, const OUString& sTipHelpText ) override;
+    virtual OUString SAL_CALL getTipHelpText( ::sal_Int16 nItemId ) override;
+
+    virtual sal_Bool SAL_CALL isPopupMenu(  ) override;
+    virtual void SAL_CALL setPopupMenu( sal_Int16 nItemId, const css::uno::Reference< css::awt::XPopupMenu >& aPopupMenu ) override;
+    virtual css::uno::Reference< css::awt::XPopupMenu > SAL_CALL getPopupMenu( sal_Int16 nItemId ) override;
+
+    // css::awt::XPopupMenu
+    virtual void SAL_CALL insertSeparator( sal_Int16 nPos ) override;
+    virtual void SAL_CALL setDefaultItem( sal_Int16 nItemId ) override;
+    virtual sal_Int16 SAL_CALL getDefaultItem(  ) override;
+    virtual void SAL_CALL checkItem( sal_Int16 nItemId, sal_Bool bCheck ) override;
+    virtual sal_Bool SAL_CALL isItemChecked( sal_Int16 nItemId ) override;
+    virtual ::sal_Int16 SAL_CALL execute( const css::uno::Reference< css::awt::XWindowPeer >& Parent, const css::awt::Rectangle& Position, ::sal_Int16 Direction ) override;
+    virtual sal_Bool SAL_CALL isInExecute(  ) override;
+    virtual void SAL_CALL endExecute(  ) override;
+    virtual void SAL_CALL setAcceleratorKeyEvent( ::sal_Int16 nItemId, const css::awt::KeyEvent& aKeyEvent ) override;
+    virtual css::awt::KeyEvent SAL_CALL getAcceleratorKeyEvent( ::sal_Int16 nItemId ) override;
+    virtual void SAL_CALL setItemImage( ::sal_Int16 nItemId, const css::uno::Reference< css::graphic::XGraphic >& xGraphic, sal_Bool bScale ) override;
+    virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL getItemImage( ::sal_Int16 nItemId ) override;
+
+    // css::lang::XServiceInfo
+    virtual OUString SAL_CALL getImplementationName(  ) override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
+};
+
+class UNLESS_MERGELIBS(TOOLKIT_DLLPUBLIC) VCLXMenuBar final : public VCLXMenu
+{
+public:
+    VCLXMenuBar();
+    VCLXMenuBar( MenuBar* pMenuBar );
+};
+
+class TOOLKIT_DLLPUBLIC VCLXPopupMenu final : public VCLXMenu
+{
+public:
+    VCLXPopupMenu();
+    VCLXPopupMenu( PopupMenu* pPopMenu );
+};
+
+#endif // INCLUDED_TOOLKIT_AWT_VCLXMENU_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxwindow.hxx b/include/toolkit/awt/vclxwindow.hxx
new file mode 100644
index 000000000..9f3226ee6
--- /dev/null
+++ b/include/toolkit/awt/vclxwindow.hxx
@@ -0,0 +1,236 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include <toolkit/dllapi.h>
+#include <toolkit/awt/vclxdevice.hxx>
+#include <vcl/vclptr.hxx>
+
+#include <com/sun/star/awt/XWindow2.hpp>
+#include <com/sun/star/awt/XVclWindowPeer.hpp>
+#include <com/sun/star/awt/XLayoutConstrains.hpp>
+#include <com/sun/star/awt/XView.hpp>
+#include <com/sun/star/beans/XPropertySetInfo.hpp>
+#include <com/sun/star/accessibility/XAccessible.hpp>
+#include <com/sun/star/awt/XDockableWindow.hpp>
+#include <com/sun/star/awt/XStyleSettingsSupplier.hpp>
+
+#include <comphelper/servicehelper.hxx>
+#include <cppuhelper/implbase.hxx>
+
+#include <tools/gen.hxx>
+#include <tools/link.hxx>
+
+#include <memory>
+#include <vector>
+#include <functional>
+
+namespace comphelper { template <class ListenerT> class OInterfaceContainerHelper3; }
+namespace com::sun::star::accessibility { class XAccessibleContext; }
+namespace com::sun::star::awt { class XTopWindowListener; }
+namespace com::sun::star::awt { class XVclContainerListener; }
+namespace vcl { class Window; }
+
+class VclWindowEvent;
+
+namespace toolkit
+{
+    class IAccessibleFactory;
+}
+
+
+class UnoPropertyArrayHelper;
+class VCLXWindowImpl;
+typedef cppu::ImplInheritanceHelper< VCLXDevice,
+                                     css::awt::XWindow2,
+                                     css::awt::XVclWindowPeer,
+                                     css::awt::XLayoutConstrains,
+                                     css::awt::XView,
+                                     css::awt::XDockableWindow,
+                                     css::accessibility::XAccessible,
+                                     css::lang::XEventListener,
+                                     css::beans::XPropertySetInfo,
+                                     css::awt::XStyleSettingsSupplier
+                                   > VCLXWindow_Base;
+
+class TOOLKIT_DLLPUBLIC VCLXWindow : public VCLXWindow_Base
+{
+private:
+    std::unique_ptr<VCLXWindowImpl>  mpImpl;
+
+    UnoPropertyArrayHelper *GetPropHelper();
+
+protected:
+    Size            ImplCalcWindowSize( const Size& rOutSz ) const;
+    DECL_DLLPRIVATE_LINK(WindowEventListener, VclWindowEvent&, void );
+
+    virtual void    ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext >
+                    CreateAccessibleContext();
+
+    void            SetSynthesizingVCLEvent( bool b );
+    bool            IsSynthesizingVCLEvent() const;
+
+    void        SetSystemParent_Impl( const css::uno::Any& rHandle );
+
+    ::toolkit::IAccessibleFactory&  getAccessibleFactory();
+
+    // helper ...
+    static void     PushPropertyIds( std::vector< sal_uInt16 > &aIds, int nFirstId, ...);
+    // for use in controls/
+    static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds,
+                                        bool bWithDefaults = false );
+    virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds );
+
+    ::comphelper::OInterfaceContainerHelper3<css::awt::XVclContainerListener>& GetContainerListeners();
+    ::comphelper::OInterfaceContainerHelper3<css::awt::XTopWindowListener>& GetTopWindowListeners();
+
+public:
+    typedef ::std::function<void ()>  Callback;
+
+protected:
+    /** executes the given callback asynchronously
+
+        At the moment the callback is called, the Solar Mutex is not locked. In particular, this implies that
+        you cannot rely on |this| not being disposed. However, you *can* rely on |this| being still alive (i.e.
+        having a ref count > 0).
+
+        As a consequence, this can be used for doing listener notifications, using event multiplexers. Those multiplexers
+        care for the disposed state themself, and are alive as long as |this| is alive.
+    */
+    void    ImplExecuteAsyncWithoutSolarLock(
+                const Callback& i_callback
+            );
+
+public:
+    VCLXWindow( bool bWithDefaultProps = false );
+    virtual ~VCLXWindow() override;
+
+    virtual void SetWindow( const VclPtr< vcl::Window > &pWindow );
+    template< class derived_type > derived_type* GetAs() const {
+        return static_cast< derived_type * >( GetWindow() ); }
+    template< class derived_type > derived_type* GetAsDynamic() const {
+        return dynamic_cast< derived_type * >( GetWindow() ); }
+    vcl::Window* GetWindow() const
+    {
+        auto p = GetOutputDevice().get();
+        return p ? p->GetOwnerWindow() : nullptr;
+    }
+
+    void    suspendVclEventListening( );
+    void    resumeVclEventListening( );
+
+    void    notifyWindowRemoved( vcl::Window const & _rWindow );
+
+    bool IsDisposed() const;
+
+    // css::lang::XUnoTunnel
+    UNO3_GETIMPLEMENTATION_DECL(VCLXWindow)
+
+    // css::lang::XEventListener
+    virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
+
+    // css::lang::XComponent
+    void SAL_CALL dispose(  ) override;
+    void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& rxListener ) override;
+    void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& rxListener ) override;
+
+    // css::awt::XWindow
+    void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) override;
+    css::awt::Rectangle SAL_CALL getPosSize(  ) override;
+    void SAL_CALL setVisible( sal_Bool Visible ) override;
+    void SAL_CALL setEnable( sal_Bool Enable ) override;
+    void SAL_CALL setFocus(  ) override;
+    void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& rrxListener ) override;
+    void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& rrxListener ) override;
+    void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& rrxListener ) override;
+    void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& rrxListener ) override;
+    void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& rrxListener ) override;
+    void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& rrxListener ) override;
+    void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& rrxListener ) override;
+    void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& rrxListener ) override;
+    void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& rrxListener ) override;
+    void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& rrxListener ) override;
+    void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& rrxListener ) override;
+    void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& rrxListener ) override;
+
+    // css::awt::XWindowPeer
+    css::uno::Reference< css::awt::XToolkit > SAL_CALL getToolkit(  ) override;
+    void SAL_CALL setPointer( const css::uno::Reference< css::awt::XPointer >& Pointer ) override;
+    void SAL_CALL setBackground( sal_Int32 Color ) override;
+    void SAL_CALL invalidate( sal_Int16 Flags ) override;
+    void SAL_CALL invalidateRect( const css::awt::Rectangle& Rect, sal_Int16 Flags ) override;
+
+    // css::awt::XVclWindowPeer
+    sal_Bool SAL_CALL isChild( const css::uno::Reference< css::awt::XWindowPeer >& Peer ) override;
+    void SAL_CALL setDesignMode( sal_Bool bOn ) override;
+    sal_Bool SAL_CALL isDesignMode(  ) override;
+    void SAL_CALL enableClipSiblings( sal_Bool bClip ) override;
+    void SAL_CALL setForeground( sal_Int32 Color ) override;
+    void SAL_CALL setControlFont( const css::awt::FontDescriptor& aFont ) override;
+    void SAL_CALL getStyles( sal_Int16 nType, css::awt::FontDescriptor& Font, sal_Int32& ForegroundColor, sal_Int32& BackgroundColor ) override;
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
+    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
+
+    // css::awt::XLayoutConstrains
+    css::awt::Size SAL_CALL getMinimumSize(  ) override;
+    css::awt::Size SAL_CALL getPreferredSize(  ) override;
+    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) override;
+
+    // css::awt::XView
+    sal_Bool SAL_CALL setGraphics( const css::uno::Reference< css::awt::XGraphics >& aDevice ) override;
+    css::uno::Reference< css::awt::XGraphics > SAL_CALL getGraphics(  ) override;
+    css::awt::Size SAL_CALL getSize(  ) override;
+    void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) override;
+    void SAL_CALL setZoom( float fZoomX, float fZoomY ) override;
+
+    // css::accessibility::XAccessible
+    css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
+
+    // css::awt::XDockableWindow
+    void SAL_CALL addDockableWindowListener( const css::uno::Reference< css::awt::XDockableWindowListener >& xListener ) override;
+    void SAL_CALL removeDockableWindowListener( const css::uno::Reference< css::awt::XDockableWindowListener >& xListener ) override;
+    void SAL_CALL enableDocking( sal_Bool bEnable ) override;
+    sal_Bool SAL_CALL isFloating(  ) override;
+    void SAL_CALL setFloatingMode( sal_Bool bFloating ) override;
+    void SAL_CALL lock(  ) override;
+    void SAL_CALL unlock(  ) override;
+    sal_Bool SAL_CALL isLocked(  ) override;
+    void SAL_CALL startPopupMode( const css::awt::Rectangle& WindowRect ) override;
+    sal_Bool SAL_CALL isInPopupMode(  ) override;
+
+    // css::awt::XWindow2
+    void SAL_CALL setOutputSize( const css::awt::Size& aSize ) override;
+    css::awt::Size SAL_CALL getOutputSize(  ) override;
+    sal_Bool SAL_CALL isVisible(  ) override;
+    sal_Bool SAL_CALL isActive(  ) override;
+    sal_Bool SAL_CALL isEnabled(  ) override;
+    sal_Bool SAL_CALL hasFocus(  ) override;
+
+    // css::beans::XPropertySetInfo
+    css::uno::Sequence< css::beans::Property > SAL_CALL getProperties(  ) override;
+    css::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) override;
+    sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) override;
+
+    // XStyleSettingsSupplier
+    virtual css::uno::Reference< css::awt::XStyleSettings > SAL_CALL getStyleSettings() override;
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx
new file mode 100644
index 000000000..e67f6b619
--- /dev/null
+++ b/include/toolkit/awt/vclxwindows.hxx
@@ -0,0 +1,743 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include <toolkit/dllapi.h>
+
+#include <com/sun/star/awt/XTextComponent.hpp>
+#include <com/sun/star/awt/XListBox.hpp>
+#include <com/sun/star/awt/XNumericField.hpp>
+#include <com/sun/star/awt/XScrollBar.hpp>
+#include <com/sun/star/awt/XTextEditField.hpp>
+#include <com/sun/star/awt/XSpinField.hpp>
+#include <com/sun/star/awt/XTextLayoutConstrains.hpp>
+#include <com/sun/star/awt/XButton.hpp>
+#include <com/sun/star/awt/XToggleButton.hpp>
+#include <com/sun/star/awt/XFixedHyperlink.hpp>
+#include <com/sun/star/awt/XFixedText.hpp>
+#include <com/sun/star/awt/XRadioButton.hpp>
+#include <com/sun/star/awt/XComboBox.hpp>
+#include <com/sun/star/awt/XCheckBox.hpp>
+#include <com/sun/star/awt/XItemListListener.hpp>
+#include <cppuhelper/implbase.hxx>
+#include <cppuhelper/weak.hxx>
+
+#include <svl/numuno.hxx>
+#include <toolkit/awt/vclxwindow.hxx>
+#include <toolkit/helper/listenermultiplexer.hxx>
+
+#include <vcl/image.hxx>
+
+//  class VCLXGraphicControl
+//    deriving from VCLXWindow, drawing the graphic which exists as "Graphic" at the model
+
+class VCLXGraphicControl : public VCLXWindow
+{
+private:
+    /// the image we currently display
+    Image                       maImage;
+
+protected:
+    const Image&    GetImage() const { return maImage; }
+
+protected:
+    // css::awt::XWindow
+    void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) override;
+
+    // css::awt::VclWindowPeer
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
+    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
+
+protected:
+    /** forward our bitmap to our window
+        @precond
+            our mutex is locked
+        @precond
+            GetWindow is not <NULL/>
+        @see GetBitmap
+    */
+    virtual void    ImplSetNewImage();
+
+public:
+    static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+    virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+
+};
+
+
+//  class VCLXButton
+
+typedef cppu::ImplInheritanceHelper< VCLXGraphicControl,
+                                     css::awt::XButton,
+                                     css::awt::XToggleButton
+                                   > VCLXButton_Base;
+class VCLXButton final : public VCLXButton_Base
+{
+private:
+    OUString             maActionCommand;
+    ActionListenerMultiplexer   maActionListeners;
+    ItemListenerMultiplexer     maItemListeners;
+
+    void            ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override;
+
+public:
+                    VCLXButton();
+    virtual ~VCLXButton() override;
+
+    // css::lang::XComponent
+    void SAL_CALL dispose(  ) override;
+
+    // css::awt::XButton
+    void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override;
+    void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override;
+    void SAL_CALL setLabel( const OUString& Label ) override;
+    void SAL_CALL setActionCommand( const OUString& Command ) override;
+
+    // css::awt::XToggleButton
+    // css::awt::XItemEventBroadcaster
+    void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) override;
+    void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) override;
+
+    // css::awt::XLayoutConstrains
+    css::awt::Size SAL_CALL getMinimumSize(  ) override;
+    css::awt::Size SAL_CALL getPreferredSize(  ) override;
+    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& rNewSize ) override;
+
+    // css::awt::VclWindowPeer
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
+    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
+
+    static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+    virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+};
+
+//  class VCLXCheckBox
+
+class TOOLKIT_DLLPUBLIC VCLXCheckBox final : public css::awt::XCheckBox,
+                        public css::awt::XButton,
+                        public VCLXGraphicControl
+{
+private:
+    ActionListenerMultiplexer   maActionListeners;
+    OUString             maActionCommand;
+    ItemListenerMultiplexer     maItemListeners;
+
+    void    ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override;
+
+public:
+                    VCLXCheckBox();
+
+    // 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::lang::XComponent
+    void SAL_CALL dispose(  ) override;
+
+    // css::awt::XCheckBox
+    void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) override;
+    void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) override;
+    sal_Int16 SAL_CALL getState(  ) override;
+    void SAL_CALL setState( sal_Int16 n ) override;
+    void SAL_CALL setLabel( const OUString& Label ) override;
+    void SAL_CALL enableTriState( sal_Bool b ) override;
+
+    // css::awt::XButton:
+    void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override;
+    void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override;
+    void SAL_CALL setActionCommand( const OUString& Command ) override;
+
+    // css::awt::XLayoutConstrains
+    css::awt::Size SAL_CALL getMinimumSize(  ) override;
+    css::awt::Size SAL_CALL getPreferredSize(  ) override;
+    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& rNewSize ) override;
+
+    // css::awt::VclWindowPeer
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
+    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
+
+    static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+    virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+};
+
+
+//  class VCLXRadioButton
+
+class TOOLKIT_DLLPUBLIC VCLXRadioButton final : public css::awt::XRadioButton,
+                        public css::awt::XButton,
+                        public VCLXGraphicControl
+{
+private:
+    ItemListenerMultiplexer     maItemListeners;
+    ActionListenerMultiplexer   maActionListeners;
+    OUString             maActionCommand;
+
+    void            ImplClickedOrToggled( bool bToggled );
+    void            ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override;
+
+public:
+                    VCLXRadioButton();
+
+    // 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::lang::XComponent
+    void SAL_CALL dispose(  ) override;
+
+    // css::awt::XRadioButton
+    void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) override;
+    void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) override;
+    sal_Bool SAL_CALL getState(  ) override;
+    void SAL_CALL setState( sal_Bool b ) override;
+    void SAL_CALL setLabel( const OUString& Label ) override;
+
+    // css::awt::XButton:
+    void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override;
+    void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override;
+    void SAL_CALL setActionCommand( const OUString& Command ) override;
+
+    // css::awt::XLayoutConstrains
+    css::awt::Size SAL_CALL getMinimumSize(  ) override;
+    css::awt::Size SAL_CALL getPreferredSize(  ) override;
+    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& rNewSize ) override;
+
+    // css::awt::VclWindowPeer
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
+    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
+
+    static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+    virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+
+};
+
+//  class VCLXFixedHyperlink
+class VCLXFixedHyperlink final :
+    public css::awt::XFixedHyperlink,
+    public VCLXWindow
+{
+private:
+    ActionListenerMultiplexer   maActionListeners;
+
+    void                        ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
+
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext >
+                                CreateAccessibleContext() override;
+
+public:
+    VCLXFixedHyperlink();
+    virtual ~VCLXFixedHyperlink() 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::XComponent
+    void SAL_CALL dispose(  ) 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::XFixedHyperlink
+    void SAL_CALL setText( const OUString& Text ) override;
+    OUString SAL_CALL getText(  ) override;
+    void SAL_CALL setURL( const OUString& URL ) override;
+    OUString SAL_CALL getURL(  ) override;
+    void SAL_CALL setAlignment( sal_Int16 nAlign ) override;
+    sal_Int16 SAL_CALL getAlignment(  ) override;
+    void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override;
+    void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override;
+
+    // css::awt::XLayoutConstrains
+    css::awt::Size SAL_CALL getMinimumSize(  ) override;
+    css::awt::Size SAL_CALL getPreferredSize(  ) override;
+    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& rNewSize ) override;
+
+    // css::awt::VclWindowPeer
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
+    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
+
+    static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+    virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+};
+
+
+//  class VCLXFixedText
+
+class VCLXFixedText final : public css::awt::XFixedText,
+                        public VCLXWindow
+{
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override;
+
+public:
+                        VCLXFixedText();
+                        virtual ~VCLXFixedText() 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::XFixedText
+    void SAL_CALL setText( const OUString& Text ) override;
+    OUString SAL_CALL getText(  ) override;
+    void SAL_CALL setAlignment( sal_Int16 nAlign ) override;
+    sal_Int16 SAL_CALL getAlignment(  ) override;
+
+    // css::awt::XLayoutConstrains
+    css::awt::Size SAL_CALL getMinimumSize(  ) override;
+    css::awt::Size SAL_CALL getPreferredSize(  ) override;
+    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& rNewSize ) override;
+
+    static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+    virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+};
+
+
+//  class VCLXScrollBar
+
+class TOOLKIT_DLLPUBLIC VCLXScrollBar final : public css::awt::XScrollBar,
+                        public VCLXWindow
+{
+private:
+    AdjustmentListenerMultiplexer maAdjustmentListeners;
+
+    void            ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override;
+
+public:
+                    VCLXScrollBar();
+    // 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::lang::XComponent
+    void SAL_CALL dispose(  ) override;
+
+    // css::awt::XScrollbar
+    void SAL_CALL addAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener >& l ) override;
+    void SAL_CALL removeAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener >& l ) override;
+    void SAL_CALL setValue( sal_Int32 n ) override;
+    void SAL_CALL setValues( sal_Int32 nValue, sal_Int32 nVisible, sal_Int32 nMax ) override;
+    sal_Int32 SAL_CALL getValue(  ) override;
+    void SAL_CALL setMaximum( sal_Int32 n ) override;
+    sal_Int32 SAL_CALL getMaximum(  ) override;
+    void SAL_CALL setLineIncrement( sal_Int32 n ) override;
+    sal_Int32 SAL_CALL getLineIncrement(  ) override;
+    void SAL_CALL setBlockIncrement( sal_Int32 n ) override;
+    sal_Int32 SAL_CALL getBlockIncrement(  ) override;
+    void SAL_CALL setVisibleSize( sal_Int32 n ) override;
+    sal_Int32 SAL_CALL getVisibleSize(  ) override;
+    void SAL_CALL setOrientation( sal_Int32 n ) override;
+    sal_Int32 SAL_CALL getOrientation(  ) override;
+
+    // why isn't this part of the XScrollbar?
+    /// @throws css::uno::RuntimeException
+    void setMinimum( sal_Int32 n );
+    /// @throws css::uno::RuntimeException
+    sal_Int32 getMinimum(  ) const;
+
+    // css::awt::VclWindowPeer
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
+    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
+
+    // css::awt::XLayoutConstrains
+    css::awt::Size SAL_CALL getMinimumSize() override;
+    /// @throws css::uno::RuntimeException
+    static css::awt::Size implGetMinimumSize( vcl::Window const * p );
+
+    static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+    virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+};
+
+
+//  class VCLXEdit
+
+class SAL_DLLPUBLIC_RTTI VCLXEdit :  public css::awt::XTextComponent,
+                    public css::awt::XTextEditField,
+                    public css::awt::XTextLayoutConstrains,
+                    public VCLXWindow
+{
+private:
+    TextListenerMultiplexer maTextListeners;
+
+protected:
+    void            ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override;
+
+
+public:
+                    VCLXEdit();
+
+    TextListenerMultiplexer&    GetTextListeners() { return maTextListeners; }
+
+    // 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::lang::XComponent
+    void SAL_CALL dispose(  ) 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;
+    void SAL_CALL setText( const OUString& aText ) override;
+    void SAL_CALL insertText( const css::awt::Selection& Sel, const OUString& Text ) override;
+    OUString SAL_CALL getText(  ) override;
+    OUString SAL_CALL getSelectedText(  ) override;
+    void SAL_CALL setSelection( const css::awt::Selection& aSelection ) override;
+    css::awt::Selection SAL_CALL getSelection(  ) override;
+    sal_Bool SAL_CALL isEditable(  ) override;
+    void SAL_CALL setEditable( sal_Bool bEditable ) override;
+    void SAL_CALL setMaxTextLen( sal_Int16 nLen ) override;
+    sal_Int16 SAL_CALL getMaxTextLen(  ) override;
+
+    // css::awt::XTextEditField:
+    void SAL_CALL setEchoChar( sal_Unicode cEcho ) override;
+
+    // css::awt::XLayoutConstrains
+    css::awt::Size SAL_CALL getMinimumSize(  ) override;
+    css::awt::Size SAL_CALL getPreferredSize(  ) override;
+    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& rNewSize ) override;
+
+    // css::awt::XTextLayoutConstrains
+    css::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) override;
+    void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) override;
+
+    // css::awt::VclWindowPeer
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
+    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
+
+    static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+    virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+};
+
+
+//  class VCLXSpinField
+class VCLXSpinField : public css::awt::XSpinField, public VCLXEdit
+{
+private:
+    SpinListenerMultiplexer maSpinListeners;
+
+protected:
+    void            ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
+
+public:
+                    VCLXSpinField();
+
+    // 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::XSpinField
+    void SAL_CALL addSpinListener( const css::uno::Reference< css::awt::XSpinListener >& l ) override;
+    void SAL_CALL removeSpinListener( const css::uno::Reference< css::awt::XSpinListener >& l ) override;
+    void SAL_CALL up(  ) override;
+    void SAL_CALL down(  ) override;
+    void SAL_CALL first(  ) override;
+    void SAL_CALL last(  ) override;
+    void SAL_CALL enableRepeat( sal_Bool bRepeat ) override;
+
+    static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+    virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+};
+
+class SVTXFormattedField : public VCLXSpinField
+{
+protected:
+    rtl::Reference<SvNumberFormatsSupplierObj> m_xCurrentSupplier;
+    bool                    bIsStandardSupplier;
+
+    sal_Int32                   nKeyToSetDelayed;
+
+public:
+    SVTXFormattedField();
+    virtual ~SVTXFormattedField() 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;
+
+protected:
+    void    setFormatsSupplier(const css::uno::Reference< css::util::XNumberFormatsSupplier > & xSupplier);
+    sal_Int32   getFormatKey() const;
+    void    setFormatKey(sal_Int32 nKey);
+
+    void    SetValue(const css::uno::Any& rValue);
+    css::uno::Any  GetValue() const;
+
+    void    SetTreatAsNumber(bool bSet);
+    bool    GetTreatAsNumber() const;
+
+    void    SetDefaultValue(const css::uno::Any& rValue);
+    css::uno::Any  GetDefaultValue() const;
+
+    void    SetMinValue(const css::uno::Any& rValue);
+    css::uno::Any  GetMinValue() const;
+
+    void    SetMaxValue(const css::uno::Any& rValue);
+    css::uno::Any  GetMaxValue() const;
+
+    void    NotifyTextListeners();
+    css::uno::Any  convertEffectiveValue(const css::uno::Any& rValue) const;
+
+    virtual void    SetWindow( const VclPtr< vcl::Window > &_pWindow) override;
+
+    static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+    virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+};
+
+class TOOLKIT_DLLPUBLIC SVTXNumericField final : public css::awt::XNumericField, public SVTXFormattedField
+{
+public:
+                    SVTXNumericField();
+                    virtual ~SVTXNumericField() 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::XNumericField
+    void SAL_CALL setValue( double Value ) override;
+    double SAL_CALL getValue(  ) override;
+    void SAL_CALL setMin( double Value ) override;
+    double SAL_CALL getMin(  ) override;
+    void SAL_CALL setMax( double Value ) override;
+    double SAL_CALL getMax(  ) override;
+    void SAL_CALL setFirst( double Value ) override;
+    double SAL_CALL getFirst(  ) override;
+    void SAL_CALL setLast( double Value ) override;
+    double SAL_CALL getLast(  ) override;
+    void SAL_CALL setSpinSize( double Value ) override;
+    double SAL_CALL getSpinSize(  ) override;
+    void SAL_CALL setDecimalDigits( sal_Int16 nDigits ) override;
+    sal_Int16 SAL_CALL getDecimalDigits(  ) override;
+    void SAL_CALL setStrictFormat( sal_Bool bStrict ) override;
+    sal_Bool SAL_CALL isStrictFormat(  ) override;
+
+    virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override;
+
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override;
+};
+
+//  class VCLXListBox
+
+typedef cppu::ImplInheritanceHelper< VCLXWindow,
+                                     css::awt::XListBox,
+                                     css::awt::XTextLayoutConstrains,
+                                     css::awt::XItemListListener
+                                   > VCLXListBox_Base;
+class VCLXListBox final : public VCLXListBox_Base
+{
+private:
+    ActionListenerMultiplexer   maActionListeners;
+    ItemListenerMultiplexer     maItemListeners;
+
+    virtual void    ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext >
+                    CreateAccessibleContext() override;
+    void            ImplCallItemListeners();
+
+public:
+                        VCLXListBox();
+
+    // css::lang::XComponent
+    void SAL_CALL dispose(  ) override;
+
+    // css::awt::XListBox
+    void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) override;
+    void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) override;
+    void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override;
+    void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override;
+    void SAL_CALL addItem( const OUString& aItem, sal_Int16 nPos ) override;
+    void SAL_CALL addItems( const css::uno::Sequence< OUString >& aItems, sal_Int16 nPos ) override;
+    void SAL_CALL removeItems( sal_Int16 nPos, sal_Int16 nCount ) override;
+    sal_Int16 SAL_CALL getItemCount(  ) override;
+    OUString SAL_CALL getItem( sal_Int16 nPos ) override;
+    css::uno::Sequence< OUString > SAL_CALL getItems(  ) override;
+    sal_Int16 SAL_CALL getSelectedItemPos(  ) override;
+    css::uno::Sequence< sal_Int16 > SAL_CALL getSelectedItemsPos(  ) override;
+    OUString SAL_CALL getSelectedItem(  ) override;
+    css::uno::Sequence< OUString > SAL_CALL getSelectedItems(  ) override;
+    void SAL_CALL selectItemPos( sal_Int16 nPos, sal_Bool bSelect ) override;
+    void SAL_CALL selectItemsPos( const css::uno::Sequence< sal_Int16 >& aPositions, sal_Bool bSelect ) override;
+    void SAL_CALL selectItem( const OUString& aItem, sal_Bool bSelect ) override;
+    sal_Bool SAL_CALL isMutipleMode(  ) override;
+    void SAL_CALL setMultipleMode( sal_Bool bMulti ) override;
+    sal_Int16 SAL_CALL getDropDownLineCount(  ) override;
+    void SAL_CALL setDropDownLineCount( sal_Int16 nLines ) override;
+    void SAL_CALL makeVisible( sal_Int16 nEntry ) override;
+
+    // css::awt::XLayoutConstrains
+    css::awt::Size SAL_CALL getMinimumSize(  ) override;
+    css::awt::Size SAL_CALL getPreferredSize(  ) override;
+    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& rNewSize ) override;
+
+    // css::awt::XTextLayoutConstrains
+    css::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) override;
+    void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) override;
+
+    // css::awt::VclWindowPeer
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
+    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
+
+    // XItemListListener
+    virtual void SAL_CALL listItemInserted( const css::awt::ItemListEvent& Event ) override;
+    virtual void SAL_CALL listItemRemoved( const css::awt::ItemListEvent& Event ) override;
+    virtual void SAL_CALL listItemModified( const css::awt::ItemListEvent& Event ) override;
+    virtual void SAL_CALL allItemsRemoved( const css::lang::EventObject& Event ) override;
+    virtual void SAL_CALL itemListChanged( const css::lang::EventObject& Event ) override;
+
+    // XEventListener
+    virtual void SAL_CALL disposing( const css::lang::EventObject& i_rEvent ) override;
+
+    static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+    virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+};
+
+
+//  class VCLXComboBox
+
+typedef cppu::ImplInheritanceHelper< VCLXEdit,
+                                     css::awt::XComboBox,
+                                     css::awt::XItemListListener
+                                   > VCLXComboBox_Base;
+class VCLXComboBox final : public VCLXComboBox_Base
+{
+private:
+    ActionListenerMultiplexer   maActionListeners;
+    ItemListenerMultiplexer     maItemListeners;
+
+    void            ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override;
+
+
+public:
+                        VCLXComboBox();
+    virtual ~VCLXComboBox() override;
+
+     // css::lang::XComponent
+    void SAL_CALL dispose(  ) override;
+
+    // css::awt::XComboBox
+    void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) override;
+    void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& l ) override;
+    void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override;
+    void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) override;
+    void SAL_CALL addItem( const OUString& aItem, sal_Int16 nPos ) override;
+    void SAL_CALL addItems( const css::uno::Sequence< OUString >& aItems, sal_Int16 nPos ) override;
+    void SAL_CALL removeItems( sal_Int16 nPos, sal_Int16 nCount ) override;
+    sal_Int16 SAL_CALL getItemCount(  ) override;
+    OUString SAL_CALL getItem( sal_Int16 nPos ) override;
+    css::uno::Sequence< OUString > SAL_CALL getItems(  ) override;
+    sal_Int16 SAL_CALL getDropDownLineCount(  ) override;
+    void SAL_CALL setDropDownLineCount( sal_Int16 nLines ) override;
+
+    // css::awt::XLayoutConstrains
+    css::awt::Size SAL_CALL getMinimumSize(  ) override;
+    css::awt::Size SAL_CALL getPreferredSize(  ) override;
+    css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& rNewSize ) override;
+
+    // css::awt::XTextLayoutConstrains
+    css::awt::Size SAL_CALL getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) override;
+    void SAL_CALL getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) override;
+
+    // css::awt::VclWindowPeer
+    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
+    css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
+
+    // XItemListListener
+    virtual void SAL_CALL listItemInserted( const css::awt::ItemListEvent& Event ) override;
+    virtual void SAL_CALL listItemRemoved( const css::awt::ItemListEvent& Event ) override;
+    virtual void SAL_CALL listItemModified( const css::awt::ItemListEvent& Event ) override;
+    virtual void SAL_CALL allItemsRemoved( const css::lang::EventObject& Event ) override;
+    virtual void SAL_CALL itemListChanged( const css::lang::EventObject& Event ) override;
+    // XEventListener
+    virtual void SAL_CALL disposing( const css::lang::EventObject& i_rEvent ) override;
+
+    static void     ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+    virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
+};
+
+//  class VCLXToolBox
+class VCLXToolBox final : public VCLXWindow
+{
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext >
+                        CreateAccessibleContext() override;
+
+public:
+                        VCLXToolBox();
+                        virtual ~VCLXToolBox() override;
+};
+
+class VCLXHeaderBar final : public VCLXWindow
+{
+public:
+    VCLXHeaderBar();
+    virtual ~VCLXHeaderBar() override;
+
+    virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override;
+
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */