Merged SvTreeListBox and SvLBox.

There is no reason to keep SvLBox separate.

Change-Id: I0b34aa8f8ca539d4f4f0f9cea9fa9b8faec241e8

5 files changed, 29 insertions, 29 deletions

diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index 6b60bb8cf8bf..74d73a32194c 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -40,7 +40,7 @@ namespace com { namespace sun { namespace star { namespace text { class XTextRan
 #include <vcl/button.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/dialog.hxx>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
 #include <unotools/moduleoptions.hxx>
 
 #include "srchdlg.hxx"
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index df3a812d358c..e501569efdad 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -442,7 +442,7 @@ public:
 
     void            SetDoubleClickHdl(const Link &rLink) { aDoubleClickLink = rLink; }
     void            SetDropHdl(const Link &rLink) { aDropLink = rLink; }
-        using SvLBox::GetParent;
+    using SvTreeListBox::GetParent;
     const String&   GetParent() const { return aParent; }
     const String&   GetStyle() const { return aStyle; }
     void            MakeExpanded_Impl(ExpandedEntries_t& rEntries) const;
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx
index 2c28cd354b81..e976a393316b 100644
--- a/sfx2/source/doc/docvor.cxx
+++ b/sfx2/source/doc/docvor.cxx
@@ -114,7 +114,7 @@ friend class SfxOrganizeListBox_Impl;
     Printer*                 pPrt;
 
     // save pointer for asynchronous D&D
-    SvLBox*                 pSourceView;
+    SvTreeListBox*                 pSourceView;
     SvLBoxEntry*            pTargetEntry;
     SfxOrganizeListBox_Impl* pFinishedBox;
     sal_Int8                nDropAction;
@@ -391,7 +391,7 @@ class Path
 {
     ImpPath_Impl *pData;
 public:
-    Path(SvLBox *pBox, SvLBoxEntry *pEntry);
+    Path(SvTreeListBox *pBox, SvLBoxEntry *pEntry);
     Path(const Path &rPath):
         pData(rPath.pData)
     {
@@ -422,7 +422,7 @@ public:
 
 //-------------------------------------------------------------------------
 
-Path::Path(SvLBox *pBox, SvLBoxEntry *pEntry) :
+Path::Path(SvTreeListBox *pBox, SvLBoxEntry *pEntry) :
     pData(new ImpPath_Impl)
 {
     DBG_ASSERT(pEntry != 0, "EntryPtr ist NULL");
@@ -441,7 +441,7 @@ Path::Path(SvLBox *pBox, SvLBoxEntry *pEntry) :
 
 //-------------------------------------------------------------------------
 
-SvLBoxEntry *GetIndices_Impl(SvLBox *pBox,
+SvLBoxEntry *GetIndices_Impl(SvTreeListBox *pBox,
                                SvLBoxEntry *pEntry,
                                sal_uInt16 &rRegion,
                                sal_uInt16 &rOffset)
@@ -451,7 +451,7 @@ SvLBoxEntry *GetIndices_Impl(SvLBox *pBox,
 
     [Parameter]
 
-    SvLBox *pBox            Listbox where the event occurred
+    SvTreeListBox *pBox            Listbox where the event occurred
     SvLBoxEntry *pEntry     Entry whose position is to be determined
     sal_uInt16 &rRegion         the region within the region of the
                             document template (Out-Parameter)
@@ -504,7 +504,7 @@ sal_Bool SfxOrganizeListBox_Impl::Select( SvLBoxEntry* pEntry, sal_Bool bSelect
 
 //-------------------------------------------------------------------------
 
-sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvLBox *pSourceBox,
+sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvTreeListBox *pSourceBox,
                                             SvLBoxEntry *pSource,
                                             SvLBoxEntry* pTarget,
                                             SvLBoxEntry *&pNewParent,
@@ -516,7 +516,7 @@ sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvLBox *pSourceBox,
 
     [Parameter]
 
-    SvLBox *pSourceBox          Source Listbox, at which the event occurred
+    SvTreeListBox *pSourceBox          Source Listbox, at which the event occurred
     SvLBoxEntry* pTarget        Target entry, to where it will be moved
     SvLBoxEntry *pSource        Source entry, to be copied / moved
     SvLBoxEntry *&pNewParent    the parent of the target position generated
@@ -529,7 +529,7 @@ sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvLBox *pSourceBox,
 
     [Cross-references]
 
-    <SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
+    <SfxOrganizeListBox_Impl::MoveOrCopyContents(SvTreeListBox *pSourceBox,
                                             SvLBoxEntry *pSource,
                                             SvLBoxEntry* pTarget,
                                             SvLBoxEntry *&pNewParent,
@@ -577,7 +577,7 @@ sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvLBox *pSourceBox,
                     rIdx = 0;
                 }
                 else
-                    SvLBox::NotifyCopying(
+                    SvTreeListBox::NotifyCopying(
                         pTarget, pSource, pNewParent, rIdx);
             }
         }
@@ -595,7 +595,7 @@ sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvLBox *pSourceBox,
 
 //-------------------------------------------------------------------------
 
-sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
+sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyContents(SvTreeListBox *pSourceBox,
                                             SvLBoxEntry *pSource,
                                             SvLBoxEntry* pTarget,
                                             SvLBoxEntry *&pNewParent,
@@ -607,7 +607,7 @@ sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
 
     [Parameter]
 
-    SvLBox *pSourceBox          Source Listbox, at which the event occurred
+    SvTreeListBox *pSourceBox          Source Listbox, at which the event occurred
     SvLBoxEntry* pTarget        Target entry, to where it will be moved
     SvLBoxEntry *pSource        Source entry, to be copied / moved
     SvLBoxEntry *&pNewParent    the parent of the target position generated
@@ -620,7 +620,7 @@ sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
 
     [Cross-references]
 
-    <SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvLBox *pSourceBox,
+    <SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvTreeListBox *pSourceBox,
                                             SvLBoxEntry *pSource,
                                             SvLBoxEntry* pTarget,
                                             SvLBoxEntry *&pNewParent,
@@ -769,13 +769,13 @@ sal_Bool SfxOrganizeListBox_Impl::NotifyMoving(SvLBoxEntry *pTarget,
 
     [Cross-references]
 
-    <SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvLBox *pSourceBox,
+    <SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvTreeListBox *pSourceBox,
                                             SvLBoxEntry *pSource,
                                             SvLBoxEntry* pTarget,
                                             SvLBoxEntry *&pNewParent,
                                             sal_uIntPtr &rIdx,
                                             sal_Bool bCopy)>
-    <SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
+    <SfxOrganizeListBox_Impl::MoveOrCopyContents(SvTreeListBox *pSourceBox,
                                             SvLBoxEntry *pSource,
                                             SvLBoxEntry* pTarget,
                                             SvLBoxEntry *&pNewParent,
@@ -789,7 +789,7 @@ sal_Bool SfxOrganizeListBox_Impl::NotifyMoving(SvLBoxEntry *pTarget,
 
 {
     sal_Bool bOk =  sal_False;
-    SvLBox* pSourceBox = GetSourceView();
+    SvTreeListBox* pSourceBox = GetSourceView();
     if ( !pSourceBox )
         pSourceBox = pDlg->pSourceView;
     DBG_ASSERT( pSourceBox, "no source view" );
@@ -828,13 +828,13 @@ sal_Bool SfxOrganizeListBox_Impl::NotifyCopying(SvLBoxEntry *pTarget,
 
     [Cross-references]
 
-    <SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvLBox *pSourceBox,
+    <SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvTreeListBox *pSourceBox,
                                             SvLBoxEntry *pSource,
                                             SvLBoxEntry* pTarget,
                                             SvLBoxEntry *&pNewParent,
                                             sal_uIntPtr &rIdx,
                                             sal_Bool bCopy)>
-    <SfxOrganizeListBox_Impl::MoveOrCopyContents(SvLBox *pSourceBox,
+    <SfxOrganizeListBox_Impl::MoveOrCopyContents(SvTreeListBox *pSourceBox,
                                             SvLBoxEntry *pSource,
                                             SvLBoxEntry* pTarget,
                                             SvLBoxEntry *&pNewParent,
@@ -847,7 +847,7 @@ sal_Bool SfxOrganizeListBox_Impl::NotifyCopying(SvLBoxEntry *pTarget,
 */
 {
     sal_Bool bOk =  sal_False;
-    SvLBox* pSourceBox = GetSourceView();
+    SvTreeListBox* pSourceBox = GetSourceView();
     if ( !pSourceBox )
         pSourceBox = pDlg->pSourceView;
     DBG_ASSERT( pSourceBox, "no source view" );
@@ -963,7 +963,7 @@ sal_Bool SfxOrganizeListBox_Impl::NotifyAcceptDrop( SvLBoxEntry* pEntry )
 {
     if(!pEntry)
         return sal_False;
-    SvLBox *pSource = GetSourceView();
+    SvTreeListBox *pSource = GetSourceView();
     SvLBoxEntry *pSourceEntry = pSource->FirstSelected();
     if(pEntry == pSourceEntry)
         return sal_False;
@@ -1203,11 +1203,11 @@ long SfxOrganizeListBox_Impl::ExpandingHdl()
             else
                 pMgr->DeleteObjectShell(aPath[0], aPath[1]);
             // Delete all SubEntries
-            SvLBoxEntry *pToDel = SvLBox::GetEntry(pEntry, 0);
+            SvLBoxEntry *pToDel = SvTreeListBox::GetEntry(pEntry, 0);
             while(pToDel)
             {
                 GetModel()->Remove(pToDel);
-                pToDel = SvLBox::GetEntry(pEntry, 0);
+                pToDel = SvTreeListBox::GetEntry(pEntry, 0);
             }
         }
     }
@@ -1333,7 +1333,7 @@ IMPL_LINK( SfxOrganizeListBox_Impl, OnAsyncExecuteDrop, ExecuteDropEvent*, pEven
     DBG_ASSERT( pEvent, "invalid DropEvent" );
     if ( pEvent )
     {
-        SvLBox* pSourceView = GetSourceView();
+        SvTreeListBox* pSourceView = GetSourceView();
         if ( !pSourceView )
             pSourceView = pDlg->pSourceView;
         pDlg->bExecDropFinished = false;
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 0cc98f327bf4..12fe31533776 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -25,7 +25,7 @@ class SfxTemplateControllerItem;
 #include <vcl/toolbox.hxx>
 #include <vcl/lstbox.hxx>
 #include <svl/lstner.hxx>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
 #include <svl/eitem.hxx>
 
 #include <rsc/rscsfx.hxx>
@@ -68,7 +68,7 @@ public:
 
     virtual void     MouseButtonDown( const MouseEvent& rMEvt );
     virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
-    using SvLBox::ExecuteDrop;
+    using SvTreeListBox::ExecuteDrop;
     virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
 
     sal_uInt16           GetModifier() const { return nModifier; }
diff --git a/sfx2/source/view/orgmgr.cxx b/sfx2/source/view/orgmgr.cxx
index e224d55b2242..a2d686206ec6 100644
--- a/sfx2/source/view/orgmgr.cxx
+++ b/sfx2/source/view/orgmgr.cxx
@@ -467,7 +467,7 @@ sal_Bool    SfxOrganizeMgr::Delete(SfxOrganizeListBox_Impl *pCaller,
     {
         // deleting of a group
 
-        SvLBoxEntry *pGroupToDelete = pCaller->SvLBox::GetEntry(nRegion);
+        SvLBoxEntry *pGroupToDelete = pCaller->GetEntry(nRegion);
         if ( pGroupToDelete )
         {
             sal_uInt16 nItemNum = (sal_uInt16)( pCaller->GetModel()->GetChildCount( pGroupToDelete ) );
@@ -481,7 +481,7 @@ sal_Bool    SfxOrganizeMgr::Delete(SfxOrganizeListBox_Impl *pCaller,
                 if ( pTemplates->Delete( nRegion, nInd ) )
                 {
                     bModified = 1;
-                    pEntriesToDelete.push_back( pCaller->SvLBox::GetEntry( pGroupToDelete, nInd ) );
+                    pEntriesToDelete.push_back( pCaller->GetEntry( pGroupToDelete, nInd ) );
                 }
             }
 
@@ -504,7 +504,7 @@ sal_Bool    SfxOrganizeMgr::Delete(SfxOrganizeListBox_Impl *pCaller,
         {
             bModified = 1;
                 // Entry to be deleted.
-            SvLBoxEntry *pEntryToDelete = pCaller->SvLBox::GetEntry(pCaller->SvLBox::GetEntry(nRegion), nIdx);
+            SvLBoxEntry *pEntryToDelete = pCaller->GetEntry(pCaller->GetEntry(nRegion), nIdx);
 
             pCaller->GetModel()->Remove(pEntryToDelete);
         }