remove DBTreeView class which doesn't do anything useful

Change-Id: I9270f8f87149a395f47a5b4599d6eac4b07103c9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100607
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

10 files changed, 83 insertions, 229 deletions

diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index 1a3630727860..07da91b74f4f 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -86,7 +86,6 @@ $(eval $(call gb_Library_add_exception_objects,dbu,\
     dbaccess/source/ui/browser/dbexchange \
     dbaccess/source/ui/browser/dbloader \
     dbaccess/source/ui/browser/dbtreemodel \
-    dbaccess/source/ui/browser/dbtreeview \
     dbaccess/source/ui/browser/dsbrowserDnD \
     dbaccess/source/ui/browser/dsEntriesNoExp \
     dbaccess/source/ui/browser/exsrcbrw \
diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx
index 01b17fd7c544..de1f9220100f 100644
--- a/dbaccess/source/ui/browser/brwview.cxx
+++ b/dbaccess/source/ui/browser/brwview.cxx
@@ -23,7 +23,6 @@
 #include <comphelper/types.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/split.hxx>
-#include "dbtreeview.hxx"
 #include <strings.hxx>
 #include <com/sun/star/form/XLoadable.hpp>
 #include <com/sun/star/awt/XControlContainer.hpp>
@@ -153,12 +152,12 @@ void UnoDataBrowserView::setSplitter(Splitter* _pSplitter)
     LINK( this, UnoDataBrowserView, SplitHdl ).Call(m_pSplitter);
 }
 
-void UnoDataBrowserView::setTreeView(DBTreeView* _pTreeView)
+void UnoDataBrowserView::setTreeView(InterimDBTreeListBox* pTreeView)
 {
-    if (m_pTreeView.get() != _pTreeView)
+    if (m_pTreeView.get() != pTreeView)
     {
         m_pTreeView.disposeAndClear();
-        m_pTreeView = _pTreeView;
+        m_pTreeView = pTreeView;
     }
 }
 
diff --git a/dbaccess/source/ui/browser/dbtreeview.cxx b/dbaccess/source/ui/browser/dbtreeview.cxx
deleted file mode 100644
index 38e6846cc811..000000000000
--- a/dbaccess/source/ui/browser/dbtreeview.cxx
+++ /dev/null
@@ -1,79 +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 .
- */
-
-#include "dbtreeview.hxx"
-#include <dbtreelistbox.hxx>
-#include <helpids.h>
-
-namespace dbaui
-{
-
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-
-DBTreeView::DBTreeView( vcl::Window* pParent, WinBits nBits)
-    : Window(pParent, nBits)
-    , m_pTreeListBox(VclPtr<InterimDBTreeListBox>::Create(this))
-{
-    m_pTreeListBox->SetHelpId(HID_TLB_TREELISTBOX);
-    m_pTreeListBox->Show();
-}
-
-DBTreeView::~DBTreeView()
-{
-    disposeOnce();
-}
-
-void DBTreeView::dispose()
-{
-    m_pTreeListBox.disposeAndClear();
-    vcl::Window::dispose();
-}
-
-void DBTreeView::SetPreExpandHandler(const Link<const weld::TreeIter&,bool>& rHdl)
-{
-    m_pTreeListBox->GetWidget().connect_expanding(rHdl);
-}
-
-void    DBTreeView::setCopyHandler(const Link<LinkParamNone*,void>& _rHdl)
-{
-    m_pTreeListBox->setCopyHandler(_rHdl);
-}
-
-void DBTreeView::Resize()
-{
-    Window::Resize();
-    m_pTreeListBox->SetPosSizePixel(Point(0,0),GetOutputSizePixel());
-}
-
-void DBTreeView::setSelChangeHdl( const Link<LinkParamNone*,void>& _rHdl )
-{
-    m_pTreeListBox->SetSelChangeHdl( _rHdl );
-}
-
-void DBTreeView::GetFocus()
-{
-    Window::GetFocus();
-    if ( m_pTreeListBox )//&& !m_pTreeListBox->HasChildPathFocus())
-        m_pTreeListBox->GrabFocus();
-}
-
-}   // namespace dbaui
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/browser/dbtreeview.hxx b/dbaccess/source/ui/browser/dbtreeview.hxx
deleted file mode 100644
index 0070b50f3ee8..000000000000
--- a/dbaccess/source/ui/browser/dbtreeview.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_DBACCESS_SOURCE_UI_BROWSER_DBTREEVIEW_HXX
-#define INCLUDED_DBACCESS_SOURCE_UI_BROWSER_DBTREEVIEW_HXX
-
-#include <vcl/weld.hxx>
-#include <vcl/window.hxx>
-
-namespace dbaui
-{
-    class InterimDBTreeListBox;
-
-    class DBTreeView : public vcl::Window
-    {
-    private:
-        VclPtr<InterimDBTreeListBox> m_pTreeListBox;
-    protected:
-        // window overridables
-        virtual void Resize() override;
-    public:
-
-        DBTreeView( vcl::Window* pParent,
-                WinBits nBits );
-        virtual ~DBTreeView() override;
-        virtual void dispose() override;
-
-        /** sets a handler which is called when a list box entry is to be expanded.
-            <p>When calling the link, the parameter is a TreeIter marking the entry to be expanded.
-            </p>
-        */
-        void                SetPreExpandHandler(const Link<const weld::TreeIter&,bool>& rHdl);
-
-        void                setCopyHandler(const Link<LinkParamNone*,void>& rHdl);
-
-        void                setSelChangeHdl(const Link<LinkParamNone*,void>& rHdl);
-
-        InterimDBTreeListBox& getListBox() const { return *m_pTreeListBox; }
-
-        virtual void        GetFocus() override;
-    };
-}
-
-#endif // INCLUDED_DBACCESS_SOURCE_UI_BROWSER_DBTREEVIEW_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
index 972515e0118b..6e5b73e06db5 100644
--- a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
+++ b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
@@ -25,7 +25,6 @@
 #include <browserids.hxx>
 #include <imageprovider.hxx>
 #include <osl/diagnose.h>
-#include "dbtreeview.hxx"
 #include <dbtreelistbox.hxx>
 #include "dbtreemodel.hxx"
 
@@ -52,13 +51,13 @@ SbaTableQueryBrowser::EntryType SbaTableQueryBrowser::getChildType(const weld::T
 
 OUString SbaTableQueryBrowser::GetEntryText(const weld::TreeIter& rEntry) const
 {
-    return m_pTreeView->getListBox().GetWidget().get_text(rEntry);
+    return m_pTreeView->GetWidget().get_text(rEntry);
 }
 
 SbaTableQueryBrowser::EntryType SbaTableQueryBrowser::getEntryType(const weld::TreeIter& rEntry) const
 {
-    std::unique_ptr<weld::TreeIter> xRootEntry = m_pTreeView->getListBox().GetRootLevelParent(&rEntry);
-    weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+    std::unique_ptr<weld::TreeIter> xRootEntry = m_pTreeView->GetRootLevelParent(&rEntry);
+    weld::TreeView& rTreeView = m_pTreeView->GetWidget();
 
     if (rTreeView.iter_compare(*xRootEntry, rEntry) == 0)
         return etDatasource;
@@ -116,7 +115,7 @@ void SbaTableQueryBrowser::select(weld::TreeIter* pEntry, bool bSelect)
 {
     if (pEntry)
     {
-        weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+        weld::TreeView& rTreeView = m_pTreeView->GetWidget();
         rTreeView.set_text_emphasis(*pEntry, bSelect, 0);
     }
     else
@@ -129,7 +128,7 @@ void SbaTableQueryBrowser::selectPath(weld::TreeIter* pEntry, bool bSelect)
 {
     if (!pEntry)
         return;
-    weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+    weld::TreeView& rTreeView = m_pTreeView->GetWidget();
     std::unique_ptr<weld::TreeIter> xEntry(rTreeView.make_iterator(pEntry));
     do
     {
@@ -140,7 +139,7 @@ void SbaTableQueryBrowser::selectPath(weld::TreeIter* pEntry, bool bSelect)
 
 bool SbaTableQueryBrowser::isSelected(const weld::TreeIter& rEntry) const
 {
-    weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+    weld::TreeView& rTreeView = m_pTreeView->GetWidget();
     return rTreeView.get_text_emphasis(rEntry, 0);
 }
 
diff --git a/dbaccess/source/ui/browser/dsbrowserDnD.cxx b/dbaccess/source/ui/browser/dsbrowserDnD.cxx
index 8c2101a9b02f..3ad4c7933406 100644
--- a/dbaccess/source/ui/browser/dsbrowserDnD.cxx
+++ b/dbaccess/source/ui/browser/dsbrowserDnD.cxx
@@ -20,7 +20,6 @@
 #include <dbexchange.hxx>
 #include <dbtreelistbox.hxx>
 #include "dbtreemodel.hxx"
-#include "dbtreeview.hxx"
 #include <UITools.hxx>
 #include <unodatbr.hxx>
 
@@ -63,7 +62,7 @@ namespace dbaui
         try
         {
             OUString aName = GetEntryText(rApplyTo);
-            std::unique_ptr<weld::TreeIter> xRootEntry(m_pTreeView->getListBox().GetRootLevelParent(&rApplyTo));
+            std::unique_ptr<weld::TreeIter> xRootEntry(m_pTreeView->GetRootLevelParent(&rApplyTo));
             OUString aDSName = getDataSourceAccessor(*xRootEntry);
 
             SharedConnection xConnection;
@@ -93,7 +92,7 @@ namespace dbaui
     sal_Int8 SbaTableQueryBrowser::queryDrop( const AcceptDropEvent& _rEvt, const DataFlavorExVector& _rFlavors )
     {
         // check if we're a table or query container
-        weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+        weld::TreeView& rTreeView = m_pTreeView->GetWidget();
         std::unique_ptr<weld::TreeIter> xHitEntry(rTreeView.make_iterator());
         // get_dest_row_at_pos with false cause no drop if no entry was hit exactly
         if (rTreeView.get_dest_row_at_pos(_rEvt.maPosPixel, xHitEntry.get(), false))
@@ -117,7 +116,7 @@ namespace dbaui
     }
     sal_Int8 SbaTableQueryBrowser::executeDrop( const ExecuteDropEvent& _rEvt )
     {
-        weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+        weld::TreeView& rTreeView = m_pTreeView->GetWidget();
         std::unique_ptr<weld::TreeIter> xHitEntry(rTreeView.make_iterator());
         // get_dest_row_at_pos with false cause no drop if no entry was hit exactly
         if (!rTreeView.get_dest_row_at_pos(_rEvt.maPosPixel, xHitEntry.get(), false))
@@ -182,13 +181,13 @@ namespace dbaui
         if (!isObject(eEntryType))
             return false;
 
-        ODataClipboard& rExchange = m_pTreeView->getListBox().GetDataTransfer();
+        ODataClipboard& rExchange = m_pTreeView->GetDataTransfer();
         return implCopyObject(rExchange, rEntry, (etTableOrView == eEntryType) ? CommandType::TABLE : CommandType::QUERY);
     }
 
     IMPL_LINK_NOARG(SbaTableQueryBrowser, OnCopyEntry, LinkParamNone*, void)
     {
-        weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+        weld::TreeView& rTreeView = m_pTreeView->GetWidget();
         std::unique_ptr<weld::TreeIter> xSelected = rTreeView.make_iterator();
         if (rTreeView.get_selected(xSelected.get()) && isEntryCopyAllowed(*xSelected))
             copyEntry(*xSelected);
@@ -220,7 +219,7 @@ namespace dbaui
             if ( ensureConnection(m_aAsyncDrop.xDroppedAt.get(), xDestConnection) && xDestConnection.is())
             {
                 std::unique_ptr<weld::TreeIter> xDataSourceEntry =
-                    m_pTreeView->getListBox().GetRootLevelParent(m_aAsyncDrop.xDroppedAt.get());
+                    m_pTreeView->GetRootLevelParent(m_aAsyncDrop.xDroppedAt.get());
                 m_aTableCopyHelper.asyncCopyTagTable(m_aAsyncDrop, getDataSourceAccessor(*xDataSourceEntry), xDestConnection);
             }
         }
@@ -230,7 +229,7 @@ namespace dbaui
 
     void SbaTableQueryBrowser::clearTreeModel()
     {
-        weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+        weld::TreeView& rTreeView = m_pTreeView->GetWidget();
         rTreeView.all_foreach([this, &rTreeView](weld::TreeIter& rEntryLoop){
             // clear the user data of the tree model
             DBTreeListUserData* pData = reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(rEntryLoop).toUInt64());
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 1b380a6b314a..64528dfba415 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -22,7 +22,6 @@
 #include <helpids.h>
 #include <dbtreelistbox.hxx>
 #include "dbtreemodel.hxx"
-#include "dbtreeview.hxx"
 #include <strings.hrc>
 #include <imageprovider.hxx>
 #include <sbagrid.hxx>
@@ -297,13 +296,15 @@ bool SbaTableQueryBrowser::Construct(vcl::Window* pParent)
         m_pSplitter->SetPosSizePixel( ::Point(0,0), ::Size(nFrameWidth,0) );
         m_pSplitter->SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetDialogColor() ) );
 
-        m_pTreeView = VclPtr<DBTreeView>::Create(getBrowserView(), WB_TABSTOP | WB_BORDER);
-        m_pTreeView->SetPreExpandHandler(LINK(this, SbaTableQueryBrowser, OnExpandEntry));
+        m_pTreeView = VclPtr<InterimDBTreeListBox>::Create(getBrowserView());
+        m_pTreeView->SetHelpId(HID_TLB_TREELISTBOX);
+
+        m_pTreeView->GetWidget().connect_expanding(LINK(this, SbaTableQueryBrowser, OnExpandEntry));
 
         m_pTreeView->setCopyHandler(LINK(this, SbaTableQueryBrowser, OnCopyEntry));
 
-        m_pTreeView->getListBox().setContextMenuProvider( this );
-        m_pTreeView->getListBox().setControlActionListener( this );
+        m_pTreeView->setContextMenuProvider( this );
+        m_pTreeView->setControlActionListener( this );
         m_pTreeView->SetHelpId(HID_CTL_TREEVIEW);
 
         // a default pos for the splitter, so that the listbox is about 80 (logical) pixels wide
@@ -313,13 +314,13 @@ bool SbaTableQueryBrowser::Construct(vcl::Window* pParent)
         getBrowserView()->setTreeView(m_pTreeView);
 
         // fill view with data
-        weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+        weld::TreeView& rTreeView = m_pTreeView->GetWidget();
         rTreeView.set_sort_order(true);
         rTreeView.set_sort_func([this](const weld::TreeIter& rLeft, const weld::TreeIter& rRight){
             return OnTreeEntryCompare(rLeft, rRight);
         });
         rTreeView.make_sorted();
-        m_pTreeView->setSelChangeHdl( LINK( this, SbaTableQueryBrowser, OnSelectionChange ) );
+        m_pTreeView->SetSelChangeHdl(LINK(this, SbaTableQueryBrowser, OnSelectionChange));
 
         // TODO
         getBrowserView()->getVclControl()->SetHelpId(HID_CTL_TABBROWSER);
@@ -466,7 +467,7 @@ bool SbaTableQueryBrowser::InitializeForm( const Reference< XPropertySet > & i_f
     // this method set all format settings from the original table or query
     try
     {
-        weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+        weld::TreeView& rTreeView = m_pTreeView->GetWidget();
         DBTreeListUserData* pData = reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(*m_xCurrentlyDisplayed).toUInt64());
         ENSURE_OR_RETURN_FALSE( pData, "SbaTableQueryBrowser::InitializeForm: No user data set at the currently displayed entry!" );
         ENSURE_OR_RETURN_FALSE( pData->xObjectProperties.is(), "SbaTableQueryBrowser::InitializeForm: No table available!" );
@@ -546,7 +547,7 @@ void SbaTableQueryBrowser::InitializeGridModel(const Reference< css::form::XForm
                 Sequence< OUString> aProperties(6 + ( m_bPreview ? 5 : 0 ));
                 Sequence< Any> aValues(7 + ( m_bPreview ? 5 : 0 ));
 
-                weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+                weld::TreeView& rTreeView = m_pTreeView->GetWidget();
                 DBTreeListUserData* pData = reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(*m_xCurrentlyDisplayed).toUInt64());
                 OSL_ENSURE( pData->xObjectProperties.is(), "SbaTableQueryBrowser::InitializeGridModel: No table available!" );
                 if ( !pData->xObjectProperties.is() )
@@ -774,7 +775,7 @@ void SbaTableQueryBrowser::transferChangedControlProperty(const OUString& _rProp
 {
     if (m_xCurrentlyDisplayed)
     {
-        weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+        weld::TreeView& rTreeView = m_pTreeView->GetWidget();
         DBTreeListUserData* pData = reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(*m_xCurrentlyDisplayed).toUInt64());
         Reference< XPropertySet > xObjectProps = pData->xObjectProperties;
         OSL_ENSURE(xObjectProps.is(),"SbaTableQueryBrowser::transferChangedControlProperty: no table/query object!");
@@ -787,7 +788,7 @@ void SbaTableQueryBrowser::propertyChange(const PropertyChangeEvent& evt)
 {
     SbaXDataBrowserController::propertyChange(evt);
 
-    weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+    weld::TreeView& rTreeView = m_pTreeView->GetWidget();
 
     try
     {
@@ -1051,7 +1052,7 @@ namespace
 
 OUString SbaTableQueryBrowser::getDataSourceAccessor(const weld::TreeIter& rDataSourceEntry) const
 {
-    weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+    weld::TreeView& rTreeView = m_pTreeView->GetWidget();
     DBTreeListUserData* pData = reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(rDataSourceEntry).toUInt64());
     OSL_ENSURE( pData, "SbaTableQueryBrowser::getDataSourceAccessor: invalid entry data!" );
     OSL_ENSURE( pData->eType == etDatasource, "SbaTableQueryBrowser::getDataSourceAccessor: entry does not denote a data source!" );
@@ -1077,7 +1078,7 @@ std::unique_ptr<weld::TreeIter> SbaTableQueryBrowser::getObjectEntry(const OUStr
             // #i33699#
 
         FilterByEntryDataId aFilter( sDataSourceId );
-        std::unique_ptr<weld::TreeIter> xDataSource = m_pTreeView->getListBox().GetEntryPosByName( sDisplayName, nullptr, &aFilter );
+        std::unique_ptr<weld::TreeIter> xDataSource = m_pTreeView->GetEntryPosByName( sDisplayName, nullptr, &aFilter );
         if (!xDataSource) // check if the data source name is a file location
         {
             if ( bIsDataSourceURL )
@@ -1085,12 +1086,12 @@ std::unique_ptr<weld::TreeIter> SbaTableQueryBrowser::getObjectEntry(const OUStr
                 // special case, the data source is a URL
                 // add new entries to the list box model
                 implAddDatasource( _rDataSource, _rxConnection );
-                xDataSource = m_pTreeView->getListBox().GetEntryPosByName( sDisplayName, nullptr, &aFilter );
+                xDataSource = m_pTreeView->GetEntryPosByName( sDisplayName, nullptr, &aFilter );
                 OSL_ENSURE( xDataSource, "SbaTableQueryBrowser::getObjectEntry: hmm - did not find it again!" );
             }
         }
 
-        weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+        weld::TreeView& rTreeView = m_pTreeView->GetWidget();
 
         if (ppDataSourceEntry)
         {
@@ -1156,7 +1157,7 @@ std::unique_ptr<weld::TreeIter> SbaTableQueryBrowser::getObjectEntry(const OUStr
                     default:
                         assert(false);
                     }
-                    xObject = m_pTreeView->getListBox().GetEntryPosByName(sPath, xCommandType.get());
+                    xObject = m_pTreeView->GetEntryPosByName(sPath, xCommandType.get());
                     rTreeView.copy_iterator(*xObject, *xCommandType);
                     if ( nIndex >= 0 )
                     {
@@ -1170,7 +1171,7 @@ std::unique_ptr<weld::TreeIter> SbaTableQueryBrowser::getObjectEntry(const OUStr
                             {
                                 if ( xCollection->hasByName(sPath) )
                                 {
-                                    if(!m_pTreeView->getListBox().GetEntryPosByName(sPath, xObject.get()))
+                                    if(!m_pTreeView->GetEntryPosByName(sPath, xObject.get()))
                                     {
                                         Reference<XNameAccess> xChild(xCollection->getByName(sPath),UNO_QUERY);
                                         DBTreeListUserData* pEntryData = new DBTreeListUserData;
@@ -1334,7 +1335,7 @@ void SAL_CALL SbaTableQueryBrowser::disposing( const css::lang::EventObject& _rS
                 // our connection is in dispose so we have to find the entry equal with this connection
                 // and close it what means to collapse the entry
                 // get the top-level representing the removed data source
-                weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+                weld::TreeView& rTreeView = m_pTreeView->GetWidget();
                 std::unique_ptr<weld::TreeIter> xDSLoop(rTreeView.make_iterator());
                 if (rTreeView.get_iter_first(*xDSLoop))
                 {
@@ -1628,7 +1629,7 @@ FeatureState SbaTableQueryBrowser::GetState(sal_uInt16 nId) const
         case ID_TREE_CLOSE_CONN:
         case ID_TREE_EDIT_DATABASE:
         {
-            weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+            weld::TreeView& rTreeView = m_pTreeView->GetWidget();
             std::unique_ptr<weld::TreeIter> xCurrentEntry(rTreeView.make_iterator());
             if (!rTreeView.get_cursor(xCurrentEntry.get()))
                 return aReturn;
@@ -1637,7 +1638,7 @@ FeatureState SbaTableQueryBrowser::GetState(sal_uInt16 nId) const
             if ( eType == etUnknown )
                 return aReturn;
 
-            std::unique_ptr<weld::TreeIter> xDataSourceEntry = m_pTreeView->getListBox().GetRootLevelParent(xCurrentEntry.get());
+            std::unique_ptr<weld::TreeIter> xDataSourceEntry = m_pTreeView->GetRootLevelParent(xCurrentEntry.get());
             DBTreeListUserData* pDSData
                 =   xDataSourceEntry
                 ?   reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(*xDataSourceEntry).toUInt64())
@@ -1801,7 +1802,7 @@ void SbaTableQueryBrowser::Execute(sal_uInt16 nId, const Sequence< PropertyValue
 
         case ID_TREE_EDIT_DATABASE:
         {
-            weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+            weld::TreeView& rTreeView = m_pTreeView->GetWidget();
             std::unique_ptr<weld::TreeIter> xIter(rTreeView.make_iterator());
             if (rTreeView.get_cursor(xIter.get()))
                 implAdministrate(*xIter);
@@ -1809,11 +1810,11 @@ void SbaTableQueryBrowser::Execute(sal_uInt16 nId, const Sequence< PropertyValue
         }
         case ID_TREE_CLOSE_CONN:
         {
-            weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+            weld::TreeView& rTreeView = m_pTreeView->GetWidget();
             std::unique_ptr<weld::TreeIter> xIter(rTreeView.make_iterator());
             if (rTreeView.get_cursor(xIter.get()))
             {
-                xIter = m_pTreeView->getListBox().GetRootLevelParent(xIter.get());
+                xIter = m_pTreeView->GetRootLevelParent(xIter.get());
                 closeConnection(*xIter);
             }
             break;
@@ -1856,7 +1857,7 @@ void SbaTableQueryBrowser::Execute(sal_uInt16 nId, const Sequence< PropertyValue
                 // nothing to do
                 break;
 
-            weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+            weld::TreeView& rTreeView = m_pTreeView->GetWidget();
             std::unique_ptr<weld::TreeIter> xSelected = m_xCurrentlyDisplayed ?
                 rTreeView.make_iterator(m_xCurrentlyDisplayed.get()) : nullptr;
 
@@ -1977,7 +1978,7 @@ void SbaTableQueryBrowser::Execute(sal_uInt16 nId, const Sequence< PropertyValue
         case ID_BROWSER_COPY:
             if(m_pTreeView->HasChildPathFocus())
             {
-                weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+                weld::TreeView& rTreeView = m_pTreeView->GetWidget();
                 std::unique_ptr<weld::TreeIter> xCursor(rTreeView.make_iterator());
                 if (rTreeView.get_cursor(xCursor.get()))
                     copyEntry(*xCursor);
@@ -2024,7 +2025,7 @@ void SbaTableQueryBrowser::implAddDatasource(const OUString& _rDbName, OUString&
     OUString sDSDisplayName, sDataSourceId;
     getDataSourceDisplayName_isURL( _rDbName, sDSDisplayName, sDataSourceId );
 
-    weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+    weld::TreeView& rTreeView = m_pTreeView->GetWidget();
     DBTreeListUserData* pDSData = new DBTreeListUserData;
     pDSData->eType = etDatasource;
     pDSData->sAccessor = sDataSourceId;
@@ -2081,7 +2082,7 @@ void SbaTableQueryBrowser::populateTree(const Reference<XNameAccess>& _xNameAcce
                                         const weld::TreeIter& rParent,
                                         EntryType eEntryType)
 {
-    weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+    weld::TreeView& rTreeView = m_pTreeView->GetWidget();
     rTreeView.make_unsorted();
 
     DBTreeListUserData* pData = reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(rParent).toUInt64());
@@ -2093,7 +2094,7 @@ void SbaTableQueryBrowser::populateTree(const Reference<XNameAccess>& _xNameAcce
         const Sequence<OUString> aNames = _xNameAccess->getElementNames();
         for (const OUString& rName : aNames)
         {
-            if( !m_pTreeView->getListBox().GetEntryPosByName(rName, &rParent))
+            if( !m_pTreeView->GetEntryPosByName(rName, &rParent))
             {
                 DBTreeListUserData* pEntryData = new DBTreeListUserData;
                 pEntryData->eType = eEntryType;
@@ -2122,7 +2123,7 @@ std::unique_ptr<weld::TreeIter> SbaTableQueryBrowser::implAppendEntry(const weld
     OUString aImage = xImageProvider->getImageId(rName, getDatabaseObjectType(eEntryType));
 
     OUString sId(OUString::number(reinterpret_cast<sal_uInt64>(pUserData)));
-    weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+    weld::TreeView& rTreeView = m_pTreeView->GetWidget();
     std::unique_ptr<weld::TreeIter> xNewEntry(rTreeView.make_iterator());
     rTreeView.insert(pParent, -1, &rName, &sId, nullptr, nullptr, eEntryType == etQueryContainer, xNewEntry.get());
     rTreeView.set_image(*xNewEntry, aImage);
@@ -2133,14 +2134,14 @@ std::unique_ptr<weld::TreeIter> SbaTableQueryBrowser::implAppendEntry(const weld
 
 IMPL_LINK(SbaTableQueryBrowser, OnExpandEntry, const weld::TreeIter&, rParent, bool)
 {
-    weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+    weld::TreeView& rTreeView = m_pTreeView->GetWidget();
     if (rTreeView.iter_has_child(rParent))
     {
         // nothing to do...
         return true;
     }
 
-    std::unique_ptr<weld::TreeIter> xFirstParent = m_pTreeView->getListBox().GetRootLevelParent(&rParent);
+    std::unique_ptr<weld::TreeIter> xFirstParent = m_pTreeView->GetRootLevelParent(&rParent);
     OSL_ENSURE(xFirstParent,"SbaTableQueryBrowser::OnExpandEntry: No rootlevelparent!");
 
     DBTreeListUserData* pData = reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(rParent).toInt64());
@@ -2244,11 +2245,11 @@ bool SbaTableQueryBrowser::ensureEntryObject(const weld::TreeIter& rEntry)
     EntryType eType = getEntryType(rEntry);
 
     // the user data of the entry
-    weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+    weld::TreeView& rTreeView = m_pTreeView->GetWidget();
     DBTreeListUserData* pEntryData = reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(rEntry).toUInt64());
     OSL_ENSURE(pEntryData,"ensureEntryObject: user data should already be set!");
 
-    std::unique_ptr<weld::TreeIter> xDataSourceEntry = m_pTreeView->getListBox().GetRootLevelParent(&rEntry);
+    std::unique_ptr<weld::TreeIter> xDataSourceEntry = m_pTreeView->GetRootLevelParent(&rEntry);
 
     bool bSuccess = false;
     switch (eType)
@@ -2428,7 +2429,7 @@ bool SbaTableQueryBrowser::implSelect(const OUString& _rDataSourceName, const OU
 
         if (xCommand)
         {
-            weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+            weld::TreeView& rTreeView = m_pTreeView->GetWidget();
 
             bool bSuccess = true;
             if ( _bSelectDirect )
@@ -2464,7 +2465,7 @@ bool SbaTableQueryBrowser::implSelect(const OUString& _rDataSourceName, const OU
 
 IMPL_LINK_NOARG(SbaTableQueryBrowser, OnSelectionChange, LinkParamNone*, void)
 {
-    weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+    weld::TreeView& rTreeView = m_pTreeView->GetWidget();
     std::unique_ptr<weld::TreeIter> xSelection(rTreeView.make_iterator());
     if (!rTreeView.get_selected(xSelection.get()))
         xSelection.reset();
@@ -2473,7 +2474,7 @@ IMPL_LINK_NOARG(SbaTableQueryBrowser, OnSelectionChange, LinkParamNone*, void)
 
 std::unique_ptr<weld::TreeIter> SbaTableQueryBrowser::implGetConnectionEntry(weld::TreeIter& rEntry) const
 {
-    weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+    weld::TreeView& rTreeView = m_pTreeView->GetWidget();
     std::unique_ptr<weld::TreeIter> xCurrentEntry(rTreeView.make_iterator(&rEntry));
     DBTreeListUserData* pEntryData = reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(*xCurrentEntry).toInt64());
     while (pEntryData->eType != etDatasource)
@@ -2489,7 +2490,7 @@ bool SbaTableQueryBrowser::implSelect(weld::TreeIter* pEntry)
     if ( !pEntry )
         return false;
 
-    weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+    weld::TreeView& rTreeView = m_pTreeView->GetWidget();
     DBTreeListUserData* pEntryData = reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(*pEntry).toUInt64());
     switch (pEntryData->eType)
     {
@@ -2708,7 +2709,7 @@ std::unique_ptr<weld::TreeIter> SbaTableQueryBrowser::getEntryFromContainer(cons
 {
     std::unique_ptr<weld::TreeIter> xContainer;
 
-    weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+    weld::TreeView& rTreeView = m_pTreeView->GetWidget();
     std::unique_ptr<weld::TreeIter> xDSLoop(rTreeView.make_iterator(xContainer.get()));
     if (rTreeView.get_iter_first(*xDSLoop))
     {
@@ -2748,7 +2749,7 @@ void SAL_CALL SbaTableQueryBrowser::elementInserted(const ContainerEvent& rEvent
     std::unique_ptr<weld::TreeIter> xEntry = getEntryFromContainer(xNames);
     if (xEntry)  // found one
     {
-        weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+        weld::TreeView& rTreeView = m_pTreeView->GetWidget();
         rTreeView.make_unsorted();
 
         // insert the new entry into the tree
@@ -2784,7 +2785,7 @@ bool SbaTableQueryBrowser::isCurrentlyDisplayedChanged(const OUString& rName, co
 {
     if (!m_xCurrentlyDisplayed)
         return false;
-    weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+    weld::TreeView& rTreeView = m_pTreeView->GetWidget();
     if (getEntryType(*m_xCurrentlyDisplayed) != getChildType(rContainer))
         return false;
     if (rTreeView.get_text(*m_xCurrentlyDisplayed) != rName)
@@ -2806,7 +2807,7 @@ void SAL_CALL SbaTableQueryBrowser::elementRemoved( const ContainerEvent& _rEven
         // a query or table has been removed
         OUString aName = ::comphelper::getString(_rEvent.Accessor);
 
-        weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+        weld::TreeView& rTreeView = m_pTreeView->GetWidget();
         if (isCurrentlyDisplayedChanged(aName, *xContainer))
         {
             // the element displayed currently has been replaced
@@ -2860,7 +2861,7 @@ void SAL_CALL SbaTableQueryBrowser::elementReplaced( const ContainerEvent& _rEve
         // a table or query as been replaced
         OUString aName = ::comphelper::getString(_rEvent.Accessor);
 
-        weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+        weld::TreeView& rTreeView = m_pTreeView->GetWidget();
         if (isCurrentlyDisplayedChanged(aName, *xContainer))
         {   // the element displayed currently has been replaced
 
@@ -2960,7 +2961,7 @@ void SbaTableQueryBrowser::disposeConnection(weld::TreeIter* pDSEntry)
 
     if (pDSEntry)
     {
-        weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+        weld::TreeView& rTreeView = m_pTreeView->GetWidget();
         DBTreeListUserData* pTreeListData = reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(*pDSEntry).toUInt64());
         if (pTreeListData)
             impl_releaseConnection(pTreeListData->xConnection);
@@ -2971,12 +2972,12 @@ void SbaTableQueryBrowser::closeConnection(weld::TreeIter& rDSEntry, bool _bDisp
 {
     OSL_ENSURE(impl_isDataSourceEntry(&rDSEntry), "SbaTableQueryBrowser::closeConnection: invalid entry (not top-level)!");
 
-    weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+    weld::TreeView& rTreeView = m_pTreeView->GetWidget();
 
     // if one of the entries of the given DS is displayed currently, unload the form
     if (m_xCurrentlyDisplayed)
     {
-        std::unique_ptr<weld::TreeIter> xRoot = m_pTreeView->getListBox().GetRootLevelParent(m_xCurrentlyDisplayed.get());
+        std::unique_ptr<weld::TreeIter> xRoot = m_pTreeView->GetRootLevelParent(m_xCurrentlyDisplayed.get());
         if (rTreeView.iter_compare(*xRoot, rDSEntry) == 0)
             unloadAndCleanup(_bDisposeConnection);
     }
@@ -3021,7 +3022,7 @@ void SbaTableQueryBrowser::unloadAndCleanup( bool _bDisposeConnection )
         // nothing to do
         return;
 
-    std::unique_ptr<weld::TreeIter> xDSEntry = m_pTreeView->getListBox().GetRootLevelParent(m_xCurrentlyDisplayed.get());
+    std::unique_ptr<weld::TreeIter> xDSEntry = m_pTreeView->GetRootLevelParent(m_xCurrentlyDisplayed.get());
 
     // de-select the path for the currently displayed table/query
     selectPath(m_xCurrentlyDisplayed.get(), false);
@@ -3196,7 +3197,7 @@ void SbaTableQueryBrowser::impl_initialize()
     // which was given as initial selection
     bLimitedTreeEntries |= !m_bEnableBrowser;
 
-    weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+    weld::TreeView& rTreeView = m_pTreeView->GetWidget();
     rTreeView.make_unsorted();
 
     if ( bLimitedTreeEntries )
@@ -3305,8 +3306,8 @@ void SbaTableQueryBrowser::showExplorer()
 
 bool SbaTableQueryBrowser::ensureConnection(const weld::TreeIter* pAnyEntry, SharedConnection& rConnection)
 {
-    std::unique_ptr<weld::TreeIter> xDSEntry = m_pTreeView->getListBox().GetRootLevelParent(pAnyEntry);
-    weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+    std::unique_ptr<weld::TreeIter> xDSEntry = m_pTreeView->GetRootLevelParent(pAnyEntry);
+    weld::TreeView& rTreeView = m_pTreeView->GetWidget();
     DBTreeListUserData* pDSData =
                 xDSEntry
             ?   reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(*xDSEntry).toUInt64())
@@ -3326,8 +3327,8 @@ std::unique_ptr< ImageProvider > SbaTableQueryBrowser::getImageProviderFor(const
 
 bool SbaTableQueryBrowser::getExistentConnectionFor(const weld::TreeIter* pAnyEntry, SharedConnection& rConnection)
 {
-    std::unique_ptr<weld::TreeIter> xDSEntry = m_pTreeView->getListBox().GetRootLevelParent(pAnyEntry);
-    weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+    std::unique_ptr<weld::TreeIter> xDSEntry = m_pTreeView->GetRootLevelParent(pAnyEntry);
+    weld::TreeView& rTreeView = m_pTreeView->GetWidget();
     DBTreeListUserData* pDSData =
                 xDSEntry
             ?   reinterpret_cast<DBTreeListUserData*>(rTreeView.get_id(*xDSEntry).toUInt64())
@@ -3341,8 +3342,8 @@ bool SbaTableQueryBrowser::impl_isDataSourceEntry(const weld::TreeIter* pEntry)
 {
     if (!pEntry)
         return false;
-    std::unique_ptr<weld::TreeIter> xRoot(m_pTreeView->getListBox().GetRootLevelParent(pEntry));
-    weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+    std::unique_ptr<weld::TreeIter> xRoot(m_pTreeView->GetRootLevelParent(pEntry));
+    weld::TreeView& rTreeView = m_pTreeView->GetWidget();
     return rTreeView.iter_compare(*xRoot, *pEntry) == 0;
 }
 
@@ -3351,7 +3352,7 @@ bool SbaTableQueryBrowser::ensureConnection(const weld::TreeIter* pDSEntry, void
     OSL_ENSURE( impl_isDataSourceEntry( pDSEntry ), "SbaTableQueryBrowser::ensureConnection: this entry does not denote a data source!" );
     if (pDSEntry)
     {
-        weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+        weld::TreeView& rTreeView = m_pTreeView->GetWidget();
         OUString aDSName = rTreeView.get_text(*pDSEntry);
 
         DBTreeListUserData* pTreeListData = static_cast<DBTreeListUserData*>(pDSData);
@@ -3383,7 +3384,7 @@ bool SbaTableQueryBrowser::ensureConnection(const weld::TreeIter* pDSEntry, void
 
 int SbaTableQueryBrowser::OnTreeEntryCompare(const weld::TreeIter& rLHS, const weld::TreeIter& rRHS)
 {
-    weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+    weld::TreeView& rTreeView = m_pTreeView->GetWidget();
 
     // we want the table entry and the end so we have to do a check
     if (isContainer(rRHS))
@@ -3447,7 +3448,7 @@ void SbaTableQueryBrowser::implAdministrate(weld::TreeIter& rApplyTo)
         Reference< XDesktop2 > xFrameLoader = Desktop::create( getORB() );
 
         // the initial selection
-        weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+        weld::TreeView& rTreeView = m_pTreeView->GetWidget();
         std::unique_ptr<weld::TreeIter> xTopLevelSelected(rTreeView.make_iterator(&rApplyTo));
 
         while (rTreeView.get_iter_depth(*xTopLevelSelected))
@@ -3513,13 +3514,13 @@ IController& SbaTableQueryBrowser::getCommandController()
 
 Any SbaTableQueryBrowser::getCurrentSelection( Control& _rControl ) const
 {
-    OSL_PRECOND( &m_pTreeView->getListBox() == &_rControl,
+    OSL_PRECOND( m_pTreeView == &_rControl,
         "SbaTableQueryBrowser::getCurrentSelection: where does this come from?" );
 
-    if ( &m_pTreeView->getListBox() != &_rControl )
+    if ( m_pTreeView != &_rControl )
         return Any();
 
-    weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+    weld::TreeView& rTreeView = m_pTreeView->GetWidget();
     std::unique_ptr<weld::TreeIter> xSelected(rTreeView.make_iterator());
     if (!rTreeView.get_selected(xSelected.get()))
         return Any();
@@ -3650,7 +3651,7 @@ OUString SbaTableQueryBrowser::getPrivateTitle() const
     OUString sTitle;
     if (m_xCurrentlyDisplayed)
     {
-        weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+        weld::TreeView& rTreeView = m_pTreeView->GetWidget();
         std::unique_ptr<weld::TreeIter> xContainer = rTreeView.make_iterator(m_xCurrentlyDisplayed.get());
         if (!rTreeView.iter_parent(*xContainer))
             return OUString();
@@ -3748,7 +3749,7 @@ void SAL_CALL SbaTableQueryBrowser::registeredDatabaseLocation( const DatabaseRe
 void SbaTableQueryBrowser::impl_cleanupDataSourceEntry(const OUString& rDataSourceName)
 {
     // get the top-level representing the removed data source
-    weld::TreeView& rTreeView = m_pTreeView->getListBox().GetWidget();
+    weld::TreeView& rTreeView = m_pTreeView->GetWidget();
     std::unique_ptr<weld::TreeIter> xDataSourceEntry(rTreeView.make_iterator());
     bool bDataSourceEntry = rTreeView.get_iter_first(*xDataSourceEntry);
     while (bDataSourceEntry)
diff --git a/dbaccess/source/ui/inc/brwview.hxx b/dbaccess/source/ui/inc/brwview.hxx
index 82a7129f6985..f05d8c0303c3 100644
--- a/dbaccess/source/ui/inc/brwview.hxx
+++ b/dbaccess/source/ui/inc/brwview.hxx
@@ -24,6 +24,7 @@
 
 #include <dbaccess/dataview.hxx>
 #include <unotools/eventlisteneradapter.hxx>
+#include "dbtreelistbox.hxx"
 
 namespace com::sun::star::awt {
     class XControl;
@@ -35,14 +36,13 @@ class Splitter;
 
 namespace dbaui
 {
-    class DBTreeView;
     class SbaGridControl;
 
     class UnoDataBrowserView final : public ODataView, public ::utl::OEventListenerAdapter
     {
         css::uno::Reference< css::awt::XControl >                 m_xGrid;            // our grid's UNO representation
         css::uno::Reference< css::awt::XControlContainer >        m_xMe;              // our own UNO representation
-        VclPtr<DBTreeView>             m_pTreeView;
+        VclPtr<InterimDBTreeListBox>   m_pTreeView;
         VclPtr<Splitter>               m_pSplitter;
         mutable VclPtr<SbaGridControl> m_pVclControl;  // our grid's VCL representation
         VclPtr<vcl::Window>            m_pStatus;
@@ -68,8 +68,8 @@ namespace dbaui
         sal_uInt16 View2ModelPos(sal_uInt16 nPos) const;
         /// for the same reason the view column count isn't the same as the model column count
 
-        void setSplitter(Splitter* _pSplitter);
-        void setTreeView(DBTreeView* _pTreeView);
+        void setSplitter(Splitter* pSplitter);
+        void setTreeView(InterimDBTreeListBox* pTreeView);
 
         void    showStatus( const OUString& _rStatus );
         void    hideStatus();
diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx
index 8c3b99004534..f55efc576f56 100644
--- a/dbaccess/source/ui/inc/unodatbr.hxx
+++ b/dbaccess/source/ui/inc/unodatbr.hxx
@@ -93,7 +93,7 @@ namespace dbaui
         OUString         m_sQueryCommand;    // the command of the query currently loaded (if any)
         //OUString         m_sToBeLoaded;      // contains the element name which should be loaded if any
 
-        VclPtr<DBTreeView>      m_pTreeView; // contains the datasources of the registry
+        VclPtr<InterimDBTreeListBox> m_pTreeView; // contains the datasources of the registry
         VclPtr<Splitter>        m_pSplitter;
         std::unique_ptr<weld::TreeIter> m_xCurrentlyDisplayed;
         ImplSVEvent *           m_nAsyncDrop;
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 3ae46bd3213a..85e67c59cd88 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -3114,8 +3114,6 @@ dbaccess/source/ui/browser/dbexchange.cxx
 dbaccess/source/ui/browser/dbloader.cxx
 dbaccess/source/ui/browser/dbtreemodel.cxx
 dbaccess/source/ui/browser/dbtreemodel.hxx
-dbaccess/source/ui/browser/dbtreeview.cxx
-dbaccess/source/ui/browser/dbtreeview.hxx
 dbaccess/source/ui/browser/dsEntriesNoExp.cxx
 dbaccess/source/ui/browser/dsbrowserDnD.cxx
 dbaccess/source/ui/browser/exsrcbrw.cxx