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>

3 files changed, 9 insertions, 62 deletions

diff --git a/svtools/inc/bitmaps.hlst b/svtools/inc/bitmaps.hlst
index 1f31a7f22a62..27c5f85a9858 100644
--- a/svtools/inc/bitmaps.hlst
+++ b/svtools/inc/bitmaps.hlst
@@ -104,8 +104,6 @@
 #define BMP_PLUGIN                  "res/plugin.png"
 #define RID_BMP_FOLDER              "svtools/res/folder.png"
 #define RID_BMP_FOLDER_OPEN         "res/folderop.png"
-#define RID_BMP_TREENODE_COLLAPSED  "res/plus.png"
-#define RID_BMP_TREENODE_EXPANDED   "res/minus.png"
 #define BMP_CURRENT                 "svtools/res/ed01.png"
 #define BMP_MODIFIED                "svtools/res/ed02.png"
 #define BMP_NEW                     "svtools/res/ed03.png"
diff --git a/svtools/inc/pch/precompiled_svt.hxx b/svtools/inc/pch/precompiled_svt.hxx
index d3ed09986710..3d7c3869a9d8 100644
--- a/svtools/inc/pch/precompiled_svt.hxx
+++ b/svtools/inc/pch/precompiled_svt.hxx
@@ -421,21 +421,21 @@
 #include <svtools/htmltokn.h>
 #include <svtools/iconview.hxx>
 #include <svtools/imagemgr.hxx>
-#include <svtools/imap.hxx>
-#include <svtools/imapcirc.hxx>
-#include <svtools/imappoly.hxx>
-#include <svtools/imaprect.hxx>
 #include <svtools/imgdef.hxx>
 #include <svtools/inettbc.hxx>
 #include <svtools/miscopt.hxx>
-#include <svtools/svlbitm.hxx>
 #include <svtools/svmedit.hxx>
 #include <svtools/svtdllapi.h>
 #include <svtools/svtresid.hxx>
 #include <svtools/table/tabletypes.hxx>
-#include <svtools/transfer.hxx>
-#include <svtools/treelistbox.hxx>
-#include <svtools/treelistentry.hxx>
-#include <svtools/viewdataentry.hxx>
+#include <vcl/transfer.hxx>
+#include <vcl/svlbitm.hxx>
+#include <vcl/imap.hxx>
+#include <vcl/imapcirc.hxx>
+#include <vcl/imappoly.hxx>
+#include <vcl/imaprect.hxx>
+#include <vcl/treelistbox.hxx>
+#include <vcl/treelistentry.hxx>
+#include <vcl/viewdataentry.hxx>
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/uitest/uiobject.hxx b/svtools/inc/uitest/uiobject.hxx
index ff169749bf1a..16a137da7c7c 100644
--- a/svtools/inc/uitest/uiobject.hxx
+++ b/svtools/inc/uitest/uiobject.hxx
@@ -10,59 +10,8 @@
 #include <memory>
 #include <vcl/uitest/uiobject.hxx>
 
-class SvTreeListBox;
-class SvTreeListEntry;
 class SvSimpleTable;
 
-class 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 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;
-};
-
 class SimpleTableUIObject : public TreeListUIObject
 {
 public: