move SvTreeListBox to vcl

Change-Id: I04a146d3d8a428ac1678827dc883525c40240a44
Reviewed-on: https://gerrit.libreoffice.org/62787
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

36 files changed, 583 insertions, 128 deletions

diff --git a/include/svtools/accessiblefactory.hxx b/include/svtools/accessiblefactory.hxx
index bfd6e9a57cc9..05c5715cc0ef 100644
--- a/include/svtools/accessiblefactory.hxx
+++ b/include/svtools/accessiblefactory.hxx
@@ -106,12 +106,6 @@ namespace svt
             ) const = 0;
 
         virtual css::uno::Reference< css::accessibility::XAccessible >
-            createAccessibleTreeListBox(
-                SvTreeListBox& _rListBox,
-                const css::uno::Reference< css::accessibility::XAccessible >& _xParent
-            ) const = 0;
-
-        virtual css::uno::Reference< css::accessibility::XAccessible >
             createAccessibleBrowseBoxHeaderBar(
                 const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
                 IAccessibleTableProvider& _rOwningTable,
diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index 3311843c658d..e300fe997fa6 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -25,7 +25,7 @@
 #include <vcl/vclptr.hxx>
 #include <tools/multisel.hxx>
 #include <svtools/headbar.hxx>
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
 #include <svtools/AccessibleBrowseBoxObjType.hxx>
 #include <svtools/accessibletableprovider.hxx>
 #include <vector>
diff --git a/include/svtools/embedtransfer.hxx b/include/svtools/embedtransfer.hxx
index 7a6fa184b563..ca69d2b28386 100644
--- a/include/svtools/embedtransfer.hxx
+++ b/include/svtools/embedtransfer.hxx
@@ -22,7 +22,7 @@
 
 #include <svtools/svtdllapi.h>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
 #include <memory>
 
 class Graphic;
diff --git a/include/svtools/fileview.hxx b/include/svtools/fileview.hxx
index 973313dadd4a..af19027a2601 100644
--- a/include/svtools/fileview.hxx
+++ b/include/svtools/fileview.hxx
@@ -16,8 +16,8 @@
  *   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_SVTOOLS_FILEVIEW_HXX
-#define INCLUDED_SVTOOLS_FILEVIEW_HXX
+#ifndef INCLUDED_VCL_FILEVIEW_HXX
+#define INCLUDED_VCL_FILEVIEW_HXX
 
 #include <memory>
 #include <svtools/svtdllapi.h>
@@ -222,6 +222,6 @@ public:
 
 }
 
-#endif // INCLUDED_SVTOOLS_FILEVIEW_HXX
+#endif // INCLUDED_VCL_FILEVIEW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svtools/foldertree.hxx b/include/svtools/foldertree.hxx
index 5f71cbf244b9..8f925de475ae 100644
--- a/include/svtools/foldertree.hxx
+++ b/include/svtools/foldertree.hxx
@@ -17,7 +17,6 @@
 #include <officecfg/Office/Common.hxx>
 
 #include <svtools/svtdllapi.h>
-#include <svtools/treelistentry.hxx>
 
 #include <tools/urlobj.hxx>
 
@@ -25,6 +24,7 @@
 
 #include <vcl/image.hxx>
 #include <vcl/lstbox.hxx>
+#include <vcl/treelistentry.hxx>
 
 using namespace ::com::sun::star::ucb;
 using namespace ::com::sun::star::uno;
diff --git a/include/svtools/iconview.hxx b/include/svtools/iconview.hxx
index 0bc974051f0d..2281d35e94d4 100644
--- a/include/svtools/iconview.hxx
+++ b/include/svtools/iconview.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SVTOOLS_ICONVIEW_HXX
 
 #include <svtools/svtdllapi.h>
-#include <svtools/treelistbox.hxx>
+#include <vcl/treelistbox.hxx>
 
 class IconView : public SvTreeListBox
 {
diff --git a/include/svtools/insdlg.hxx b/include/svtools/insdlg.hxx
index 1c37552e87c1..9aae287249b8 100644
--- a/include/svtools/insdlg.hxx
+++ b/include/svtools/insdlg.hxx
@@ -26,7 +26,7 @@
 #include <sot/formats.hxx>
 
 #include <vector>
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
 
 class SvObjectServer
 {
diff --git a/include/svtools/stringtransfer.hxx b/include/svtools/stringtransfer.hxx
index a0b7f500ab43..6f65b746180b 100644
--- a/include/svtools/stringtransfer.hxx
+++ b/include/svtools/stringtransfer.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SVTOOLS_STRINGTRANSFER_HXX
 
 #include <svtools/svtdllapi.h>
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
 
 
 namespace svt
diff --git a/include/svtools/svtabbx.hxx b/include/svtools/svtabbx.hxx
index 65277e05f372..c33ccc5993c8 100644
--- a/include/svtools/svtabbx.hxx
+++ b/include/svtools/svtabbx.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_SVTOOLS_SVTABBX_HXX
 
 #include <svtools/svtdllapi.h>
-#include <svtools/treelistbox.hxx>
+#include <vcl/treelistbox.hxx>
 #include <svtools/accessibletableprovider.hxx>
 
 #include <memory>
diff --git a/include/svx/checklbx.hxx b/include/svx/checklbx.hxx
index b9eb98e36071..c4fdf21cf341 100644
--- a/include/svx/checklbx.hxx
+++ b/include/svx/checklbx.hxx
@@ -22,7 +22,7 @@
 
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
-#include <svtools/treelistbox.hxx>
+#include <vcl/treelistbox.hxx>
 #include <svx/svxdllapi.h>
 #include <tools/contnr.hxx>
 #include <tools/solar.h>
diff --git a/include/svx/colrctrl.hxx b/include/svx/colrctrl.hxx
index dd7a179da93e..66addcee31c5 100644
--- a/include/svx/colrctrl.hxx
+++ b/include/svx/colrctrl.hxx
@@ -22,7 +22,7 @@
 #include <sal/types.h>
 #include <sfx2/dockwin.hxx>
 #include <svl/lstner.hxx>
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
 #include <svtools/valueset.hxx>
 #include <svx/SvxColorValueSet.hxx>
 #include <svx/xtable.hxx>
diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index c6c15baf5148..72cfe2024123 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -24,10 +24,10 @@
 #include <sal/types.h>
 #include <svx/svxdllapi.h>
 #include <svtools/simptabl.hxx>
-#include <svtools/svlbitm.hxx>
+#include <vcl/svlbitm.hxx>
 #include <svtools/svtabbx.hxx>
-#include <svtools/treelistbox.hxx>
-#include <svtools/treelistentry.hxx>
+#include <vcl/treelistbox.hxx>
+#include <vcl/treelistentry.hxx>
 #include <tools/color.hxx>
 #include <tools/contnr.hxx>
 #include <tools/date.hxx>
diff --git a/include/svx/dbaexchange.hxx b/include/svx/dbaexchange.hxx
index 7d905d2d5841..ffae51c0849a 100644
--- a/include/svx/dbaexchange.hxx
+++ b/include/svx/dbaexchange.hxx
@@ -23,7 +23,7 @@
 #include <sal/config.h>
 
 #include <o3tl/typed_flags_set.hxx>
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <svx/dataaccessdescriptor.hxx>
diff --git a/include/svx/dbaobjectex.hxx b/include/svx/dbaobjectex.hxx
index 533b53624f96..e9410ea65632 100644
--- a/include/svx/dbaobjectex.hxx
+++ b/include/svx/dbaobjectex.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SVX_DBAOBJECTEX_HXX
 #define INCLUDED_SVX_DBAOBJECTEX_HXX
 
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/ucb/XContent.hpp>
diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx
index d85c639a46c1..39cb7c77c894 100644
--- a/include/svx/fmgridcl.hxx
+++ b/include/svx/fmgridcl.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/container/XNameContainer.hpp>
 
 #include <svx/gridctrl.hxx>
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
 #include <svx/svxdllapi.h>
 #include <memory>
 
diff --git a/include/svx/fontlb.hxx b/include/svx/fontlb.hxx
index 876c22fc32af..8cb9fedc90fc 100644
--- a/include/svx/fontlb.hxx
+++ b/include/svx/fontlb.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SVX_FONTLB_HXX
 
 #include <svtools/svtabbx.hxx>
-#include <svtools/svlbitm.hxx>
+#include <vcl/svlbitm.hxx>
 #include <vcl/virdev.hxx>
 #include <svx/svxdllapi.h>
 
diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx
index 9bae181fb115..16eda958e21c 100644
--- a/include/svx/galctrl.hxx
+++ b/include/svx/galctrl.hxx
@@ -28,7 +28,7 @@
 #include <vcl/edit.hxx>
 #include <vcl/combobox.hxx>
 #include <svl/slstitm.hxx>
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
 #include <svtools/valueset.hxx>
 #include <svtools/brwbox.hxx>
 #include <vcl/GraphicObject.hxx>
diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx
index 6a2d05a95655..2c21b09ae822 100644
--- a/include/svx/galmisc.hxx
+++ b/include/svx/galmisc.hxx
@@ -22,9 +22,9 @@
 
 #include <sot/formats.hxx>
 #include <tools/urlobj.hxx>
-#include <svtools/imap.hxx>
+#include <vcl/imap.hxx>
 #include <svl/hint.hxx>
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
 #include <svx/svdobj.hxx>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/awt/XProgressMonitor.hpp>
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index be0ef9ec2be9..28d73582a091 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -28,7 +28,7 @@
 #include <vcl/weld.hxx>
 #include <svl/SfxBroadcaster.hxx>
 #include <svl/lstner.hxx>
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/galmisc.hxx>
 #include <memory>
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index 278db98ab41d..56bf87726d6b 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -34,7 +34,7 @@
 #include <svtools/editbrowsebox.hxx>
 #include <osl/mutex.hxx>
 #include <comphelper/propmultiplex.hxx>
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
 #include <svx/svxdllapi.h>
 #include <o3tl/typed_flags_set.hxx>
 #include <memory>
diff --git a/include/svx/xmlexchg.hxx b/include/svx/xmlexchg.hxx
index 371dd5a833e3..ac4070fa3d11 100644
--- a/include/svx/xmlexchg.hxx
+++ b/include/svx/xmlexchg.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SVX_XMLEXCHG_HXX
 
 #include <rtl/ustring.hxx>
-#include <svtools/transfer.hxx>
+#include <vcl/transfer.hxx>
 #include <svx/svxdllapi.h>
 
 namespace com {
diff --git a/include/svtools/imap.hxx b/include/vcl/imap.hxx
index 98835c15bb19..bba9ebe6b84c 100644
--- a/include/svtools/imap.hxx
+++ b/include/vcl/imap.hxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVTOOLS_IMAP_HXX
-#define INCLUDED_SVTOOLS_IMAP_HXX
+#ifndef INCLUDED_VCL_IMAP_HXX
+#define INCLUDED_VCL_IMAP_HXX
 
-#include <svtools/imapobj.hxx>
-#include <svtools/svtdllapi.h>
+#include <vcl/imapobj.hxx>
+#include <vcl/dllapi.h>
 #include <tools/stream.hxx>
 #include <memory>
 #include <vector>
@@ -32,7 +32,7 @@ class Size;
 class Fraction;
 class IMapObject;
 
-class SVT_DLLPUBLIC ImageMap final
+class VCL_DLLPUBLIC ImageMap final
 {
 private:
 
@@ -133,6 +133,6 @@ public:
                     ~IMapCompat();
 };
 
-#endif // INCLUDED_SVTOOLS_IMAP_HXX
+#endif // INCLUDED_VCL_IMAP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svtools/imapcirc.hxx b/include/vcl/imapcirc.hxx
index 92e06ed88e0c..f021f7ddffde 100644
--- a/include/svtools/imapcirc.hxx
+++ b/include/vcl/imapcirc.hxx
@@ -16,16 +16,16 @@
  *   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_SVTOOLS_IMAPCIRC_HXX
-#define INCLUDED_SVTOOLS_IMAPCIRC_HXX
+#ifndef INCLUDED_VCL_IMAPCIRC_HXX
+#define INCLUDED_VCL_IMAPCIRC_HXX
 
-#include <svtools/svtdllapi.h>
+#include <vcl/dllapi.h>
 #include <tools/gen.hxx>
-#include <svtools/imapobj.hxx>
+#include <vcl/imapobj.hxx>
 
 class Fraction;
 
-class SVT_DLLPUBLIC IMapCircleObject : public IMapObject
+class VCL_DLLPUBLIC IMapCircleObject : public IMapObject
 {
     Point               aCenter;
     sal_Int32               nRadius;
diff --git a/include/svtools/imapobj.hxx b/include/vcl/imapobj.hxx
index be3261abe5e0..1e5ab2e5c18c 100644
--- a/include/svtools/imapobj.hxx
+++ b/include/vcl/imapobj.hxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVTOOLS_IMAPOBJ_HXX
-#define INCLUDED_SVTOOLS_IMAPOBJ_HXX
+#ifndef INCLUDED_VCL_IMAPOBJ_HXX
+#define INCLUDED_VCL_IMAPOBJ_HXX
 
-#include <svtools/svtdllapi.h>
+#include <vcl/dllapi.h>
 #include <svl/macitem.hxx>
 #include <rtl/strbuf.hxx>
 
@@ -48,7 +48,7 @@ class SvStream;
 #define IMAP_ERR_OK         0x00000000L
 #define IMAP_ERR_FORMAT     0x00000001L
 
-class SVT_DLLPUBLIC IMapObject
+class VCL_DLLPUBLIC IMapObject
 {
     friend class        ImageMap;
 
diff --git a/include/svtools/imappoly.hxx b/include/vcl/imappoly.hxx
index 088cf9760deb..a285085e8a69 100644
--- a/include/svtools/imappoly.hxx
+++ b/include/vcl/imappoly.hxx
@@ -17,22 +17,22 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVTOOLS_IMAPPOLY_HXX
-#define INCLUDED_SVTOOLS_IMAPPOLY_HXX
+#ifndef INCLUDED_VCL_IMAPPOLY_HXX
+#define INCLUDED_VCL_IMAPPOLY_HXX
 
-#include <svtools/svtdllapi.h>
-#include <svtools/imapobj.hxx>
+#include <vcl/dllapi.h>
+#include <vcl/imapobj.hxx>
 #include <tools/poly.hxx>
 
 class Fraction;
 
-class SVT_DLLPUBLIC IMapPolygonObject : public IMapObject
+class VCL_DLLPUBLIC IMapPolygonObject : public IMapObject
 {
     tools::Polygon aPoly;
     tools::Rectangle           aEllipse;
     bool                bEllipse;
 
-    SVT_DLLPRIVATE void ImpConstruct( const tools::Polygon& rPoly, bool bPixel );
+    VCL_DLLPRIVATE void ImpConstruct( const tools::Polygon& rPoly, bool bPixel );
 
 protected:
 
diff --git a/include/svtools/imaprect.hxx b/include/vcl/imaprect.hxx
index 709f803cb9a4..49fabcff5147 100644
--- a/include/svtools/imaprect.hxx
+++ b/include/vcl/imaprect.hxx
@@ -16,20 +16,20 @@
  *   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_SVTOOLS_IMAPRECT_HXX
-#define INCLUDED_SVTOOLS_IMAPRECT_HXX
+#ifndef INCLUDED_VCL_IMAPRECT_HXX
+#define INCLUDED_VCL_IMAPRECT_HXX
 
-#include <svtools/svtdllapi.h>
-#include <svtools/imapobj.hxx>
+#include <vcl/dllapi.h>
+#include <vcl/imapobj.hxx>
 #include <tools/gen.hxx>
 
 class Fraction;
 
-class SVT_DLLPUBLIC IMapRectangleObject : public IMapObject
+class VCL_DLLPUBLIC IMapRectangleObject : public IMapObject
 {
     tools::Rectangle           aRect;
 
-    SVT_DLLPRIVATE void             ImpConstruct( const tools::Rectangle& rRect, bool bPixel );
+    VCL_DLLPRIVATE void             ImpConstruct( const tools::Rectangle& rRect, bool bPixel );
 
 protected:
 
diff --git a/include/svtools/inetimg.hxx b/include/vcl/inetimg.hxx
index f173f7bc72e7..374a2122dfc6 100644
--- a/include/svtools/inetimg.hxx
+++ b/include/vcl/inetimg.hxx
@@ -16,8 +16,8 @@
  *   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_SVTOOLS_INETIMG_HXX
-#define INCLUDED_SVTOOLS_INETIMG_HXX
+#ifndef INCLUDED_VCL_INETIMG_HXX
+#define INCLUDED_VCL_INETIMG_HXX
 
 #include <tools/gen.hxx>
 #include <sot/formats.hxx>
@@ -54,7 +54,7 @@ public:
     bool Read( SvStream& rIStm, SotClipboardFormatId nFormat );
 };
 
-#endif // INCLUDED_SVTOOLS_INETIMG_HXX
+#endif // INCLUDED_VCL_INETIMG_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/svimpbox.hxx b/include/vcl/svimpbox.hxx
new file mode 100644
index 000000000000..1ce5681f398b
--- /dev/null
+++ b/include/vcl/svimpbox.hxx
@@ -0,0 +1,413 @@
+/* -*- 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_VCL_SOURCE_INC_SVIMPBOX_HXX
+#define INCLUDED_VCL_SOURCE_INC_SVIMPBOX_HXX
+
+#include <vcl/dllapi.h>
+#include <vcl/seleng.hxx>
+#include <vcl/scrbar.hxx>
+#include <vcl/vclevent.hxx>
+#include <unotools/intlwrapper.hxx>
+#include <o3tl/enumarray.hxx>
+#include <memory>
+#include <vector>
+
+class SvTreeListBox;
+class Point;
+class SvTreeList;
+class SvImpLBox;
+class SvTreeListEntry;
+class SvLBoxTab;
+namespace comphelper
+{
+    namespace string
+    {
+        class NaturalStringSorter;
+    }
+}
+
+class ImpLBSelEng : public FunctionSet
+{
+    SvImpLBox*          pImp;
+    VclPtr<SvTreeListBox>  pView;
+
+public:
+    ImpLBSelEng( SvImpLBox* pImp, SvTreeListBox* pView );
+    virtual ~ImpLBSelEng() override;
+    void        BeginDrag() override;
+    void        CreateAnchor() override;
+    void        DestroyAnchor() override;
+    void        SetCursorAtPoint( const Point& rPoint,
+                    bool bDontSelectAtCursor=false ) override;
+    bool        IsSelectionAtPoint( const Point& rPoint ) override;
+    void        DeselectAtPoint( const Point& rPoint ) override;
+    void        DeselectAll() override;
+};
+
+// Flags for nFlag
+enum class LBoxFlags {
+    NONE                        = 0x0000,
+    InScrolling                 = 0x0001,
+    DeselectAll                 = 0x0002,
+    StartEditTimer              = 0x0004,  // MAC only
+    IgnoreSelect                = 0x0008,
+    InResize                    = 0x0010,
+    RemovedEntryInvisible       = 0x0020,
+    RemovedRecalcMostRight      = 0x0040,
+    IgnoreChangedTabs           = 0x0080,
+    InPaint                     = 0x0100,
+    EndScrollSetVisSize         = 0x0200,
+    Filling                     = 0x0400,
+};
+namespace o3tl
+{
+    template<> struct typed_flags<LBoxFlags> : is_typed_flags<LBoxFlags, 0x07ff> {};
+}
+
+#define NODE_BMP_TABDIST_NOTVALID   -2000000
+#define FIRST_ENTRY_TAB             1
+
+class VCL_DLLPUBLIC SvImpLBox
+{
+friend class ImpLBSelEng;
+friend class SvTreeListBox;
+friend class IconView;
+private:
+    SvTreeList*          pTree;
+    SvTreeListEntry*     pAnchor;
+    SvTreeListEntry*     pMostRightEntry;
+    SvLBoxButton*        pActiveButton;
+    SvTreeListEntry*     pActiveEntry;
+    SvLBoxTab*           pActiveTab;
+
+    VclPtr<ScrollBar>    aHorSBar;
+    VclPtr<ScrollBarBox> aScrBarBox;
+
+    static Image*       s_pDefCollapsed;
+    static Image*       s_pDefExpanded;
+    static oslInterlockedCount  s_nImageRefCount; /// When 0 all static images will be destroyed
+
+    // Node Bitmaps
+    enum class ImageType
+    {
+        NodeExpanded = 0,     // node is expanded ( usually a bitmap showing a minus )
+        NodeCollapsed,        // node is collapsed ( usually a bitmap showing a plus )
+        NodeDontKnow,         // don't know the node state
+        EntryDefExpanded,     // default for expanded entries
+        EntryDefCollapsed,    // default for collapsed entries
+        LAST = EntryDefCollapsed
+    };
+
+    // all our images
+    o3tl::enumarray<ImageType, Image>
+                        m_aNodeAndEntryImages;
+
+    ImpLBSelEng         aFctSet;
+    Idle                aAsyncBeginDragIdle;
+    Point               aAsyncBeginDragPos;
+
+    long                nNodeBmpWidth;
+    long                nMostRight;
+    short               nHorSBarHeight, nVerSBarWidth;
+    sal_uInt16          nCurTabPos;
+
+    bool                bUpdateMode : 1;
+    bool                bAsyncBeginDrag : 1;
+    bool                bSubLstOpRet : 1;   // open/close sublist with return/enter, defaulted with false
+    bool                bSubLstOpLR : 1;    // open/close sublist with cursor left/right, defaulted with false
+    bool                bSubLstOpDblClick : 1; // open/close sublist with mouse double click, defaulted with true
+    bool                bContextMenuHandling : 1;
+    bool                bIsCellFocusEnabled : 1;
+    bool                bAreChildrenTransient;
+    bool                mbForceMakeVisible;
+
+    Point               aEditClickPos;
+    Idle                aEditIdle;
+
+    std::unique_ptr<comphelper::string::NaturalStringSorter> m_pStringSorter;
+
+    std::vector< short > aContextBmpWidthVector;
+
+    DECL_LINK(EditTimerCall, Timer *, void);
+
+    DECL_LINK( BeginDragHdl, Timer*, void );
+
+    void                InvalidateEntriesFrom( long nY ) const;
+    bool                IsLineVisible( long nY ) const;
+    void                KeyLeftRight( long nDiff );
+
+    void                DrawNet(vcl::RenderContext& rRenderContext);
+
+    // ScrollBar-Handler
+    DECL_LINK( ScrollUpDownHdl, ScrollBar*, void );
+    DECL_LINK( ScrollLeftRightHdl, ScrollBar*, void );
+    DECL_LINK( EndScrollHdl, ScrollBar*, void );
+
+    void                SetNodeBmpWidth( const Image& );
+    void                SetNodeBmpTabDistance();
+
+    // Selection-Engine
+    SvTreeListEntry*    MakePointVisible( const Point& rPoint );
+
+    void                SetAnchorSelection( SvTreeListEntry* pOld,
+                            SvTreeListEntry* pNewCursor );
+    void                BeginDrag();
+    bool                ButtonDownCheckCtrl( const MouseEvent& rMEvt, SvTreeListEntry* pEntry );
+    bool                MouseMoveCheckCtrl( const MouseEvent& rMEvt, SvTreeListEntry const * pEntry );
+    bool                ButtonUpCheckCtrl( const MouseEvent& rMEvt );
+    bool                ButtonDownCheckExpand( const MouseEvent&, SvTreeListEntry* );
+
+    bool                EntryReallyHit(SvTreeListEntry* pEntry, const Point& rPos, long nLine);
+    void                InitScrollBarBox();
+    SvLBoxTab*          NextTab( SvLBoxTab const * );
+
+    bool                SetMostRight( SvTreeListEntry* pEntry );
+    void                FindMostRight( SvTreeListEntry* pParent, SvTreeListEntry* EntryToIgnore );
+    void                FindMostRight_Impl( SvTreeListEntry* pParent,SvTreeListEntry* EntryToIgnore  );
+    void                NotifyTabsChanged();
+
+    // if element at cursor can be expanded in general
+    bool                IsExpandable() const;
+
+    static  void        implInitDefaultNodeImages();
+
+    void                UpdateStringSorter();
+
+    short               UpdateContextBmpWidthVector( SvTreeListEntry const * pEntry, short nWidth );
+    void                UpdateContextBmpWidthMax( SvTreeListEntry const * pEntry );
+    void                UpdateContextBmpWidthVectorFromMovedEntry( SvTreeListEntry* pEntry );
+
+    void                CalcCellFocusRect( SvTreeListEntry const * pEntry, tools::Rectangle& rRect );
+
+    bool                AreChildrenTransient() const { return bAreChildrenTransient; }
+    void                SetChildrenNotTransient() { bAreChildrenTransient = false; }
+
+protected:
+    VclPtr<SvTreeListBox>   pView;
+    VclPtr<ScrollBar>       aVerSBar;
+    SvTreeListEntry*        pCursor;
+    SvTreeListEntry*        pStartEntry;
+    ImplSVEvent*            nCurUserEvent;
+    Size                    aOutputSize;
+    LBoxFlags               nFlags;
+    WinBits                 m_nStyle;
+    bool                    mbNoAutoCurEntry; // disable the behavior of automatically selecting a "CurEntry" upon painting the control
+    SelectionEngine         aSelEng;
+    sal_uLong               nVisibleCount;  // Number of lines in control
+    bool                    bInVScrollHdl : 1;
+    bool                    bSimpleTravel : 1; // is true if SelectionMode::Single
+    long                    nNextVerVisSize;
+    long                    nNodeBmpTabDistance; // typical smaller than 0
+
+    virtual long        GetEntryLine( SvTreeListEntry* pEntry ) const;
+    virtual void        CursorDown();
+    virtual void        CursorUp();
+    virtual void        PageDown( sal_uInt16 nDelta );
+    virtual void        PageUp( sal_uInt16 nDelta );
+    // set Thumb to FirstEntryToDraw
+    virtual void        SyncVerThumb();
+    virtual void        AdjustScrollBars( Size& rSize );
+    virtual void        InvalidateEntry( long nY ) const;
+
+    tools::Rectangle           GetVisibleArea() const;
+    void                SetCursor( SvTreeListEntry* pEntry, bool bForceNoSelect = false );
+    void                BeginScroll();
+    void                EndScroll();
+    void                PositionScrollBars( Size& rOSize, sal_uInt16 nMask );
+    void                FindMostRight( SvTreeListEntry const * EntryToIgnore );
+    void                FillView();
+    void                ShowVerSBar();
+    void                StopUserEvent();
+
+    DECL_LINK( MyUserEvent,  void*, void);
+
+public:
+    SvImpLBox( SvTreeListBox* pView, SvTreeList*, WinBits nWinStyle );
+    virtual ~SvImpLBox();
+
+    void                Clear();
+    void                SetStyle( WinBits i_nWinStyle );
+    void                SetNoAutoCurEntry( bool b );
+    void                SetModel( SvTreeList* pModel ) { pTree = pModel;}
+
+    void                EntryInserted( SvTreeListEntry*);
+    void                RemovingEntry( SvTreeListEntry* pEntry );
+    void                EntryRemoved();
+    void                MovingEntry( SvTreeListEntry* pEntry );
+    void                EntryMoved( SvTreeListEntry* pEntry );
+    void                TreeInserted( SvTreeListEntry* pEntry );
+
+    void                EntryExpanded( SvTreeListEntry* pEntry );
+    void                EntryCollapsed( SvTreeListEntry* pEntry );
+    void                CollapsingEntry( SvTreeListEntry* pEntry );
+    void                EntrySelected( SvTreeListEntry* pEntry, bool bSelect );
+
+    virtual void        Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect);
+    void                MouseButtonDown( const MouseEvent& );
+    void                MouseButtonUp( const MouseEvent& );
+    void                MouseMove( const MouseEvent&);
+    virtual bool        KeyInput( const KeyEvent& );
+    void                Resize();
+    void                GetFocus();
+    void                LoseFocus();
+    virtual void        UpdateAll( bool bInvalidateCompleteView );
+    void                SetEntryHeight();
+    void                InvalidateEntry( SvTreeListEntry* );
+    void                RecalcFocusRect();
+
+    void                SelectEntry( SvTreeListEntry* pEntry, bool bSelect );
+    void                SetDragDropMode( DragDropMode eDDMode );
+    void                SetSelectionMode( SelectionMode eSelMode  );
+
+    SvTreeListEntry*    GetCurrentEntry() const { return pCursor; }
+    virtual bool        IsEntryInView( SvTreeListEntry* pEntry ) const;
+    virtual SvTreeListEntry*    GetEntry( const Point& rPos ) const;
+    // returns last entry, if Pos below last entry
+    virtual SvTreeListEntry*    GetClickedEntry( const Point& ) const;
+    SvTreeListEntry*    GetCurEntry() const { return pCursor; }
+    void                SetCurEntry( SvTreeListEntry* );
+    virtual Point       GetEntryPosition( SvTreeListEntry* ) const;
+    void                MakeVisible( SvTreeListEntry* pEntry, bool bMoveToTop = false );
+    void                ScrollToAbsPos( long nPos );
+
+    void                PaintDDCursor( SvTreeListEntry* );
+
+    // Images
+    inline Image&       implGetImageLocation( const ImageType _eType );
+
+    inline void         SetExpandedNodeBmp(  const Image& _rImg );
+    inline void         SetCollapsedNodeBmp( const Image& _rImg );
+
+    inline const Image& GetExpandedNodeBmp( );
+    inline const Image& GetCollapsedNodeBmp( );
+    inline const Image& GetDontKnowNodeBmp( );
+
+    inline void         SetDefaultEntryExpBmp( const Image& _rImg );
+    inline void         SetDefaultEntryColBmp( const Image& _rImg );
+    inline const Image& GetDefaultEntryExpBmp( );
+    inline const Image& GetDefaultEntryColBmp( );
+
+    static const Image& GetDefaultExpandedNodeImage( );
+    static const Image& GetDefaultCollapsedNodeImage( );
+
+    const Size&         GetOutputSize() const { return aOutputSize;}
+    virtual void        KeyUp( bool bPageUp );
+    virtual void        KeyDown( bool bPageDown );
+    void                Command( const CommandEvent& rCEvt );
+
+    void                Invalidate();
+    void                DestroyAnchor() { pAnchor=nullptr; aSelEng.Reset(); }
+    void                SelAllDestrAnch( bool bSelect, bool bDestroyAnchor = true, bool bSingleSelToo = false );
+    void                ShowCursor( bool bShow );
+
+    bool                RequestHelp( const HelpEvent& rHEvt );
+    void                EndSelection();
+    bool                IsNodeButton( const Point& rPosPixel, SvTreeListEntry* pEntry ) const;
+    void                EnableAsyncDrag( bool b ) { bAsyncBeginDrag = b; }
+    void                SetUpdateMode( bool bMode );
+    bool                GetUpdateMode() const { return bUpdateMode; }
+    tools::Rectangle    GetClipRegionRect() const;
+    bool                HasHorScrollBar() const { return aHorSBar->IsVisible(); }
+    void                ShowFocusRect( const SvTreeListEntry* pEntry );
+    void                CallEventListeners( VclEventId nEvent, void* pData = nullptr );
+
+    /** Enables, that one cell of a tablistbox entry can be focused */
+    bool                IsCellFocusEnabled() const { return bIsCellFocusEnabled; }
+    void                EnableCellFocus() { bIsCellFocusEnabled = true; }
+    bool                SetCurrentTabPos( sal_uInt16 _nNewPos );
+    sal_uInt16          GetCurrentTabPos() const { return nCurTabPos; }
+
+    bool                IsSelectable( const SvTreeListEntry* pEntry );
+    void                SetForceMakeVisible(bool bEnable) { mbForceMakeVisible = bEnable; }
+};
+
+inline Image& SvImpLBox::implGetImageLocation( const ImageType _eType )
+{
+    return m_aNodeAndEntryImages[_eType];
+}
+
+inline void SvImpLBox::SetExpandedNodeBmp( const Image& rImg )
+{
+    implGetImageLocation( ImageType::NodeExpanded ) = rImg;
+    SetNodeBmpWidth( rImg );
+}
+
+inline void SvImpLBox::SetCollapsedNodeBmp( const Image& rImg )
+{
+    implGetImageLocation( ImageType::NodeCollapsed ) = rImg;
+    SetNodeBmpWidth( rImg );
+}
+
+inline const Image& SvImpLBox::GetDontKnowNodeBmp( )
+{
+    return implGetImageLocation( ImageType::NodeDontKnow );
+}
+
+inline const Image& SvImpLBox::GetExpandedNodeBmp( )
+{
+    return implGetImageLocation( ImageType::NodeExpanded );
+}
+
+inline const Image& SvImpLBox::GetCollapsedNodeBmp( )
+{
+    return implGetImageLocation( ImageType::NodeCollapsed );
+}
+
+inline void SvImpLBox::SetDefaultEntryExpBmp( const Image& _rImg )
+{
+    implGetImageLocation( ImageType::EntryDefExpanded ) = _rImg;
+}
+
+inline void SvImpLBox::SetDefaultEntryColBmp( const Image& _rImg )
+{
+    implGetImageLocation( ImageType::EntryDefCollapsed ) = _rImg;
+}
+
+inline const Image& SvImpLBox::GetDefaultEntryExpBmp( )
+{
+    return implGetImageLocation( ImageType::EntryDefExpanded );
+}
+
+inline const Image& SvImpLBox::GetDefaultEntryColBmp( )
+{
+    return implGetImageLocation( ImageType::EntryDefCollapsed );
+}
+
+inline Point SvImpLBox::GetEntryPosition( SvTreeListEntry* pEntry ) const
+{
+    return Point( 0, GetEntryLine( pEntry ) );
+}
+
+inline bool SvImpLBox::IsLineVisible( long nY ) const
+{
+    bool bRet = true;
+    if ( nY < 0 || nY >= aOutputSize.Height() )
+        bRet = false;
+    return bRet;
+}
+
+inline void SvImpLBox::TreeInserted( SvTreeListEntry* pInsTree )
+{
+    EntryInserted( pInsTree );
+}
+
+#endif // INCLUDED_VCL_SOURCE_INC_SVIMPBOX_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svtools/svlbitm.hxx b/include/vcl/svlbitm.hxx
index d0125b3a09a6..854c4666d50e 100644
--- a/include/svtools/svlbitm.hxx
+++ b/include/vcl/svlbitm.hxx
@@ -18,14 +18,14 @@
  */
 
 
-#ifndef INCLUDED_SVTOOLS_SVLBITM_HXX
-#define INCLUDED_SVTOOLS_SVLBITM_HXX
+#ifndef INCLUDED_VCL_SVLBITM_HXX
+#define INCLUDED_VCL_SVLBITM_HXX
 
 #include <memory>
-#include <svtools/svtdllapi.h>
+#include <vcl/dllapi.h>
 #include <tools/link.hxx>
 #include <vcl/image.hxx>
-#include <svtools/treelistbox.hxx>
+#include <vcl/treelistbox.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
 class SvTreeListEntry;
@@ -57,7 +57,7 @@ namespace o3tl
 
 struct SvLBoxButtonData_Impl;
 
-class SVT_DLLPUBLIC SvLBoxButtonData
+class VCL_DLLPUBLIC SvLBoxButtonData
 {
 private:
     Link<SvLBoxButtonData*,void> aLink;
@@ -67,8 +67,8 @@ private:
     bool                    bDataOk;
     std::vector<Image>      aBmps;  // indices s. constants BMP_ ....
 
-    SVT_DLLPRIVATE void     SetWidthAndHeight();
-    SVT_DLLPRIVATE void     InitData( bool _bRadioBtn, const Control* pControlForSettings );
+    VCL_DLLPRIVATE void     SetWidthAndHeight();
+    VCL_DLLPRIVATE void     InitData( bool _bRadioBtn, const Control* pControlForSettings );
 public:
                             // include creating default images (CheckBox or RadioButton)
                             SvLBoxButtonData( const Control* pControlForSettings );
@@ -100,7 +100,7 @@ public:
 
 // **********************************************************************
 
-class SVT_DLLPUBLIC SvLBoxString : public SvLBoxItem
+class VCL_DLLPUBLIC SvLBoxString : public SvLBoxItem
 {
 protected:
     OUString maText;
@@ -132,7 +132,7 @@ public:
     virtual std::unique_ptr<SvLBoxItem> Clone(SvLBoxItem const * pSource) const override;
 };
 
-class SVT_DLLPUBLIC SvLBoxButton : public SvLBoxItem
+class VCL_DLLPUBLIC SvLBoxButton : public SvLBoxItem
 {
     bool    isVis;
     SvLBoxButtonData*   pData;
@@ -222,7 +222,7 @@ inline void SvLBoxButton::SetStateHilighted( bool bHilight )
 
 struct SvLBoxContextBmp_Impl;
 
-class SVT_DLLPUBLIC SvLBoxContextBmp : public SvLBoxItem
+class VCL_DLLPUBLIC SvLBoxContextBmp : public SvLBoxItem
 {
     std::unique_ptr<SvLBoxContextBmp_Impl>  m_pImpl;
 public:
diff --git a/include/svtools/transfer.hxx b/include/vcl/transfer.hxx
index 24ddf24be61f..7539048d18f6 100644
--- a/include/svtools/transfer.hxx
+++ b/include/vcl/transfer.hxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVTOOLS_TRANSFER_HXX
-#define INCLUDED_SVTOOLS_TRANSFER_HXX
+#ifndef INCLUDED_VCL_TRANSFER_HXX
+#define INCLUDED_VCL_TRANSFER_HXX
 
-#include <svtools/svtdllapi.h>
+#include <vcl/dllapi.h>
 #include <tools/globname.hxx>
 #include <tools/gen.hxx>
 #include <tools/link.hxx>
@@ -79,7 +79,7 @@ struct TransferableObjectDescriptor
         : mnViewAspect(css::embed::Aspects::MSOLE_CONTENT)
     {}
 
-    SVT_DLLPUBLIC friend SvStream&  WriteTransferableObjectDescriptor( SvStream& rOStm, const TransferableObjectDescriptor& rObjDesc );
+    VCL_DLLPUBLIC friend SvStream&  WriteTransferableObjectDescriptor( SvStream& rOStm, const TransferableObjectDescriptor& rObjDesc );
 };
 
 struct AcceptDropEvent
@@ -121,7 +121,7 @@ struct ExecuteDropEvent
         mbDefault( false ) {}
 };
 
-class SVT_DLLPUBLIC TransferableHelper : public cppu::WeakImplHelper< css::datatransfer::XTransferable2,
+class VCL_DLLPUBLIC TransferableHelper : public cppu::WeakImplHelper< css::datatransfer::XTransferable2,
                                                            css::datatransfer::clipboard::XClipboardOwner,
                                                            css::datatransfer::dnd::XDragSourceListener,
                                                            css::lang::XUnoTunnel >
@@ -211,7 +211,7 @@ protected:
 
 private:
 
-    SVT_DLLPRIVATE void             ImplFlush();
+    VCL_DLLPRIVATE void             ImplFlush();
 
 protected:
 
@@ -261,7 +261,7 @@ public:
 
 struct TransferableDataHelper_Impl;
 
-class SVT_DLLPUBLIC TransferableDataHelper final
+class VCL_DLLPUBLIC TransferableDataHelper final
 {
     friend class DropTargetHelper;
 
@@ -358,7 +358,7 @@ public:
                                              const css::datatransfer::DataFlavor& rRequestFlavor );
 };
 
-class SVT_DLLPUBLIC DragSourceHelper
+class VCL_DLLPUBLIC DragSourceHelper
 {
 private:
 
@@ -404,7 +404,7 @@ public:
     virtual             ~DragSourceHelper();
 };
 
-class SVT_DLLPUBLIC DropTargetHelper
+class VCL_DLLPUBLIC DropTargetHelper
 {
 private:
 
@@ -472,7 +472,7 @@ public:
 
 struct TransferDataContainer_Impl;
 
-class SVT_DLLPUBLIC TransferDataContainer : public TransferableHelper
+class VCL_DLLPUBLIC TransferDataContainer : public TransferableHelper
 {
     std::unique_ptr<TransferDataContainer_Impl> pImpl;
 
diff --git a/include/svtools/treelist.hxx b/include/vcl/treelist.hxx
index 0d190ab3a022..fb2aa3333adc 100644
--- a/include/svtools/treelist.hxx
+++ b/include/vcl/treelist.hxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVTOOLS_TREELIST_HXX
-#define INCLUDED_SVTOOLS_TREELIST_HXX
+#ifndef INCLUDED_VCL_TREELIST_HXX
+#define INCLUDED_VCL_TREELIST_HXX
 
-#include <svtools/svtdllapi.h>
-#include <svtools/treelistentries.hxx>
-#include <svtools/viewdataentry.hxx>
+#include <vcl/dllapi.h>
+#include <vcl/treelistentries.hxx>
+#include <vcl/viewdataentry.hxx>
 
 #include <tools/solar.h>
 #include <tools/link.hxx>
@@ -63,7 +63,7 @@ struct SvSortData
     const SvTreeListEntry* pRight;
 };
 
-class SVT_DLLPUBLIC SvTreeList final
+class VCL_DLLPUBLIC SvTreeList final
 {
     typedef std::vector<SvListView*> ListViewsType;
 
@@ -106,26 +106,26 @@ class SVT_DLLPUBLIC SvTreeList final
     static void         Expand( SvListView*,SvTreeListEntry* pParent );
     static void         Collapse( SvListView*,SvTreeListEntry* pParent );
 
-    SVT_DLLPRIVATE void SetAbsolutePositions();
+    VCL_DLLPRIVATE void SetAbsolutePositions();
 
-    SVT_DLLPRIVATE void CloneChildren(
+    VCL_DLLPRIVATE void CloneChildren(
         SvTreeListEntries& rDst, sal_uLong& rCloneCount, SvTreeListEntries& rSrc, SvTreeListEntry& rNewParent) const;
 
     /**
      * Invalidate the cached position data to have them re-generated before
      * the next access.
      */
-    SVT_DLLPRIVATE static void SetListPositions( SvTreeListEntries& rEntries );
+    VCL_DLLPRIVATE static void SetListPositions( SvTreeListEntries& rEntries );
 
     // rPos is not changed for SortModeNone
-    SVT_DLLPRIVATE void GetInsertionPos(
+    VCL_DLLPRIVATE void GetInsertionPos(
                             SvTreeListEntry const * pEntry,
                             SvTreeListEntry* pParent,
                             sal_uLong& rPos
                         );
 
-    SVT_DLLPRIVATE void ResortChildren( SvTreeListEntry* pParent );
-    SVT_DLLPRIVATE void ReverseChildren( SvTreeListEntry* pParent );
+    VCL_DLLPRIVATE void ResortChildren( SvTreeListEntry* pParent );
+    VCL_DLLPRIVATE void ReverseChildren( SvTreeListEntry* pParent );
 
     SvTreeList(const SvTreeList&) = delete;
     SvTreeList& operator= (const SvTreeList&) = delete;
@@ -224,7 +224,7 @@ public:
     void                Reverse();
 };
 
-class SVT_DLLPUBLIC SvListView
+class VCL_DLLPUBLIC SvListView
 {
     friend class SvTreeList;
 
diff --git a/include/svtools/treelistbox.hxx b/include/vcl/treelistbox.hxx
index c4df5127375c..464b9d30f864 100644
--- a/include/svtools/treelistbox.hxx
+++ b/include/vcl/treelistbox.hxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVTOOLS_TREELISTBOX_HXX
-#define INCLUDED_SVTOOLS_TREELISTBOX_HXX
+#ifndef INCLUDED_VCL_TREELISTBOX_HXX
+#define INCLUDED_VCL_TREELISTBOX_HXX
 
-#include <svtools/svtdllapi.h>
+#include <vcl/dllapi.h>
 
 #include <deque>
 #include <memory>
@@ -36,8 +36,8 @@
 #include <vcl/image.hxx>
 #include <tools/gen.hxx>
 #include <tools/contnr.hxx>
-#include <svtools/treelist.hxx>
-#include <svtools/transfer.hxx>
+#include <vcl/treelist.hxx>
+#include <vcl/transfer.hxx>
 #include <vcl/idle.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
@@ -120,7 +120,7 @@ enum class SvTreeAccRoleType
 
 enum class SvLBoxItemType {String, Button, ContextBmp};
 
-class SvLBoxTab
+class VCL_DLLPUBLIC SvLBoxTab
 {
     long    nPos;
 public:
@@ -138,7 +138,7 @@ public:
     bool    IsEditable() const { return bool(nFlags & SvLBoxTabFlags::EDITABLE); }
 };
 
-class SVT_DLLPUBLIC SvLBoxItem
+class VCL_DLLPUBLIC SvLBoxItem
 {
 public:
                         SvLBoxItem();
@@ -191,8 +191,9 @@ namespace o3tl
 }
 
 struct SvTreeListBoxImpl;
+class SalInstanceTreeView;
 
-class SVT_DLLPUBLIC SvTreeListBox
+class VCL_DLLPUBLIC SvTreeListBox
                 :public Control
                 ,public SvListView
                 ,public DropTargetHelper
@@ -203,6 +204,7 @@ class SVT_DLLPUBLIC SvTreeListBox
     friend class SvImpLBox;
     friend class IconViewImpl;
     friend class TreeControlPeer;
+    friend class SalInstanceTreeView;
 
     std::unique_ptr<SvTreeListBoxImpl> mpImpl;
     Link<SvTreeListBox*,void>  aCheckButtonHdl;
@@ -271,8 +273,8 @@ private:
     // call. The AddBox method is called from the GetDragFinishedHdl() and the
     // remove is called in the link callback and in the dtor. So it can't be
     // called for a deleted object.
-    SVT_DLLPRIVATE static void AddBoxToDDList_Impl( const SvTreeListBox& rB );
-    SVT_DLLPRIVATE static void RemoveBoxFromDDList_Impl( const SvTreeListBox& rB );
+    VCL_DLLPRIVATE static void AddBoxToDDList_Impl( const SvTreeListBox& rB );
+    VCL_DLLPRIVATE static void RemoveBoxFromDDList_Impl( const SvTreeListBox& rB );
     DECL_DLLPRIVATE_LINK( DragFinishHdl_Impl, sal_Int8, void );
 
 protected:
@@ -491,9 +493,6 @@ public:
 
     // ACCESSIBILITY ==========================================================
 
-    /** Creates and returns the accessible object of the Box. */
-    virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override;
-
     /** Fills the StateSet of one entry. */
     void FillAccessibleEntryStateSet( SvTreeListEntry* pEntry, ::utl::AccessibleStateSetHelper& rStateSet ) const;
 
@@ -522,16 +521,16 @@ public:
 
 protected:
 
-    SVT_DLLPRIVATE void         SetEntryHeight( SvTreeListEntry const * pEntry );
-    SVT_DLLPRIVATE void         AdjustEntryHeight( const Image& rBmp );
-    SVT_DLLPRIVATE void         AdjustEntryHeight();
+    VCL_DLLPRIVATE void         SetEntryHeight( SvTreeListEntry const * pEntry );
+                   void         AdjustEntryHeight( const Image& rBmp );
+    VCL_DLLPRIVATE void         AdjustEntryHeight();
 
-    SVT_DLLPRIVATE void         ImpEntryInserted( SvTreeListEntry* pEntry );
-    SVT_DLLPRIVATE void         PaintEntry1( SvTreeListEntry&, long nLine, vcl::RenderContext& rRenderContext );
+    VCL_DLLPRIVATE void         ImpEntryInserted( SvTreeListEntry* pEntry );
+    VCL_DLLPRIVATE void         PaintEntry1( SvTreeListEntry&, long nLine, vcl::RenderContext& rRenderContext );
 
-    SVT_DLLPRIVATE void         InitTreeView();
-    SVT_DLLPRIVATE SvLBoxItem*  GetItem_Impl( SvTreeListEntry*, long nX, SvLBoxTab** ppTab );
-    SVT_DLLPRIVATE void         ImplInitStyle();
+    VCL_DLLPRIVATE void         InitTreeView();
+    VCL_DLLPRIVATE SvLBoxItem*  GetItem_Impl( SvTreeListEntry*, long nX, SvLBoxTab** ppTab );
+    VCL_DLLPRIVATE void         ImplInitStyle();
 
     void            SetupDragOrigin();
     void            EditItemText( SvTreeListEntry* pEntry, SvLBoxString* pItem,
diff --git a/include/svtools/treelistentries.hxx b/include/vcl/treelistentries.hxx
index a7880f87d237..ffe0cb571c55 100644
--- a/include/svtools/treelistentries.hxx
+++ b/include/vcl/treelistentries.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_SVTOOLS_TREELISTENTRIES_HXX
-#define INCLUDED_SVTOOLS_TREELISTENTRIES_HXX
+#ifndef INCLUDED_VCL_TREELISTENTRIES_HXX
+#define INCLUDED_VCL_TREELISTENTRIES_HXX
 
 #include <vector>
 #include <memory>
diff --git a/include/svtools/treelistentry.hxx b/include/vcl/treelistentry.hxx
index 303ebb55d643..c734729174ce 100644
--- a/include/svtools/treelistentry.hxx
+++ b/include/vcl/treelistentry.hxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVTOOLS_TREELISTENTRY_HXX
-#define INCLUDED_SVTOOLS_TREELISTENTRY_HXX
+#ifndef INCLUDED_VCL_TREELISTENTRY_HXX
+#define INCLUDED_VCL_TREELISTENTRY_HXX
 
-#include <svtools/svtdllapi.h>
+#include <vcl/dllapi.h>
 #include <tools/solar.h>
-#include <svtools/treelistbox.hxx>
-#include <svtools/treelistentries.hxx>
+#include <vcl/treelistbox.hxx>
+#include <vcl/treelistentries.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
 #include <vector>
@@ -47,8 +47,7 @@ namespace o3tl
     template<> struct typed_flags<SvTLEntryFlags> : is_typed_flags<SvTLEntryFlags, 0x801f> {};
 }
 
-
-class SVT_DLLPUBLIC SvTreeListEntry
+class VCL_DLLPUBLIC SvTreeListEntry
 {
     friend class SvTreeList;
     friend class SvListView;
diff --git a/include/vcl/uitest/uiobject.hxx b/include/vcl/uitest/uiobject.hxx
index 0b673774dc75..e56801af17f4 100644
--- a/include/vcl/uitest/uiobject.hxx
+++ b/include/vcl/uitest/uiobject.hxx
@@ -23,6 +23,7 @@
 #include <vcl/combobox.hxx>
 #include <vcl/spinfld.hxx>
 #include <vcl/tabctrl.hxx>
+#include <vcl/treelistbox.hxx>
 
 #include <vcl/dllapi.h>
 
@@ -404,6 +405,55 @@ protected:
     virtual OUString get_name() const override;
 };
 
+class UITEST_DLLPUBLIC TreeListUIObject : public WindowUIObject
+{
+public:
+    TreeListUIObject(const VclPtr<SvTreeListBox>& xTreeList);
+
+    virtual StringMap get_state() override;
+
+    static std::unique_ptr<UIObject> create(vcl::Window* pWindow);
+
+    virtual void execute(const OUString& rAction,
+            const StringMap& rParameters) override;
+
+    virtual std::unique_ptr<UIObject> get_child(const OUString& rID) override;
+
+    virtual std::set<OUString> get_children() const override;
+
+protected:
+
+    virtual OUString get_name() const override;
+
+private:
+
+    VclPtr<SvTreeListBox> mxTreeList;
+};
+
+class UITEST_DLLPUBLIC TreeListEntryUIObject : public UIObject
+{
+public:
+
+    TreeListEntryUIObject(const VclPtr<SvTreeListBox>& xTreeList, SvTreeListEntry* pEntry);
+
+    virtual StringMap get_state() override;
+
+    virtual void execute(const OUString& rAction,
+            const StringMap& rParameters) override;
+
+    virtual std::unique_ptr<UIObject> get_child(const OUString& rID) override;
+
+    virtual std::set<OUString> get_children() const override;
+
+    virtual OUString get_type() const override;
+
+private:
+
+    VclPtr<SvTreeListBox> mxTreeList;
+
+    SvTreeListEntry* const mpEntry;
+};
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svtools/viewdataentry.hxx b/include/vcl/viewdataentry.hxx
index 1a61b3f6c13a..1277b75edf29 100644
--- a/include/svtools/viewdataentry.hxx
+++ b/include/vcl/viewdataentry.hxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVTOOLS_VIEWDATAENTRY_HXX
-#define INCLUDED_SVTOOLS_VIEWDATAENTRY_HXX
+#ifndef INCLUDED_VCL_VIEWDATAENTRY_HXX
+#define INCLUDED_VCL_VIEWDATAENTRY_HXX
 
-#include <svtools/svtdllapi.h>
+#include <vcl/dllapi.h>
 #include <tools/solar.h>
 #include <tools/gen.hxx>
 
@@ -40,7 +40,7 @@ struct SvViewDataItem
  * highlighted. When an entry is only highlighted, it looks visually
  * highlighted, but not logically selected.
  */
-class SVT_DLLPUBLIC SvViewDataEntry
+class VCL_DLLPUBLIC SvViewDataEntry
 {
     friend class SvTreeList;