move some toolkit/ headers inside the module

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

9 files changed, 0 insertions, 833 deletions

diff --git a/include/toolkit/awt/animatedimagespeer.hxx b/include/toolkit/awt/animatedimagespeer.hxx
deleted file mode 100644
index ee1747394ca6..000000000000
--- a/include/toolkit/awt/animatedimagespeer.hxx
+++ /dev/null
@@ -1,97 +0,0 @@
-/* -*- 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_ANIMATEDIMAGESPEER_HXX
-#define INCLUDED_TOOLKIT_AWT_ANIMATEDIMAGESPEER_HXX
-
-#include <toolkit/awt/vclxwindow.hxx>
-#include <com/sun/star/container/XContainerListener.hpp>
-
-#include <com/sun/star/awt/XAnimation.hpp>
-#include <com/sun/star/util/XModifyListener.hpp>
-
-#include <cppuhelper/implbase.hxx>
-
-#include <memory>
-
-namespace toolkit
-{
-
-
-    //= AnimatedImagesPeer
-
-    struct AnimatedImagesPeer_Data;
-    typedef cppu::ImplInheritanceHelper< VCLXWindow,
-                                         css::awt::XAnimation,
-                                         css::container::XContainerListener,
-                                         css::util::XModifyListener
-                                       > AnimatedImagesPeer_Base;
-
-    class AnimatedImagesPeer final : public AnimatedImagesPeer_Base
-    {
-    public:
-        AnimatedImagesPeer();
-
-    private:
-        virtual ~AnimatedImagesPeer() override;
-
-    public:
-        // XAnimation
-        virtual void SAL_CALL startAnimation(  ) override;
-        virtual void SAL_CALL stopAnimation(  ) override;
-        virtual sal_Bool SAL_CALL isAnimationRunning(  ) override;
-
-        // VclWindowPeer
-        virtual void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
-        virtual css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
-
-        // XContainerListener
-        virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) override;
-        virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) override;
-        virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) override;
-
-        // XEventListener
-        virtual void SAL_CALL disposing( const css::lang::EventObject& i_event ) override;
-
-        // XModifyListener
-        virtual void SAL_CALL modified( const css::lang::EventObject& i_event ) override;
-
-        // XComponent
-        void SAL_CALL dispose(  ) override;
-
-    private:
-        void ProcessWindowEvent( const VclWindowEvent& i_windowEvent ) override;
-
-        /** updates our images with the ones from the given XAnimatedImages component
-        */
-        void    impl_updateImages_nolck( const css::uno::Reference< css::uno::XInterface >& i_animatedImages );
-
-        AnimatedImagesPeer(const AnimatedImagesPeer&) = delete;
-        AnimatedImagesPeer& operator=(const AnimatedImagesPeer&) = delete;
-
-        std::unique_ptr< AnimatedImagesPeer_Data >   m_xData;
-    };
-
-
-} // namespace toolkit
-
-
-#endif // INCLUDED_TOOLKIT_AWT_ANIMATEDIMAGESPEER_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxbitmap.hxx b/include/toolkit/awt/vclxbitmap.hxx
deleted file mode 100644
index 40201ae82784..000000000000
--- a/include/toolkit/awt/vclxbitmap.hxx
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- 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_VCLXBITMAP_HXX
-#define INCLUDED_TOOLKIT_AWT_VCLXBITMAP_HXX
-
-#include <com/sun/star/awt/XBitmap.hpp>
-#include <com/sun/star/awt/XDisplayBitmap.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <comphelper/servicehelper.hxx>
-#include <cppuhelper/implbase.hxx>
-#include <osl/mutex.hxx>
-#include <vcl/bitmapex.hxx>
-
-
-
-
-class VCLXBitmap final : public cppu::WeakImplHelper<
-                            css::awt::XBitmap,
-                            css::awt::XDisplayBitmap,
-                            css::lang::XUnoTunnel>
-{
-    ::osl::Mutex    maMutex;
-    BitmapEx        maBitmap;
-
-    ::osl::Mutex&   GetMutex() { return maMutex; }
-
-
-public:
-    void            SetBitmap( const BitmapEx& rBmp )   { maBitmap = rBmp; }
-    const BitmapEx& GetBitmap() const                   { return maBitmap; }
-
-    // css::lang::XUnoTunnel
-    UNO3_GETIMPLEMENTATION_DECL(VCLXBitmap)
-
-    // css::awt::XBitmap
-    css::awt::Size                 SAL_CALL getSize() override;
-    css::uno::Sequence< sal_Int8 > SAL_CALL getDIB() override;
-    css::uno::Sequence< sal_Int8 > SAL_CALL getMaskDIB() override;
-};
-
-
-#endif // INCLUDED_TOOLKIT_AWT_VCLXBITMAP_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxgraphics.hxx b/include/toolkit/awt/vclxgraphics.hxx
deleted file mode 100644
index 0689e48b9e56..000000000000
--- a/include/toolkit/awt/vclxgraphics.hxx
+++ /dev/null
@@ -1,126 +0,0 @@
-/* -*- 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_VCLXGRAPHICS_HXX
-#define INCLUDED_TOOLKIT_AWT_VCLXGRAPHICS_HXX
-
-
-#include <com/sun/star/awt/XGraphics2.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <comphelper/servicehelper.hxx>
-#include <cppuhelper/implbase.hxx>
-
-#include <vcl/font.hxx>
-#include <tools/color.hxx>
-#include <vcl/vclenum.hxx>
-#include <vcl/vclptr.hxx>
-#include <o3tl/typed_flags_set.hxx>
-#include <memory>
-
-class OutputDevice;
-namespace vcl { class Region; }
-namespace com { namespace sun { namespace star { namespace graphic { class XGraphic; } } } }
-
-
-enum class InitOutDevFlags
-{
-    NONE         = 0x0000,
-    FONT         = 0x0001,
-    COLORS       = 0x0002,
-};
-namespace o3tl
-{
-    template<> struct typed_flags<InitOutDevFlags> : is_typed_flags<InitOutDevFlags, 0x03> {};
-}
-
-
-
-
-class VCLXGraphics final : public cppu::WeakImplHelper<
-                        css::awt::XGraphics2,
-                        css::lang::XUnoTunnel>
-{
-private:
-    // used to return same reference on each call to getDevice()
-    css::uno::Reference< css::awt::XDevice> mxDevice;
-
-    VclPtr<OutputDevice> mpOutputDevice;
-    vcl::Font       maFont;
-    Color           maTextColor;
-    Color           maTextFillColor;
-    Color           maLineColor;
-    Color           maFillColor;
-    RasterOp        meRasterOp;
-    std::unique_ptr<vcl::Region> mpClipRegion;
-
-    void initAttrs();
-
-public:
-                    VCLXGraphics();
-                    virtual ~VCLXGraphics() override;
-
-    void            Init( OutputDevice* pOutDev );
-    void            InitOutputDevice( InitOutDevFlags nFlags );
-
-    void            SetOutputDevice( OutputDevice* pOutDev );
-    OutputDevice*   GetOutputDevice() const { return mpOutputDevice; }
-
-    // css::lang::XUnoTunnel
-    UNO3_GETIMPLEMENTATION_DECL(VCLXGraphics)
-
-    // css::awt::XGraphics Attributes
-    virtual css::uno::Reference< css::awt::XDevice > SAL_CALL getDevice() override;
-    virtual void SAL_CALL setTextColor( ::sal_Int32 _textcolor ) override;
-    virtual void SAL_CALL setTextFillColor( ::sal_Int32 _textfillcolor ) override;
-    virtual void SAL_CALL setLineColor( ::sal_Int32 _linecolor ) override;
-    virtual void SAL_CALL setFillColor( ::sal_Int32 _fillcolor ) override;
-    virtual void SAL_CALL setRasterOp( css::awt::RasterOperation _rasterop ) override;
-    virtual void SAL_CALL setFont( const css::uno::Reference< css::awt::XFont >& _font ) override;
-    virtual css::awt::SimpleFontMetric SAL_CALL getFontMetric() override;
-
-    // css::awt::XGraphics Methods
-    virtual void SAL_CALL selectFont( const css::awt::FontDescriptor& aDescription ) override;
-    virtual void SAL_CALL setClipRegion( const css::uno::Reference< css::awt::XRegion >& Clipping ) override;
-    virtual void SAL_CALL intersectClipRegion( const css::uno::Reference< css::awt::XRegion >& xClipping ) override;
-    virtual void SAL_CALL push(  ) override;
-    virtual void SAL_CALL pop(  ) override;
-    virtual void SAL_CALL clear( const css::awt::Rectangle& aRect ) override;
-    virtual void SAL_CALL copy( const css::uno::Reference< css::awt::XDevice >& xSource, ::sal_Int32 nSourceX, ::sal_Int32 nSourceY, ::sal_Int32 nSourceWidth, ::sal_Int32 nSourceHeight, ::sal_Int32 nDestX, ::sal_Int32 nDestY, ::sal_Int32 nDestWidth, ::sal_Int32 nDestHeight ) override;
-    virtual void SAL_CALL draw( const css::uno::Reference< css::awt::XDisplayBitmap >& xBitmapHandle, ::sal_Int32 SourceX, ::sal_Int32 SourceY, ::sal_Int32 SourceWidth, ::sal_Int32 SourceHeight, ::sal_Int32 DestX, ::sal_Int32 DestY, ::sal_Int32 DestWidth, ::sal_Int32 DestHeight ) override;
-    virtual void SAL_CALL drawPixel( ::sal_Int32 X, ::sal_Int32 Y ) override;
-    virtual void SAL_CALL drawLine( ::sal_Int32 X1, ::sal_Int32 Y1, ::sal_Int32 X2, ::sal_Int32 Y2 ) override;
-    virtual void SAL_CALL drawRect( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height ) override;
-    virtual void SAL_CALL drawRoundedRect( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height, ::sal_Int32 nHorzRound, ::sal_Int32 nVertRound ) override;
-    virtual void SAL_CALL drawPolyLine( const css::uno::Sequence< ::sal_Int32 >& DataX, const css::uno::Sequence< ::sal_Int32 >& DataY ) override;
-    virtual void SAL_CALL drawPolygon( const css::uno::Sequence< ::sal_Int32 >& DataX, const css::uno::Sequence< ::sal_Int32 >& DataY ) override;
-    virtual void SAL_CALL drawPolyPolygon( const css::uno::Sequence< css::uno::Sequence< ::sal_Int32 > >& DataX, const css::uno::Sequence< css::uno::Sequence< ::sal_Int32 > >& DataY ) override;
-    virtual void SAL_CALL drawEllipse( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height ) override;
-    virtual void SAL_CALL drawArc( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height, ::sal_Int32 X1, ::sal_Int32 Y1, ::sal_Int32 X2, ::sal_Int32 Y2 ) override;
-    virtual void SAL_CALL drawPie( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height, ::sal_Int32 X1, ::sal_Int32 Y1, ::sal_Int32 X2, ::sal_Int32 Y2 ) override;
-    virtual void SAL_CALL drawChord( ::sal_Int32 nX, ::sal_Int32 nY, ::sal_Int32 nWidth, ::sal_Int32 nHeight, ::sal_Int32 nX1, ::sal_Int32 nY1, ::sal_Int32 nX2, ::sal_Int32 nY2 ) override;
-    virtual void SAL_CALL drawGradient( ::sal_Int32 nX, ::sal_Int32 nY, ::sal_Int32 nWidth, ::sal_Int32 Height, const css::awt::Gradient& aGradient ) override;
-    virtual void SAL_CALL drawText( ::sal_Int32 X, ::sal_Int32 Y, const OUString& Text ) override;
-    virtual void SAL_CALL drawTextArray( ::sal_Int32 X, ::sal_Int32 Y, const OUString& Text, const css::uno::Sequence< ::sal_Int32 >& Longs ) override;
-    virtual void SAL_CALL drawImage( ::sal_Int32 nX, ::sal_Int32 nY, ::sal_Int32 nWidth, ::sal_Int32 nHeight, ::sal_Int16 nStyle, const css::uno::Reference< css::graphic::XGraphic >& aGraphic ) override;
-};
-
-#endif // INCLUDED_TOOLKIT_AWT_VCLXGRAPHICS_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxpointer.hxx b/include/toolkit/awt/vclxpointer.hxx
deleted file mode 100644
index 8346637a074d..000000000000
--- a/include/toolkit/awt/vclxpointer.hxx
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- 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_VCLXPOINTER_HXX
-#define INCLUDED_TOOLKIT_AWT_VCLXPOINTER_HXX
-
-
-#include <com/sun/star/awt/XPointer.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <comphelper/servicehelper.hxx>
-#include <cppuhelper/implbase.hxx>
-#include <osl/mutex.hxx>
-
-#include <vcl/ptrstyle.hxx>
-
-
-
-
-class VCLXPointer final : public cppu::WeakImplHelper<
-    css::awt::XPointer, css::lang::XUnoTunnel, css::lang::XServiceInfo>
-{
-    ::osl::Mutex    maMutex;
-    PointerStyle    maPointer;
-
-    ::osl::Mutex&   GetMutex() { return maMutex; }
-
-public:
-    VCLXPointer();
-    virtual ~VCLXPointer() override;
-
-    PointerStyle GetPointer() const { return maPointer; }
-
-    // css::lang::XUnoTunnel
-    UNO3_GETIMPLEMENTATION_DECL(VCLXPointer)
-
-    // css::awt::XPointer
-    void SAL_CALL setType( sal_Int32 nType ) override;
-    sal_Int32 SAL_CALL getType(  ) override;
-
-    OUString SAL_CALL getImplementationName() override;
-
-    sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override;
-
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
-};
-
-
-#endif // INCLUDED_TOOLKIT_AWT_VCLXPOINTER_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxprinter.hxx b/include/toolkit/awt/vclxprinter.hxx
deleted file mode 100644
index e03a3a7b2044..000000000000
--- a/include/toolkit/awt/vclxprinter.hxx
+++ /dev/null
@@ -1,195 +0,0 @@
-/* -*- 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_VCLXPRINTER_HXX
-#define INCLUDED_TOOLKIT_AWT_VCLXPRINTER_HXX
-
-
-#include <com/sun/star/awt/XPrinterPropertySet.hpp>
-#include <com/sun/star/awt/XPrinterServer2.hpp>
-#include <com/sun/star/awt/XInfoPrinter.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-
-#include <toolkit/helper/mutexandbroadcasthelper.hxx>
-#include <cppuhelper/propshlp.hxx>
-#include <cppuhelper/implbase.hxx>
-#include <comphelper/uno3.hxx>
-#include <vcl/vclptr.hxx>
-#include <vcl/jobset.hxx>
-
-namespace com { namespace sun { namespace star { namespace awt { class XPrinter; } } } }
-namespace vcl { class OldStylePrintAdaptor; }
-class Printer;
-
-// relevant properties for the printer:
-/*
-     sal_Bool   Horizontal
-     sal_uInt16 CopyCount;
-     sal_Bool   Collate;
-     String FormDescriptor;
-     sal_uInt16 Orientation;    // PORTRAIT, LANDSCAPE
-*/
-
-
-
-
-typedef ::cppu::WeakImplHelper <   css::awt::XPrinterPropertySet
-                                >   VCLXPrinterPropertySet_Base;
-class VCLXPrinterPropertySet    :public VCLXPrinterPropertySet_Base
-                                ,public MutexAndBroadcastHelper
-                                ,public ::cppu::OPropertySetHelper
-{
-protected:
-    VclPtr<Printer>             mxPrinter;
-    css::uno::Reference< css::awt::XDevice >  mxPrnDevice;
-
-    sal_Int16                   mnOrientation;
-    bool                        mbHorizontal;
-public:
-    VCLXPrinterPropertySet( const OUString& rPrinterName );
-    virtual ~VCLXPrinterPropertySet() override;
-
-    Printer*                    GetPrinter() const { return mxPrinter.get(); }
-    css::uno::Reference< css::awt::XDevice > const &  GetDevice();
-
-    // css::uno::XInterface
-    DECLARE_XINTERFACE();
-
-    // css::lang::XTypeProvider
-    DECLARE_XTYPEPROVIDER();
-
-    // css::beans::XPropertySet
-    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override;
-    void SAL_CALL setPropertyValue( const OUString& rPropertyName, const css::uno::Any& aValue ) override { OPropertySetHelper::setPropertyValue( rPropertyName, aValue ); }
-    css::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName ) override { return OPropertySetHelper::getPropertyValue( rPropertyName ); }
-    void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& rxListener ) override { OPropertySetHelper::addPropertyChangeListener( rPropertyName, rxListener ); }
-    void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& rxListener ) override { OPropertySetHelper::removePropertyChangeListener( rPropertyName, rxListener ); }
-    void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& rxListener ) override { OPropertySetHelper::addVetoableChangeListener( rPropertyName, rxListener ); }
-    void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& rxListener ) override { OPropertySetHelper::removeVetoableChangeListener( rPropertyName, rxListener ); }
-
-    // ::cppu::OPropertySetHelper
-    ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
-    sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) override;
-    void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override;
-    using cppu::OPropertySetHelper::getFastPropertyValue;
-    void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const override;
-
-    // css::awt::XPrinterPropertySet
-    void SAL_CALL setHorizontal( sal_Bool bHorizontal ) override;
-    css::uno::Sequence< OUString > SAL_CALL getFormDescriptions(  ) override;
-    void SAL_CALL selectForm( const OUString& aFormDescription ) override;
-    css::uno::Sequence< sal_Int8 > SAL_CALL getBinarySetup(  ) override;
-    void SAL_CALL setBinarySetup( const css::uno::Sequence< sal_Int8 >& data ) override;
-};
-
-
-
-
-typedef ::cppu::ImplInheritanceHelper  <   VCLXPrinterPropertySet
-                                        ,   css::awt::XPrinter
-                                        >   VCLXPrinter_Base;
-class VCLXPrinter final : public VCLXPrinter_Base
-{
-    std::shared_ptr<vcl::OldStylePrintAdaptor>    mxListener;
-    JobSetup                                      maInitJobSetup;
-public:
-                    VCLXPrinter( const OUString& rPrinterName );
-                    virtual ~VCLXPrinter() override;
-
-    // css::beans::XPropertySet
-    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override { return VCLXPrinterPropertySet::getPropertySetInfo(); }
-    void SAL_CALL setPropertyValue( const OUString& rPropertyName, const css::uno::Any& aValue ) override { VCLXPrinterPropertySet::setPropertyValue( rPropertyName, aValue ); }
-    css::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName ) override { return VCLXPrinterPropertySet::getPropertyValue( rPropertyName ); }
-    void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& rxListener ) override { VCLXPrinterPropertySet::addPropertyChangeListener( rPropertyName, rxListener ); }
-    void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& rxListener ) override { VCLXPrinterPropertySet::removePropertyChangeListener( rPropertyName, rxListener ); }
-    void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& rxListener ) override { VCLXPrinterPropertySet::addVetoableChangeListener( rPropertyName, rxListener ); }
-    void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& rxListener ) override { VCLXPrinterPropertySet::removeVetoableChangeListener( rPropertyName, rxListener ); }
-
-    // css::awt::XPrinterPropertySet
-    void SAL_CALL setHorizontal( sal_Bool bHorizontal ) override { VCLXPrinterPropertySet::setHorizontal( bHorizontal ); }
-    css::uno::Sequence< OUString > SAL_CALL getFormDescriptions(  ) override { return VCLXPrinterPropertySet::getFormDescriptions(); }
-    void SAL_CALL selectForm( const OUString& aFormDescription ) override { VCLXPrinterPropertySet::selectForm( aFormDescription ); }
-    css::uno::Sequence< sal_Int8 > SAL_CALL getBinarySetup(  ) override { return VCLXPrinterPropertySet::getBinarySetup(); }
-    void SAL_CALL setBinarySetup( const css::uno::Sequence< sal_Int8 >& data ) override { VCLXPrinterPropertySet::setBinarySetup( data ); }
-
-    // css::awt::XPrinter
-    sal_Bool SAL_CALL start( const OUString& nJobName, sal_Int16 nCopies, sal_Bool nCollate ) override;
-    void SAL_CALL end(  ) override;
-    void SAL_CALL terminate(  ) override;
-    css::uno::Reference< css::awt::XDevice > SAL_CALL startPage(  ) override;
-    void SAL_CALL endPage(  ) override;
-};
-
-
-
-
-typedef ::cppu::ImplInheritanceHelper  <   VCLXPrinterPropertySet
-                                        ,   css::awt::XInfoPrinter
-                                        >   VCLXInfoPrinter_Base;
-class VCLXInfoPrinter final : public VCLXInfoPrinter_Base
-{
-public:
-                        VCLXInfoPrinter( const OUString& rPrinterName );
-                        virtual ~VCLXInfoPrinter() override;
-
-    // css::beans::XPropertySet
-    css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) override { return VCLXPrinterPropertySet::getPropertySetInfo(); }
-    void SAL_CALL setPropertyValue( const OUString& rPropertyName, const css::uno::Any& aValue ) override { VCLXPrinterPropertySet::setPropertyValue( rPropertyName, aValue ); }
-    css::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName ) override { return VCLXPrinterPropertySet::getPropertyValue( rPropertyName ); }
-    void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& rxListener ) override { VCLXPrinterPropertySet::addPropertyChangeListener( rPropertyName, rxListener ); }
-    void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& rxListener ) override { VCLXPrinterPropertySet::removePropertyChangeListener( rPropertyName, rxListener ); }
-    void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& rxListener ) override { VCLXPrinterPropertySet::addVetoableChangeListener( rPropertyName, rxListener ); }
-    void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& rxListener ) override { VCLXPrinterPropertySet::removeVetoableChangeListener( rPropertyName, rxListener ); }
-
-    // css::awt::XPrinterPropertySet
-    void SAL_CALL setHorizontal( sal_Bool bHorizontal ) override { VCLXPrinterPropertySet::setHorizontal( bHorizontal ); }
-    css::uno::Sequence< OUString > SAL_CALL getFormDescriptions(  ) override { return VCLXPrinterPropertySet::getFormDescriptions(); }
-    void SAL_CALL selectForm( const OUString& aFormDescription ) override { VCLXPrinterPropertySet::selectForm( aFormDescription ); }
-    css::uno::Sequence< sal_Int8 > SAL_CALL getBinarySetup(  ) override { return VCLXPrinterPropertySet::getBinarySetup(); }
-    void SAL_CALL setBinarySetup( const css::uno::Sequence< sal_Int8 >& data ) override { VCLXPrinterPropertySet::setBinarySetup( data ); }
-
-    // css::awt::XInfoPrinter
-    css::uno::Reference< css::awt::XDevice > SAL_CALL createDevice(  ) override;
-};
-
-
-
-
-typedef ::cppu::WeakImplHelper <   css::awt::XPrinterServer2,
-                                   css::lang::XServiceInfo
-                                >   VCLXPrinterServer_Base;
-class VCLXPrinterServer final : public VCLXPrinterServer_Base
-{
-public:
-    // css::awt::XPrinterServer2
-    css::uno::Sequence< OUString > SAL_CALL getPrinterNames(  ) override;
-    OUString SAL_CALL getDefaultPrinterName() override;
-    css::uno::Reference< css::awt::XPrinter > SAL_CALL createPrinter( const OUString& printerName ) override;
-    css::uno::Reference< css::awt::XInfoPrinter > SAL_CALL createInfoPrinter( const OUString& printerName ) override;
-
-    OUString SAL_CALL getImplementationName() override;
-
-    sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override;
-
-    css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
-};
-
-#endif // INCLUDED_TOOLKIT_AWT_VCLXPRINTER_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxregion.hxx b/include/toolkit/awt/vclxregion.hxx
deleted file mode 100644
index d4c43ef31730..000000000000
--- a/include/toolkit/awt/vclxregion.hxx
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- 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_VCLXREGION_HXX
-#define INCLUDED_TOOLKIT_AWT_VCLXREGION_HXX
-
-
-#include <com/sun/star/awt/XRegion.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <comphelper/servicehelper.hxx>
-#include <cppuhelper/implbase.hxx>
-#include <osl/mutex.hxx>
-
-#include <vcl/region.hxx>
-
-
-
-
-class VCLXRegion final : public cppu::WeakImplHelper<
-                            css::awt::XRegion,
-                            css::lang::XUnoTunnel>
-{
-    ::osl::Mutex    maMutex;
-    vcl::Region          maRegion;
-
-    ::osl::Mutex&   GetMutex() { return maMutex; }
-
-public:
-                    VCLXRegion();
-                    virtual ~VCLXRegion() override;
-
-    const vcl::Region&   GetRegion() const                   { return maRegion; }
-
-    // css::lang::XUnoTunnel
-    UNO3_GETIMPLEMENTATION_DECL(VCLXRegion)
-
-    // css::awt::XRegion
-     css::awt::Rectangle       SAL_CALL getBounds() override;
-     void                                   SAL_CALL clear() override;
-     void                                   SAL_CALL move( sal_Int32 nHorzMove, sal_Int32 nVertMove ) override;
-     void                                   SAL_CALL unionRectangle( const css::awt::Rectangle& rRect ) override;
-     void                                   SAL_CALL intersectRectangle( const css::awt::Rectangle& rRect ) override;
-     void                                   SAL_CALL excludeRectangle( const css::awt::Rectangle& rRect ) override;
-     void                                   SAL_CALL xOrRectangle( const css::awt::Rectangle& rRect ) override;
-     void                                   SAL_CALL unionRegion( const css::uno::Reference< css::awt::XRegion >& rxRegion ) override;
-     void                                   SAL_CALL intersectRegion( const css::uno::Reference< css::awt::XRegion >& rxRegion ) override;
-     void                                   SAL_CALL excludeRegion( const css::uno::Reference< css::awt::XRegion >& rxRegion ) override;
-     void                                   SAL_CALL xOrRegion( const css::uno::Reference< css::awt::XRegion >& rxRegion ) override;
-     css::uno::Sequence< css::awt::Rectangle > SAL_CALL getRectangles() override;
-
-};
-
-
-#endif // INCLUDED_TOOLKIT_AWT_VCLXREGION_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxspinbutton.hxx b/include/toolkit/awt/vclxspinbutton.hxx
deleted file mode 100644
index 5074c591645c..000000000000
--- a/include/toolkit/awt/vclxspinbutton.hxx
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*- 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_VCLXSPINBUTTON_HXX
-#define INCLUDED_TOOLKIT_AWT_VCLXSPINBUTTON_HXX
-
-#include <toolkit/awt/vclxwindow.hxx>
-#include <toolkit/helper/listenermultiplexer.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <comphelper/uno3.hxx>
-#include <com/sun/star/awt/XSpinValue.hpp>
-
-
-namespace toolkit
-{
-
-
-    //= VCLXSpinButton
-
-    typedef ::cppu::ImplHelper1 <   css::awt::XSpinValue
-                                >   VCLXSpinButton_Base;
-
-    class VCLXSpinButton final : public VCLXWindow
-                         ,public VCLXSpinButton_Base
-    {
-    private:
-        AdjustmentListenerMultiplexer maAdjustmentListeners;
-
-    public:
-        VCLXSpinButton();
-
-    private:
-        virtual ~VCLXSpinButton( ) override;
-
-        // XInterface
-        DECLARE_XINTERFACE()
-
-        // XTypeProvider
-        DECLARE_XTYPEPROVIDER()
-
-        // XComponent
-        void SAL_CALL dispose( ) override;
-
-        // XSpinValue
-        virtual void SAL_CALL addAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener >& listener ) override;
-        virtual void SAL_CALL removeAdjustmentListener( const css::uno::Reference< css::awt::XAdjustmentListener >& listener ) override;
-        virtual void SAL_CALL setValue( sal_Int32 n ) override;
-        virtual void SAL_CALL setValues( sal_Int32 minValue, sal_Int32 maxValue, sal_Int32 currentValue ) override;
-        virtual sal_Int32 SAL_CALL getValue(  ) override;
-        virtual void SAL_CALL setMinimum( sal_Int32 minValue ) override;
-        virtual void SAL_CALL setMaximum( sal_Int32 maxValue ) override;
-        virtual sal_Int32 SAL_CALL getMinimum(  ) override;
-        virtual sal_Int32 SAL_CALL getMaximum(  ) override;
-        virtual void SAL_CALL setSpinIncrement( sal_Int32 spinIncrement ) override;
-        virtual sal_Int32 SAL_CALL getSpinIncrement(  ) override;
-        virtual void SAL_CALL setOrientation( sal_Int32 orientation ) override;
-        virtual sal_Int32 SAL_CALL getOrientation(  ) override;
-
-        // VclWindowPeer
-        virtual void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
-        virtual css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
-
-        // VCLXWindow
-        void ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent ) override;
-
-        VCLXSpinButton( const VCLXSpinButton& ) = delete;
-        VCLXSpinButton& operator=( const VCLXSpinButton& ) = delete;
-    };
-
-
-} // namespacetoolkit
-
-
-#endif // TOOLKIT_INC_ INCLUDED_TOOLKIT_AWT_VCLXSPINBUTTON_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxsystemdependentwindow.hxx b/include/toolkit/awt/vclxsystemdependentwindow.hxx
deleted file mode 100644
index 04e65d1b5df6..000000000000
--- a/include/toolkit/awt/vclxsystemdependentwindow.hxx
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- 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_VCLXSYSTEMDEPENDENTWINDOW_HXX
-#define INCLUDED_TOOLKIT_AWT_VCLXSYSTEMDEPENDENTWINDOW_HXX
-
-
-#include <com/sun/star/awt/XSystemDependentWindowPeer.hpp>
-#include <cppuhelper/weak.hxx>
-
-#include <toolkit/awt/vclxwindow.hxx>
-
-class VCLXSystemDependentWindow final : public css::awt::XSystemDependentWindowPeer,
-                                                    public VCLXWindow
-{
-public:
-    VCLXSystemDependentWindow();
-    virtual ~VCLXSystemDependentWindow() 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;
-
-    // css::awt::XSystemDependentWindowPeer
-    css::uno::Any SAL_CALL getWindowHandle( const css::uno::Sequence< sal_Int8 >& ProcessId, sal_Int16 SystemType ) override;
-};
-
-
-#endif // INCLUDED_TOOLKIT_AWT_VCLXSYSTEMDEPENDENTWINDOW_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxtabpagecontainer.hxx b/include/toolkit/awt/vclxtabpagecontainer.hxx
deleted file mode 100644
index ffb6feb5ad73..000000000000
--- a/include/toolkit/awt/vclxtabpagecontainer.hxx
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- 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_VCLXTABPAGECONTAINER_HXX
-#define INCLUDED_TOOLKIT_AWT_VCLXTABPAGECONTAINER_HXX
-
-#include <com/sun/star/container/XContainerListener.hpp>
-#include <com/sun/star/awt/tab/XTabPageContainer.hpp>
-#include <cppuhelper/implbase.hxx>
-#include <toolkit/helper/listenermultiplexer.hxx>
-#include <toolkit/awt/vclxcontainer.hxx>
-
-
-typedef cppu::ImplInheritanceHelper< VCLXContainer,
-                                     css::awt::tab::XTabPageContainer,
-                                     css::container::XContainerListener
-                                   > VCLXTabPageContainer_Base;
-class VCLXTabPageContainer final : public VCLXTabPageContainer_Base
-{
-public:
-    VCLXTabPageContainer();
-    virtual ~VCLXTabPageContainer() override;
-
-    // css::awt::XView
-    void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) override;
-
-    // css::awt::grid::XTabPageContainer
-    virtual ::sal_Int16 SAL_CALL getActiveTabPageID() override;
-    virtual void SAL_CALL setActiveTabPageID( ::sal_Int16 _activetabpageid ) override;
-    virtual ::sal_Int16 SAL_CALL getTabPageCount(  ) override;
-    virtual sal_Bool SAL_CALL isTabPageActive( ::sal_Int16 tabPageIndex ) override;
-    virtual css::uno::Reference< css::awt::tab::XTabPage > SAL_CALL getTabPage( ::sal_Int16 tabPageIndex ) override;
-    virtual css::uno::Reference< css::awt::tab::XTabPage > SAL_CALL getTabPageByID( ::sal_Int16 tabPageID ) override;
-    virtual void SAL_CALL addTabPageContainerListener( const css::uno::Reference< css::awt::tab::XTabPageContainerListener >& listener ) override;
-    virtual void SAL_CALL removeTabPageContainerListener( const css::uno::Reference< css::awt::tab::XTabPageContainerListener >& listener ) override;
-
-    virtual void    GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override;
-
-    virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
-    virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) override;
-    virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) override;
-    virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) override;
-
-    // css::awt::XVclWindowPeer
-    void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
-private:
-    virtual void    ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
-
-    TabPageListenerMultiplexer m_aTabPageListeners;
-    ::std::vector< css::uno::Reference< css::awt::tab::XTabPage > > m_aTabPages;
-};
-#endif // INCLUDED_TOOLKIT_AWT_VCLXTABPAGECONTAINER_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */