Merge SvLBoxTreeList and SvTreeList.

Change-Id: I318ff6f1009b1aaa7d0bd3abb250f92fb51a21cd

8 files changed, 12 insertions, 12 deletions

diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 7bbc447cda5a..dfcea23ffa12 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -286,7 +286,7 @@ void OAppDetailPageHelper::selectAll()
 void OAppDetailPageHelper::sort(int _nPos,SvSortMode _eSortMode )
 {
     OSL_ENSURE(m_pLists[_nPos],"List can not be NULL! ->GPF");
-    SvLBoxTreeList* pModel = m_pLists[_nPos]->GetModel();
+    SvTreeList* pModel = m_pLists[_nPos]->GetModel();
     SvSortMode eOldSortMode = pModel->GetSortMode();
     pModel->SetSortMode(_eSortMode);
     if ( eOldSortMode != _eSortMode )
@@ -299,7 +299,7 @@ sal_Bool OAppDetailPageHelper::isSortUp() const
     int nPos = getVisibleControlIndex();
     if ( nPos < E_ELEMENT_TYPE_COUNT )
     {
-        SvLBoxTreeList* pModel = m_pLists[nPos]->GetModel();
+        SvTreeList* pModel = m_pLists[nPos]->GetModel();
         eSortMode = pModel->GetSortMode();
     }
     return eSortMode == SortAscending;
diff --git a/dbaccess/source/ui/browser/dbtreeview.cxx b/dbaccess/source/ui/browser/dbtreeview.cxx
index 6f26f6c063f3..91ee108c47c7 100644
--- a/dbaccess/source/ui/browser/dbtreeview.cxx
+++ b/dbaccess/source/ui/browser/dbtreeview.cxx
@@ -85,7 +85,7 @@ void DBTreeView::Resize()
     m_pTreeListBox->SetPosSizePixel(Point(0,0),GetOutputSizePixel());
 }
 // -------------------------------------------------------------------------
-void DBTreeView::setModel(SvLBoxTreeList* _pTreeModel)
+void DBTreeView::setModel(SvTreeList* _pTreeModel)
 {
     if (_pTreeModel)
         _pTreeModel->InsertView(m_pTreeListBox);
diff --git a/dbaccess/source/ui/browser/dbtreeview.hxx b/dbaccess/source/ui/browser/dbtreeview.hxx
index 9eea983ba8ce..c54cf39ae8da 100644
--- a/dbaccess/source/ui/browser/dbtreeview.hxx
+++ b/dbaccess/source/ui/browser/dbtreeview.hxx
@@ -24,7 +24,7 @@
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
-class SvLBoxTreeList;
+class SvTreeList;
 namespace dbaui
 {
     class DBTreeListBox;
@@ -56,7 +56,7 @@ namespace dbaui
         void    setCopyHandler(const Link& _rHdl);
 
 
-        void                setModel(SvLBoxTreeList* _pTreeModel);
+        void                setModel(SvTreeList* _pTreeModel);
         void                setSelChangeHdl(const Link& _rHdl);
 
         DBTreeListBox&      getListBox() const { return *m_pTreeListBox; }
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 8c8e2a5c0df0..c5d9242d34c5 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -321,7 +321,7 @@ void SAL_CALL SbaTableQueryBrowser::disposing()
     // clear the tree model
     {
         SAL_WNODEPRECATED_DECLARATIONS_PUSH
-        ::std::auto_ptr<SvLBoxTreeList> aTemp(m_pTreeModel);
+        ::std::auto_ptr<SvTreeList> aTemp(m_pTreeModel);
         SAL_WNODEPRECATED_DECLARATIONS_POP
         m_pTreeModel = NULL;
     }
@@ -393,7 +393,7 @@ sal_Bool SbaTableQueryBrowser::Construct(Window* pParent)
         getBrowserView()->setTreeView(m_pTreeView);
 
         // fill view with data
-        m_pTreeModel = new SvLBoxTreeList;
+        m_pTreeModel = new SvTreeList;
         m_pTreeModel->SetSortMode(SortAscending);
         m_pTreeModel->SetCompareHdl(LINK(this, SbaTableQueryBrowser, OnTreeEntryCompare));
         m_pTreeView->setModel(m_pTreeModel);
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index 685bcf877444..ec14ea60525a 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -110,7 +110,7 @@ DBTreeListBox::~DBTreeListBox()
 //------------------------------------------------------------------------
 SvTreeListEntry* DBTreeListBox::GetEntryPosByName( const String& aName, SvTreeListEntry* pStart, const IEntryFilter* _pFilter ) const
 {
-    SvLBoxTreeList* myModel = GetModel();
+    SvTreeList* myModel = GetModel();
     SvTreeEntryList* pChildren = myModel->GetChildList(pStart);
     SvTreeListEntry* pEntry = NULL;
     if ( pChildren )
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index c5fb8365d446..73e8624875e3 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -458,7 +458,7 @@ DBG_NAME(DbaIndexDialog)
             showError(aExceptionInfo, this, m_xORB);
         else if (bSuccess && _bRemoveFromCollection)
         {
-            SvLBoxTreeList* pModel = m_aIndexes.GetModel();
+            SvTreeList* pModel = m_aIndexes.GetModel();
 
             m_aIndexes.disableSelectHandler();
             pModel->Remove(_pEntry);
diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx
index 6ad76e7d4280..c40f077abf3c 100644
--- a/dbaccess/source/ui/inc/unodatbr.hxx
+++ b/dbaccess/source/ui/inc/unodatbr.hxx
@@ -50,7 +50,7 @@ struct SvSortData;
 
 namespace com { namespace sun{ namespace star { namespace container { class XNameContainer; } } } }
 
-class SvLBoxTreeList;
+class SvTreeList;
 // .........................................................................
 namespace dbaui
 {
@@ -109,7 +109,7 @@ namespace dbaui
 
         DBTreeView*             m_pTreeView;
         Splitter*               m_pSplitter;
-        SvLBoxTreeList*         m_pTreeModel;           // contains the datasources of the registry
+        SvTreeList*         m_pTreeModel;           // contains the datasources of the registry
         SvTreeListEntry*            m_pCurrentlyDisplayed;
         sal_uLong                   m_nAsyncDrop;
 
diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
index f6047d901821..ab97283db94a 100644
--- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
@@ -90,7 +90,7 @@ SvTreeListEntry* OTableWindowListBox::GetEntryFromText( const String& rEntryText
 {
     //////////////////////////////////////////////////////////////////////
     // Liste durchiterieren
-    SvLBoxTreeList* pTreeList = GetModel();
+    SvTreeList* pTreeList = GetModel();
     SvTreeListEntry* pEntry = pTreeList->First();
     OJoinDesignView* pView = m_pTabWin->getDesignView();
     OJoinController& rController = pView->getController();