Merge SvListEntry and SvLBoxEntry into SvTreeListEntry.

Change-Id: I89cfc8c1288c00674fe64e791c149743d377d5ee

13 files changed, 118 insertions, 118 deletions

diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx
index dc5bb8b3d6fe..6b3a48ed0dab 100644
--- a/sc/source/ui/condformat/condformatmgr.cxx
+++ b/sc/source/ui/condformat/condformatmgr.cxx
@@ -87,8 +87,8 @@ void ScCondFormatManagerWindow::Init()
 
     for(ScConditionalFormatList::iterator itr = mpFormatList->begin(); itr != mpFormatList->end(); ++itr)
     {
-        SvLBoxEntry* pEntry = InsertEntryToColumn( createEntryString(*itr), LIST_APPEND, 0xffff );
-        maMapLBoxEntryToCondIndex.insert(std::pair<SvLBoxEntry*,sal_Int32>(pEntry,itr->GetKey()));
+        SvTreeListEntry* pEntry = InsertEntryToColumn( createEntryString(*itr), LIST_APPEND, 0xffff );
+        maMapLBoxEntryToCondIndex.insert(std::pair<SvTreeListEntry*,sal_Int32>(pEntry,itr->GetKey()));
     }
     SetUpdateMode(true);
 }
@@ -97,7 +97,7 @@ void ScCondFormatManagerWindow::DeleteSelection()
 {
     if(GetSelectionCount())
     {
-        for(SvLBoxEntry* pEntry = FirstSelected(); pEntry != NULL; pEntry = NextSelected(pEntry))
+        for(SvTreeListEntry* pEntry = FirstSelected(); pEntry != NULL; pEntry = NextSelected(pEntry))
         {
             sal_Int32 nIndex = maMapLBoxEntryToCondIndex.find(pEntry)->second;
             mpFormatList->erase(nIndex);
@@ -108,7 +108,7 @@ void ScCondFormatManagerWindow::DeleteSelection()
 
 ScConditionalFormat* ScCondFormatManagerWindow::GetSelection()
 {
-    SvLBoxEntry* pEntry = FirstSelected();
+    SvTreeListEntry* pEntry = FirstSelected();
     if(!pEntry)
         return NULL;
 
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx
index ea24d6c5f039..7ddb18e3a1af 100644
--- a/sc/source/ui/dbgui/tpsubt.cxx
+++ b/sc/source/ui/dbgui/tpsubt.cxx
@@ -406,7 +406,7 @@ IMPL_LINK( ScTpSubTotalGroup, CheckHdl, ListBox *, pLb )
 {
     if ( ((SvxCheckListBox*)pLb) == &aLbColumns )
     {
-        SvLBoxEntry* pEntry = aLbColumns.GetHdlEntry();
+        SvTreeListEntry* pEntry = aLbColumns.GetHdlEntry();
 
         if ( pEntry )
         {
diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx
index 385c969f2ad6..fd2ed6bdf159 100644
--- a/sc/source/ui/inc/acredlin.hxx
+++ b/sc/source/ui/inc/acredlin.hxx
@@ -181,31 +181,31 @@ protected:
 
     rtl::OUString* MakeTypeString(ScChangeActionType eType);
 
-    SvLBoxEntry* InsertChangeAction(
+    SvTreeListEntry* InsertChangeAction(
         const ScChangeAction* pScChangeAction,ScChangeActionState eState,
-        SvLBoxEntry* pParent=NULL,bool bDelMaster = false,
+        SvTreeListEntry* pParent=NULL,bool bDelMaster = false,
         bool bDisabled = false,sal_uLong nPos = LIST_APPEND);
 
-    SvLBoxEntry* InsertFilteredAction(
+    SvTreeListEntry* InsertFilteredAction(
         const ScChangeAction* pScChangeAction,ScChangeActionState eState,
-        SvLBoxEntry* pParent = NULL,bool bDelMaster = false,
+        SvTreeListEntry* pParent = NULL,bool bDelMaster = false,
         bool bDisabled = false, sal_uLong nPos = LIST_APPEND);
 
-    SvLBoxEntry*    InsertChangeActionContent(const ScChangeActionContent* pScChangeAction,
-                                              SvLBoxEntry* pParent,sal_uLong nSpecial);
+    SvTreeListEntry*    InsertChangeActionContent(const ScChangeActionContent* pScChangeAction,
+                                              SvTreeListEntry* pParent,sal_uLong nSpecial);
 
     void            GetDependents( const ScChangeAction* pScChangeAction,
                                 ScChangeActionMap& aActionMap,
-                                SvLBoxEntry* pEntry);
+                                SvTreeListEntry* pEntry);
 
-    bool            InsertContentChildren( ScChangeActionMap* pActionMap, SvLBoxEntry* pParent );
+    bool            InsertContentChildren( ScChangeActionMap* pActionMap, SvTreeListEntry* pParent );
 
-    bool            InsertAcceptedORejected(SvLBoxEntry* pParent);
+    bool            InsertAcceptedORejected(SvTreeListEntry* pParent);
 
     bool            InsertDeletedChildren( const ScChangeAction* pChangeAction, ScChangeActionMap* pActionMap,
-                                        SvLBoxEntry* pParent);
+                                        SvTreeListEntry* pParent);
 
-    bool            InsertChildren( ScChangeActionMap* pActionMap, SvLBoxEntry* pParent );
+    bool            InsertChildren( ScChangeActionMap* pActionMap, SvTreeListEntry* pParent );
 
     void            AppendChanges(ScChangeTrack* pChanges,sal_uLong nStartAction, sal_uLong nEndAction,
                                     sal_uLong nPos=LIST_APPEND);
@@ -217,7 +217,7 @@ protected:
     void            ClearView();
 
     bool            Expand(ScChangeTrack* pChanges,const ScChangeAction* pScChangeAction,
-                           SvLBoxEntry* pEntry, bool bFilter = false);
+                           SvTreeListEntry* pEntry, bool bFilter = false);
 
 public:
                     ScAcceptChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
diff --git a/sc/source/ui/inc/condformatmgr.hxx b/sc/source/ui/inc/condformatmgr.hxx
index 5b0d1e8a9f82..cb41d20b0900 100644
--- a/sc/source/ui/inc/condformatmgr.hxx
+++ b/sc/source/ui/inc/condformatmgr.hxx
@@ -51,7 +51,7 @@ private:
     ScDocument* mpDoc;
     ScConditionalFormatList* mpFormatList;
     const ScAddress& mrPos;
-    std::map<SvLBoxEntry*, sal_Int32> maMapLBoxEntryToCondIndex;
+    std::map<SvTreeListEntry*, sal_Int32> maMapLBoxEntryToCondIndex;
 
     DECL_LINK( HeaderEndDragHdl, void* );
 
diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx
index b2b3739c355e..00c050c1c45a 100644
--- a/sc/source/ui/inc/conflictsdlg.hxx
+++ b/sc/source/ui/inc/conflictsdlg.hxx
@@ -178,7 +178,7 @@ private:
     String              GetActionString( const ScChangeAction* pAction, ScDocument* pDoc );
     void                HandleListBoxSelection( bool bSelectHandle );
 
-    void                SetConflictAction( SvLBoxEntry* pRootEntry, ScConflictAction eConflictAction );
+    void                SetConflictAction( SvTreeListEntry* pRootEntry, ScConflictAction eConflictAction );
     void                KeepHandler( bool bMine );
     void                KeepAllHandler( bool bMine );
 
diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx
index f6f757fc783f..08722981ddee 100644
--- a/sc/source/ui/inc/content.hxx
+++ b/sc/source/ui/inc/content.hxx
@@ -56,7 +56,7 @@ class ScContentTree : public SvTreeListBox
 {
     ScNavigatorDlg*     pParentWindow;
     ImageList           aEntryImages;
-    SvLBoxEntry*        pRootNodes[SC_CONTENT_COUNT];
+    SvTreeListEntry*        pRootNodes[SC_CONTENT_COUNT];
     sal_uInt16              nRootType;          // set as Root
     String              aManualDoc;         // Switched in Navigator (Title)
     sal_Bool                bHiddenDoc;         // Hidden active?
@@ -97,12 +97,12 @@ class ScContentTree : public SvTreeListBox
         @param rnRootIndex  Root index of specified entry is returned.
         @param rnChildIndex  Index of the entry inside its root is returned (or SC_CONTENT_NOCHILD if entry is root).
         @param pEntry  The entry to examine. */
-    void    GetEntryIndexes( sal_uInt16& rnRootIndex, sal_uLong& rnChildIndex, SvLBoxEntry* pEntry ) const;
+    void    GetEntryIndexes( sal_uInt16& rnRootIndex, sal_uLong& rnChildIndex, SvTreeListEntry* pEntry ) const;
 
     /** Returns the child index of the specified listbox entry.
         @param pEntry  The entry to examine or NULL for the selected entry.
         @return  Index of the entry inside its root or SC_CONTENT_NOCHILD if entry is root. */
-    sal_uLong   GetChildIndex( SvLBoxEntry* pEntry ) const;
+    sal_uLong   GetChildIndex( SvTreeListEntry* pEntry ) const;
 
     void    DoDrag();
 
diff --git a/sc/source/ui/inc/namemgrtable.hxx b/sc/source/ui/inc/namemgrtable.hxx
index 3646164a7d5e..f4c37c89ce59 100644
--- a/sc/source/ui/inc/namemgrtable.hxx
+++ b/sc/source/ui/inc/namemgrtable.hxx
@@ -71,10 +71,10 @@ private:
     // for performance, save which entries already have the formula entry
     // otherwise opening the dialog with a lot of range names is extremelly slow because
     // we would calculate all formula strings during opening
-    std::map<SvLBoxEntry*, bool> maCalculatedFormulaEntries;
+    std::map<SvTreeListEntry*, bool> maCalculatedFormulaEntries;
     const ScAddress maPos;
 
-    void GetLine(ScRangeNameLine& aLine, SvLBoxEntry* pEntry);
+    void GetLine(ScRangeNameLine& aLine, SvTreeListEntry* pEntry);
     void Init();
     void CheckForFormulaString();
     const ScRangeData* findRangeData(const ScRangeNameLine& rLine);
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index 326e80f7f8fa..dfc0f93ec620 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -178,7 +178,7 @@ ScAcceptChgDlg::ScAcceptChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pP
     aAcceptChgCtr.SetMinSizeHdl( LINK( this, ScAcceptChgDlg, MinSizeHandle ));
 
     UpdateView();
-    SvLBoxEntry* pEntry=pTheView->First();
+    SvTreeListEntry* pEntry=pTheView->First();
     if(pEntry!=NULL)
     {
         pTheView->Select(pEntry);
@@ -376,15 +376,15 @@ bool ScAcceptChgDlg::IsValidAction(const ScChangeAction* pScChangeAction)
     return bFlag;
 }
 
-SvLBoxEntry* ScAcceptChgDlg::InsertChangeAction(
+SvTreeListEntry* ScAcceptChgDlg::InsertChangeAction(
     const ScChangeAction* pScChangeAction, ScChangeActionState /*eState*/,
-    SvLBoxEntry* pParent, bool bDelMaster,bool bDisabled, sal_uLong nPos)
+    SvTreeListEntry* pParent, bool bDelMaster,bool bDisabled, sal_uLong nPos)
 {
     ScChangeTrack* pChanges=pDoc->GetChangeTrack();
 
     if(pScChangeAction==NULL || pChanges==NULL) return NULL;
 
-    SvLBoxEntry* pEntry=NULL;
+    SvTreeListEntry* pEntry=NULL;
 
     bool bFlag = false;
 
@@ -509,11 +509,11 @@ SvLBoxEntry* ScAcceptChgDlg::InsertChangeAction(
     {
         pEntry = pTheView->InsertEntry(
             aBuf.makeStringAndClear(), pNewData, Color(COL_GREEN), pParent, nPos);
-        SvLBoxEntry* pExpEntry=pParent;
+        SvTreeListEntry* pExpEntry=pParent;
 
         while(pExpEntry!=NULL && !pTheView->IsExpanded(pExpEntry))
         {
-            SvLBoxEntry* pTmpEntry=pTheView->GetParent(pExpEntry);
+            SvTreeListEntry* pTmpEntry=pTheView->GetParent(pExpEntry);
 
             if(pTmpEntry!=NULL) pTheView->Expand(pExpEntry);
 
@@ -528,9 +528,9 @@ SvLBoxEntry* ScAcceptChgDlg::InsertChangeAction(
     return pEntry;
 }
 
-SvLBoxEntry* ScAcceptChgDlg::InsertFilteredAction(
+SvTreeListEntry* ScAcceptChgDlg::InsertFilteredAction(
     const ScChangeAction* pScChangeAction, ScChangeActionState eState,
-    SvLBoxEntry* pParent, bool bDelMaster, bool bDisabled, sal_uLong nPos)
+    SvTreeListEntry* pParent, bool bDelMaster, bool bDisabled, sal_uLong nPos)
 {
 
     ScChangeTrack* pChanges=pDoc->GetChangeTrack();
@@ -539,7 +539,7 @@ SvLBoxEntry* ScAcceptChgDlg::InsertFilteredAction(
 
     bool bIsGenerated = pChanges->IsGenerated(pScChangeAction->GetActionNumber());
 
-    SvLBoxEntry* pEntry=NULL;
+    SvTreeListEntry* pEntry=NULL;
 
     bool bFlag = false;
 
@@ -654,11 +654,11 @@ SvLBoxEntry* ScAcceptChgDlg::InsertFilteredAction(
     return pEntry;
 }
 
-SvLBoxEntry* ScAcceptChgDlg::InsertChangeActionContent(const ScChangeActionContent* pScChangeAction,
-                                                          SvLBoxEntry* pParent, sal_uLong nSpecial)
+SvTreeListEntry* ScAcceptChgDlg::InsertChangeActionContent(const ScChangeActionContent* pScChangeAction,
+                                                          SvTreeListEntry* pParent, sal_uLong nSpecial)
 {
     ScChangeTrack* pChanges=pDoc->GetChangeTrack();
-    SvLBoxEntry* pEntry=NULL;
+    SvTreeListEntry* pEntry=NULL;
 
     if(pScChangeAction==NULL || pChanges==NULL) return NULL;
 
@@ -799,7 +799,7 @@ long ScAcceptChgDlg::PreNotify( NotifyEvent& rNEvt )
 void ScAcceptChgDlg::UpdateView()
 {
     bNeedsUpdate=false;
-    SvLBoxEntry* pParent=NULL;
+    SvTreeListEntry* pParent=NULL;
     ScChangeTrack* pChanges=NULL;
     const ScChangeAction* pScChangeAction=NULL;
     bAcceptEnableFlag=true;
@@ -878,19 +878,19 @@ void ScAcceptChgDlg::UpdateView()
     {
         pParent=pTheView->InsertEntry(
             aStrAllAccepted, static_cast< RedlinData * >(NULL),
-            static_cast< SvLBoxEntry * >(NULL));
+            static_cast< SvTreeListEntry * >(NULL));
         pParent->EnableChildrenOnDemand(true);
     }
     if(nRejectCount>0)
     {
         pParent=pTheView->InsertEntry(
             aStrAllRejected, static_cast< RedlinData * >(NULL),
-            static_cast< SvLBoxEntry * >(NULL));
+            static_cast< SvTreeListEntry * >(NULL));
         pParent->EnableChildrenOnDemand(true);
     }
     pTheView->SetUpdateMode(true);
     SetPointer(Pointer(POINTER_ARROW));
-    SvLBoxEntry* pEntry=pTheView->First();
+    SvTreeListEntry* pEntry=pTheView->First();
     if(pEntry!=NULL)
         pTheView->Select(pEntry);
 }
@@ -998,7 +998,7 @@ IMPL_LINK( ScAcceptChgDlg, RejectHandle, SvxTPView*, pRef )
 
     if(pRef!=NULL)
     {
-        SvLBoxEntry* pEntry=pTheView->FirstSelected();
+        SvTreeListEntry* pEntry=pTheView->FirstSelected();
         while(pEntry!=NULL)
         {
             ScRedlinData *pEntryData=(ScRedlinData *)(pEntry->GetUserData());
@@ -1035,7 +1035,7 @@ IMPL_LINK( ScAcceptChgDlg, AcceptHandle, SvxTPView*, pRef )
     bIgnoreMsg=true;
     if(pRef!=NULL)
     {
-        SvLBoxEntry* pEntry=pTheView->FirstSelected();
+        SvTreeListEntry* pEntry=pTheView->FirstSelected();
         while(pEntry!=NULL)
         {
             ScRedlinData *pEntryData=(ScRedlinData *)(pEntry->GetUserData());
@@ -1172,11 +1172,11 @@ IMPL_LINK_NOARG(ScAcceptChgDlg, SelectHandle)
 
 void ScAcceptChgDlg::GetDependents(  const ScChangeAction* pScChangeAction,
                                     ScChangeActionMap& aActionMap,
-                                    SvLBoxEntry* pEntry)
+                                    SvTreeListEntry* pEntry)
 {
     ScChangeTrack* pChanges=pDoc->GetChangeTrack();
 
-    SvLBoxEntry* pParent=pTheView->GetParent(pEntry);
+    SvTreeListEntry* pParent=pTheView->GetParent(pEntry);
     if(pParent!=NULL)
     {
         ScRedlinData *pParentData=(ScRedlinData *)(pParent->GetUserData());
@@ -1194,7 +1194,7 @@ void ScAcceptChgDlg::GetDependents(  const ScChangeAction* pScChangeAction,
                     aActionMap, pScChangeAction->IsMasterDelete() );
 }
 
-bool ScAcceptChgDlg::InsertContentChildren(ScChangeActionMap* pActionMap,SvLBoxEntry* pParent)
+bool ScAcceptChgDlg::InsertContentChildren(ScChangeActionMap* pActionMap,SvTreeListEntry* pParent)
 {
     bool bTheTestFlag = true;
     ScRedlinData *pEntryData=(ScRedlinData *)(pParent->GetUserData());
@@ -1212,7 +1212,7 @@ bool ScAcceptChgDlg::InsertContentChildren(ScChangeActionMap* pActionMap,SvLBoxE
             const_cast<ScChangeAction*>( pScChangeAction ) ) );
         bParentInserted = true;
     }
-    SvLBoxEntry* pEntry=NULL;
+    SvTreeListEntry* pEntry=NULL;
 
     ScChangeActionMap::iterator itChangeAction = pActionMap->begin();
     while( itChangeAction != pActionMap->end() )
@@ -1225,7 +1225,7 @@ bool ScAcceptChgDlg::InsertContentChildren(ScChangeActionMap* pActionMap,SvLBoxE
     if( itChangeAction == pActionMap->end() )
         return true;
 
-    SvLBoxEntry* pOriginal = InsertChangeActionContent(
+    SvTreeListEntry* pOriginal = InsertChangeActionContent(
         dynamic_cast<const ScChangeActionContent*>( itChangeAction->second ),
         pParent, RD_SPECIAL_CONTENT );
 
@@ -1273,7 +1273,7 @@ bool ScAcceptChgDlg::InsertContentChildren(ScChangeActionMap* pActionMap,SvLBoxE
 
 }
 
-bool ScAcceptChgDlg::InsertAcceptedORejected(SvLBoxEntry* pParent)
+bool ScAcceptChgDlg::InsertAcceptedORejected(SvTreeListEntry* pParent)
 {
     ScChangeTrack* pChanges=pDoc->GetChangeTrack();
     bool bTheTestFlag = true;
@@ -1301,11 +1301,11 @@ bool ScAcceptChgDlg::InsertAcceptedORejected(SvLBoxEntry* pParent)
     return bTheTestFlag;
 }
 
-bool ScAcceptChgDlg::InsertChildren(ScChangeActionMap* pActionMap,SvLBoxEntry* pParent)
+bool ScAcceptChgDlg::InsertChildren(ScChangeActionMap* pActionMap,SvTreeListEntry* pParent)
 {
     ScChangeTrack* pChanges=pDoc->GetChangeTrack();
     bool bTheTestFlag = true;
-    SvLBoxEntry* pEntry=NULL;
+    SvTreeListEntry* pEntry=NULL;
     ScChangeActionMap::iterator itChangeAction;
 
     for( itChangeAction = pActionMap->begin(); itChangeAction != pActionMap->end(); ++itChangeAction )
@@ -1329,11 +1329,11 @@ bool ScAcceptChgDlg::InsertChildren(ScChangeActionMap* pActionMap,SvLBoxEntry* p
 }
 
 bool ScAcceptChgDlg::InsertDeletedChildren(const ScChangeAction* pScChangeAction,
-                                         ScChangeActionMap* pActionMap,SvLBoxEntry* pParent)
+                                         ScChangeActionMap* pActionMap,SvTreeListEntry* pParent)
 {
     ScChangeTrack* pChanges=pDoc->GetChangeTrack();
     bool bTheTestFlag = true;
-    SvLBoxEntry* pEntry=NULL;
+    SvTreeListEntry* pEntry=NULL;
     ScChangeActionMap::iterator itChangeAction;
 
     for( itChangeAction = pActionMap->begin(); itChangeAction != pActionMap->end(); ++itChangeAction )
@@ -1362,7 +1362,7 @@ bool ScAcceptChgDlg::InsertDeletedChildren(const ScChangeAction* pScChangeAction
 
 bool ScAcceptChgDlg::Expand(
     ScChangeTrack* pChanges, const ScChangeAction* pScChangeAction,
-    SvLBoxEntry* pEntry, bool bFilter)
+    SvTreeListEntry* pEntry, bool bFilter)
 {
     bool bTheTestFlag = true;
 
@@ -1408,7 +1408,7 @@ IMPL_LINK( ScAcceptChgDlg, ExpandingHandle, SvxRedlinTable*, pTable )
     if(pTable!=NULL && pChanges!=NULL)
     {
         ScChangeActionMap aActionMap;
-        SvLBoxEntry* pEntry=pTheView->GetHdlEntry();
+        SvTreeListEntry* pEntry=pTheView->GetHdlEntry();
         if(pEntry!=NULL)
         {
             ScRedlinData *pEntryData=(ScRedlinData *)(pEntry->GetUserData());
@@ -1469,7 +1469,7 @@ void ScAcceptChgDlg::AppendChanges(ScChangeTrack* pChanges,sal_uLong nStartActio
 {
     if(pChanges!=NULL)
     {
-        SvLBoxEntry* pParent=NULL;
+        SvTreeListEntry* pParent=NULL;
         const ScChangeAction* pScChangeAction=NULL;
         bAcceptEnableFlag=true;
         bRejectEnableFlag=true;
@@ -1551,7 +1551,7 @@ void ScAcceptChgDlg::RemoveEntrys(sal_uLong nStartAction,sal_uLong nEndAction)
 
     pTheView->SetUpdateMode(false);
 
-    SvLBoxEntry* pEntry=pTheView->GetCurEntry();
+    SvTreeListEntry* pEntry=pTheView->GetCurEntry();
 
     ScRedlinData *pEntryData=NULL;
 
@@ -1581,7 +1581,7 @@ void ScAcceptChgDlg::RemoveEntrys(sal_uLong nStartAction,sal_uLong nEndAction)
 
 
         }
-        SvLBoxEntry* pPrevEntry = pTheView->Prev(pEntry);
+        SvTreeListEntry* pPrevEntry = pTheView->Prev(pEntry);
 
         if(bRemove)
             pTheView->RemoveEntry(pEntry);
@@ -1600,9 +1600,9 @@ void ScAcceptChgDlg::UpdateEntrys(ScChangeTrack* pChgTrack, sal_uLong nStartActi
 
     bool bRemove = false;
 
-    SvLBoxEntry* pEntry=pTheView->First();
-    SvLBoxEntry* pNextEntry = (pEntry ? pTheView->NextSibling(pEntry) : NULL);
-    SvLBoxEntry* pLastEntry=NULL;
+    SvTreeListEntry* pEntry=pTheView->First();
+    SvTreeListEntry* pNextEntry = (pEntry ? pTheView->NextSibling(pEntry) : NULL);
+    SvTreeListEntry* pLastEntry=NULL;
     while(pEntry!=NULL)
     {
         bRemove=false;
@@ -1712,7 +1712,7 @@ IMPL_LINK_NOARG(ScAcceptChgDlg, UpdateSelectionHdl)
     bool bContMark = false;
 
     pTabView->DoneBlockMode();  // clears old marking
-    SvLBoxEntry* pEntry = pTheView->FirstSelected();
+    SvTreeListEntry* pEntry = pTheView->FirstSelected();
     while( pEntry )
     {
         ScRedlinData* pEntryData = (ScRedlinData*) pEntry->GetUserData();
@@ -1764,7 +1764,7 @@ IMPL_LINK_NOARG(ScAcceptChgDlg, CommandHdl)
 
         aPopup.SetMenuFlags(MENU_FLAG_HIDEDISABLEDENTRIES);
 
-        SvLBoxEntry* pEntry=pTheView->GetCurEntry();
+        SvTreeListEntry* pEntry=pTheView->GetCurEntry();
         if(pEntry!=NULL)
         {
             pTheView->Select(pEntry);
@@ -1944,8 +1944,8 @@ IMPL_LINK( ScAcceptChgDlg, ColCompareHdl, SvSortData*, pSortData )
 
     if(pSortData)
     {
-        SvLBoxEntry* pLeft = (SvLBoxEntry*)(pSortData->pLeft );
-        SvLBoxEntry* pRight = (SvLBoxEntry*)(pSortData->pRight );
+        SvTreeListEntry* pLeft = (SvTreeListEntry*)(pSortData->pLeft );
+        SvTreeListEntry* pRight = (SvTreeListEntry*)(pSortData->pRight );
 
         if(CALC_DATE==nSortCol)
         {
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx
index 58d20e24611f..ada696d07441 100644
--- a/sc/source/ui/miscdlgs/conflictsdlg.cxx
+++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx
@@ -460,7 +460,7 @@ ScConflictsDlg::ScConflictsDlg( Window* pParent, ScViewData* pViewData, ScDocume
 
     UpdateView();
 
-    SvLBoxEntry* pEntry = maLbConflicts.First();
+    SvTreeListEntry* pEntry = maLbConflicts.First();
     if ( pEntry != NULL )
     {
         maLbConflicts.Select( pEntry );
@@ -519,7 +519,7 @@ String ScConflictsDlg::GetActionString( const ScChangeAction* pAction, ScDocumen
 
 void ScConflictsDlg::HandleListBoxSelection( bool bSelectHandle )
 {
-    SvLBoxEntry* pSelEntry = maLbConflicts.GetCurEntry();
+    SvTreeListEntry* pSelEntry = maLbConflicts.GetCurEntry();
     if ( !pSelEntry )
     {
         pSelEntry = maLbConflicts.FirstSelected();
@@ -529,7 +529,7 @@ void ScConflictsDlg::HandleListBoxSelection( bool bSelectHandle )
         return;
     }
 
-    SvLBoxEntry* pRootEntry = maLbConflicts.GetRootLevelParent( pSelEntry );
+    SvTreeListEntry* pRootEntry = maLbConflicts.GetRootLevelParent( pSelEntry );
     if ( pRootEntry )
     {
         if ( bSelectHandle )
@@ -540,7 +540,7 @@ void ScConflictsDlg::HandleListBoxSelection( bool bSelectHandle )
         {
             maLbConflicts.Select( pRootEntry );
         }
-        SvLBoxEntry* pEntry = maLbConflicts.FirstChild( pRootEntry );
+        SvTreeListEntry* pEntry = maLbConflicts.FirstChild( pRootEntry );
         while ( pEntry )
         {
             if ( !maLbConflicts.IsSelected( pEntry ) )
@@ -591,7 +591,7 @@ IMPL_LINK_NOARG(ScConflictsDlg, UpdateSelectionHdl)
     ScTabView* pTabView = mpViewData->GetView();
     pTabView->DoneBlockMode();
     sal_Bool bContMark = false;
-    SvLBoxEntry* pEntry = maLbConflicts.FirstSelected();
+    SvTreeListEntry* pEntry = maLbConflicts.FirstSelected();
     while ( pEntry )
     {
         if ( pEntry != maLbConflicts.GetRootLevelParent( pEntry ) )
@@ -619,7 +619,7 @@ IMPL_LINK_NOARG(ScConflictsDlg, UpdateSelectionHdl)
     return 0;
 }
 
-void ScConflictsDlg::SetConflictAction( SvLBoxEntry* pRootEntry, ScConflictAction eConflictAction )
+void ScConflictsDlg::SetConflictAction( SvTreeListEntry* pRootEntry, ScConflictAction eConflictAction )
 {
     RedlinData* pUserData = static_cast< RedlinData* >( pRootEntry ? pRootEntry->GetUserData() : NULL );
     ScConflictsListEntry* pConflictEntry = static_cast< ScConflictsListEntry* >( pUserData ? pUserData->pData : NULL );
@@ -631,8 +631,8 @@ void ScConflictsDlg::SetConflictAction( SvLBoxEntry* pRootEntry, ScConflictActio
 
 void ScConflictsDlg::KeepHandler( bool bMine )
 {
-    SvLBoxEntry* pEntry = maLbConflicts.FirstSelected();
-    SvLBoxEntry* pRootEntry = ( pEntry ? maLbConflicts.GetRootLevelParent( pEntry ) : NULL );
+    SvTreeListEntry* pEntry = maLbConflicts.FirstSelected();
+    SvTreeListEntry* pRootEntry = ( pEntry ? maLbConflicts.GetRootLevelParent( pEntry ) : NULL );
     if ( !pRootEntry )
     {
         return;
@@ -650,8 +650,8 @@ void ScConflictsDlg::KeepHandler( bool bMine )
 
 void ScConflictsDlg::KeepAllHandler( bool bMine )
 {
-    SvLBoxEntry* pEntry = maLbConflicts.First();
-    SvLBoxEntry* pRootEntry = ( pEntry ? maLbConflicts.GetRootLevelParent( pEntry ) : NULL );
+    SvTreeListEntry* pEntry = maLbConflicts.First();
+    SvTreeListEntry* pRootEntry = ( pEntry ? maLbConflicts.GetRootLevelParent( pEntry ) : NULL );
     if ( !pRootEntry )
     {
         return;
@@ -770,7 +770,7 @@ void ScConflictsDlg::UpdateView()
         {
             RedlinData* pRootUserData = new RedlinData();
             pRootUserData->pData = static_cast< void* >( pConflictEntry );
-            SvLBoxEntry* pRootEntry = maLbConflicts.InsertEntry( GetConflictString( *aItr ), pRootUserData );
+            SvTreeListEntry* pRootEntry = maLbConflicts.InsertEntry( GetConflictString( *aItr ), pRootUserData );
 
             ScChangeActionList::const_iterator aEndShared = aItr->maSharedActions.end();
             for ( ScChangeActionList::const_iterator aItrShared = aItr->maSharedActions.begin(); aItrShared != aEndShared; ++aItrShared )
diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx
index 4465052cbb9f..5dba814170ec 100644
--- a/sc/source/ui/miscdlgs/solveroptions.cxx
+++ b/sc/source/ui/miscdlgs/solveroptions.cxx
@@ -72,7 +72,7 @@ class ScSolverOptionsString : public SvLBoxString
     sal_Int32   mnIntValue;
 
 public:
-    ScSolverOptionsString( SvLBoxEntry* pEntry, sal_uInt16 nFlags, const String& rStr ) :
+    ScSolverOptionsString( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const String& rStr ) :
         SvLBoxString( pEntry, nFlags, rStr ),
         mbIsDouble( false ),
         mfDoubleValue( 0.0 ),
@@ -85,10 +85,10 @@ public:
     void      SetDoubleValue( double fNew ) { mbIsDouble = true; mfDoubleValue = fNew; }
     void      SetIntValue( sal_Int32 nNew ) { mbIsDouble = false; mnIntValue = nNew; }
 
-    virtual void Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry );
+    virtual void Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvTreeListEntry* pEntry );
 };
 
-void ScSolverOptionsString::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16, SvLBoxEntry* /* pEntry */ )
+void ScSolverOptionsString::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16, SvTreeListEntry* /* pEntry */ )
 {
     //! move position? (SvxLinguTabPage: aPos.X() += 20)
     String aNormalStr( GetText() );
@@ -200,7 +200,7 @@ const uno::Sequence<beans::PropertyValue>& ScSolverOptionsDialog::GetProperties(
         for (sal_Int32 nEntryPos=0; nEntryPos<nEntryCount; ++nEntryPos)
         {
             uno::Any& rValue = maProperties[nEntryPos].Value;
-            SvLBoxEntry* pEntry = pModel->GetEntry(nEntryPos);
+            SvTreeListEntry* pEntry = pModel->GetEntry(nEntryPos);
 
             bool bHasData = false;
             sal_uInt16 nItemCount = pEntry->ItemCount();
@@ -268,7 +268,7 @@ void ScSolverOptionsDialog::FillListBox()
         mpCheckButtonData = new SvLBoxButtonData( &maLbSettings );
 
     SvLBoxTreeList* pModel = maLbSettings.GetModel();
-    SvLBoxEntry* pEntry = NULL;
+    SvTreeListEntry* pEntry = NULL;
 
     for (sal_Int32 nPos=0; nPos<nCount; nPos++)
     {
@@ -279,7 +279,7 @@ void ScSolverOptionsDialog::FillListBox()
         if ( eClass == uno::TypeClass_BOOLEAN )
         {
             // check box entry
-            pEntry = new SvLBoxEntry;
+            pEntry = new SvTreeListEntry;
             SvLBoxButton* pButton = new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, 0, mpCheckButtonData );
             if ( ScUnoHelpFunctions::GetBoolFromAny( aValue ) )
                 pButton->SetStateChecked();
@@ -292,7 +292,7 @@ void ScSolverOptionsDialog::FillListBox()
         else
         {
             // value entry
-            pEntry = new SvLBoxEntry;
+            pEntry = new SvTreeListEntry;
             pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty ) );                   // empty column
             pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0 ) );
             ScSolverOptionsString* pItem = new ScSolverOptionsString( pEntry, 0, aVisName );
@@ -323,7 +323,7 @@ void ScSolverOptionsDialog::ReadFromComponent()
 
 void ScSolverOptionsDialog::EditOption()
 {
-    SvLBoxEntry* pEntry = maLbSettings.GetCurEntry();
+    SvTreeListEntry* pEntry = maLbSettings.GetCurEntry();
     if (pEntry)
     {
         sal_uInt16 nItemCount = pEntry->ItemCount();
@@ -394,7 +394,7 @@ IMPL_LINK_NOARG(ScSolverOptionsDialog, SettingsSelHdl)
 {
     sal_Bool bCheckbox = false;
 
-    SvLBoxEntry* pEntry = maLbSettings.GetCurEntry();
+    SvTreeListEntry* pEntry = maLbSettings.GetCurEntry();
     if (pEntry)
     {
         SvLBoxItem* pItem = pEntry->GetFirstItem(SV_ITEM_ID_LBOXBUTTON);
diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx
index 941002c42250..30f4685633e2 100644
--- a/sc/source/ui/namedlg/namemgrtable.cxx
+++ b/sc/source/ui/namedlg/namemgrtable.cxx
@@ -107,18 +107,18 @@ ScRangeManagerTable::~ScRangeManagerTable()
 
 void ScRangeManagerTable::addEntry(const ScRangeNameLine& rLine, bool bSetCurEntry)
 {
-    SvLBoxEntry* pEntry = InsertEntryToColumn( createEntryString(rLine), LIST_APPEND, 0xffff);
+    SvTreeListEntry* pEntry = InsertEntryToColumn( createEntryString(rLine), LIST_APPEND, 0xffff);
     if (bSetCurEntry)
         SetCurEntry(pEntry);
 }
 
 void ScRangeManagerTable::GetCurrentLine(ScRangeNameLine& rLine)
 {
-    SvLBoxEntry* pCurrentEntry = GetCurEntry();
+    SvTreeListEntry* pCurrentEntry = GetCurEntry();
     GetLine(rLine, pCurrentEntry);
 }
 
-void ScRangeManagerTable::GetLine(ScRangeNameLine& rLine, SvLBoxEntry* pEntry)
+void ScRangeManagerTable::GetLine(ScRangeNameLine& rLine, SvTreeListEntry* pEntry)
 {
     rLine.aName = GetEntryText( pEntry, 0);
     rLine.aExpression = GetEntryText(pEntry, 1);
@@ -166,9 +166,9 @@ const ScRangeData* ScRangeManagerTable::findRangeData(const ScRangeNameLine& rLi
 
 void ScRangeManagerTable::CheckForFormulaString()
 {
-    for (SvLBoxEntry* pEntry = GetFirstEntryInView(); pEntry ; pEntry = GetNextEntryInView(pEntry))
+    for (SvTreeListEntry* pEntry = GetFirstEntryInView(); pEntry ; pEntry = GetNextEntryInView(pEntry))
     {
-        std::map<SvLBoxEntry*, bool>::const_iterator itr = maCalculatedFormulaEntries.find(pEntry);
+        std::map<SvTreeListEntry*, bool>::const_iterator itr = maCalculatedFormulaEntries.find(pEntry);
         if (itr == maCalculatedFormulaEntries.end() || itr->second == false)
         {
             ScRangeNameLine aLine;
@@ -177,7 +177,7 @@ void ScRangeManagerTable::CheckForFormulaString()
             rtl::OUString aFormulaString;
             pData->GetSymbol(aFormulaString, maPos);
             SetEntryText(aFormulaString, pEntry, 1);
-            maCalculatedFormulaEntries.insert( std::pair<SvLBoxEntry*, bool>(pEntry, true) );
+            maCalculatedFormulaEntries.insert( std::pair<SvTreeListEntry*, bool>(pEntry, true) );
         }
 
     }
@@ -199,13 +199,13 @@ std::vector<ScRangeNameLine> ScRangeManagerTable::GetSelectedEntries()
     std::vector<ScRangeNameLine> aSelectedEntries;
     if (GetSelectionCount())
     {
-        for (SvLBoxEntry* pEntry = FirstSelected(); pEntry != LastSelected(); pEntry = NextSelected(pEntry))
+        for (SvTreeListEntry* pEntry = FirstSelected(); pEntry != LastSelected(); pEntry = NextSelected(pEntry))
         {
             ScRangeNameLine aLine;
             GetLine( aLine, pEntry );
             aSelectedEntries.push_back(aLine);
         }
-        SvLBoxEntry* pEntry = LastSelected();
+        SvTreeListEntry* pEntry = LastSelected();
         ScRangeNameLine aLine;
         GetLine( aLine, pEntry );
         aSelectedEntries.push_back(aLine);
@@ -215,7 +215,7 @@ std::vector<ScRangeNameLine> ScRangeManagerTable::GetSelectedEntries()
 
 void ScRangeManagerTable::SetEntry(const ScRangeNameLine& rLine)
 {
-    for (SvLBoxEntry* pEntry = First(); pEntry; pEntry = Next(pEntry))
+    for (SvTreeListEntry* pEntry = First(); pEntry; pEntry = Next(pEntry))
     {
         if (rLine.aName == rtl::OUString(GetEntryText(pEntry, 0))
                 && rLine.aScope == rtl::OUString(GetEntryText(pEntry, 2)))
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index aa9cee00238e..14a2d47b3378 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -164,7 +164,7 @@ void ScContentTree::InitRoot( sal_uInt16 nType )
     String aName( ScResId( SCSTR_CONTENT_ROOT + nType ) );
     // wieder an die richtige Position:
     sal_uInt16 nPos = nRootType ? 0 : pPosList[nType]-1;
-    SvLBoxEntry* pNew = InsertEntry( aName, rImage, rImage, NULL, false, nPos );
+    SvTreeListEntry* pNew = InsertEntry( aName, rImage, rImage, NULL, false, nPos );
 
     pRootNodes[nType] = pNew;
 }
@@ -182,7 +182,7 @@ void ScContentTree::ClearType(sal_uInt16 nType)
         ClearAll();
     else
     {
-        SvLBoxEntry* pParent = pRootNodes[nType];
+        SvTreeListEntry* pParent = pRootNodes[nType];
         if ( !pParent || GetChildCount(pParent) )       // nicht, wenn ohne Children schon da
         {
             if (pParent)
@@ -200,7 +200,7 @@ void ScContentTree::InsertContent( sal_uInt16 nType, const String& rValue )
         return;
     }
 
-    SvLBoxEntry* pParent = pRootNodes[nType];
+    SvTreeListEntry* pParent = pRootNodes[nType];
     if (pParent)
         InsertEntry( rValue, pParent );
     else
@@ -209,7 +209,7 @@ void ScContentTree::InsertContent( sal_uInt16 nType, const String& rValue )
     }
 }
 
-void ScContentTree::GetEntryIndexes( sal_uInt16& rnRootIndex, sal_uLong& rnChildIndex, SvLBoxEntry* pEntry ) const
+void ScContentTree::GetEntryIndexes( sal_uInt16& rnRootIndex, sal_uLong& rnChildIndex, SvTreeListEntry* pEntry ) const
 {
     rnRootIndex = SC_CONTENT_ROOT;
     rnChildIndex = SC_CONTENT_NOCHILD;
@@ -217,7 +217,7 @@ void ScContentTree::GetEntryIndexes( sal_uInt16& rnRootIndex, sal_uLong& rnChild
     if( !pEntry )
         return;
 
-    SvLBoxEntry* pParent = GetParent( pEntry );
+    SvTreeListEntry* pParent = GetParent( pEntry );
     bool bFound = false;
     for( sal_uInt16 nRoot = 1; !bFound && (nRoot < SC_CONTENT_COUNT); ++nRoot )
     {
@@ -233,7 +233,7 @@ void ScContentTree::GetEntryIndexes( sal_uInt16& rnRootIndex, sal_uLong& rnChild
 
             // search the entry in all child entries of the parent
             sal_uLong nEntry = 0;
-            SvLBoxEntry* pIterEntry = FirstChild( pParent );
+            SvTreeListEntry* pIterEntry = FirstChild( pParent );
             while( !bFound && pIterEntry )
             {
                 if ( pEntry == pIterEntry )
@@ -250,7 +250,7 @@ void ScContentTree::GetEntryIndexes( sal_uInt16& rnRootIndex, sal_uLong& rnChild
     }
 }
 
-sal_uLong ScContentTree::GetChildIndex( SvLBoxEntry* pEntry ) const
+sal_uLong ScContentTree::GetChildIndex( SvTreeListEntry* pEntry ) const
 {
     sal_uInt16 nRoot;
     sal_uLong nChild;
@@ -279,7 +279,7 @@ IMPL_LINK_NOARG(ScContentTree, ContentDoubleClickHdl)
 {
     sal_uInt16 nType;
     sal_uLong nChild;
-    SvLBoxEntry* pEntry = GetCurEntry();
+    SvTreeListEntry* pEntry = GetCurEntry();
     GetEntryIndexes( nType, nChild, pEntry );
 
     if( pEntry && (nType != SC_CONTENT_ROOT) && (nChild != SC_CONTENT_NOCHILD) )
@@ -370,7 +370,7 @@ void ScContentTree::KeyInput( const KeyEvent& rKEvt )
                 break;
             case 0:
             {
-                SvLBoxEntry* pEntry = GetCurEntry();
+                SvTreeListEntry* pEntry = GetCurEntry();
                 if( pEntry )
                 {
                     sal_uInt16 nType;
@@ -518,12 +518,12 @@ void ScContentTree::RequestHelp( const HelpEvent& rHEvt )
     if( rHEvt.GetMode() & HELPMODE_QUICK )
     {
         Point aPos( ScreenToOutputPixel( rHEvt.GetMousePosPixel() ));
-        SvLBoxEntry* pEntry = GetEntry( aPos );
+        SvTreeListEntry* pEntry = GetEntry( aPos );
         if ( pEntry )
         {
             sal_Bool bRet = false;
             String aHelpText;
-            SvLBoxEntry* pParent = GetParent(pEntry);
+            SvTreeListEntry* pParent = GetParent(pEntry);
             if ( !pParent )                                 // Top-Level ?
             {
                 aHelpText = String::CreateFromInt32( GetChildCount(pEntry) );
@@ -916,11 +916,11 @@ sal_Bool ScContentTree::NoteStringsChanged()
     if (!pDoc)
         return false;
 
-    SvLBoxEntry* pParent = pRootNodes[SC_CONTENT_NOTE];
+    SvTreeListEntry* pParent = pRootNodes[SC_CONTENT_NOTE];
     if (!pParent)
         return false;
 
-    SvLBoxEntry* pEntry = FirstChild( pParent );
+    SvTreeListEntry* pEntry = FirstChild( pParent );
 
     bool bEqual = true;
     SCTAB nTabCount = pDoc->GetTableCount();
@@ -956,11 +956,11 @@ sal_Bool ScContentTree::DrawNamesChanged( sal_uInt16 nType )
     if (!pDoc)
         return false;
 
-    SvLBoxEntry* pParent = pRootNodes[nType];
+    SvTreeListEntry* pParent = pRootNodes[nType];
     if (!pParent)
         return false;
 
-    SvLBoxEntry* pEntry = FirstChild( pParent );
+    SvTreeListEntry* pEntry = FirstChild( pParent );
 
     // iterate in flat mode for groups
     SdrIterMode eIter = ( nType == SC_CONTENT_DRAWING ) ? IM_FLAT : IM_DEEPNOGROUPS;
@@ -1120,7 +1120,7 @@ void ScContentTree::DoDrag()
 
     sal_uInt16 nType;
     sal_uLong nChild;
-    SvLBoxEntry* pEntry = GetCurEntry();
+    SvTreeListEntry* pEntry = GetCurEntry();
     GetEntryIndexes( nType, nChild, pEntry );
 
     if( pEntry &&
@@ -1329,10 +1329,10 @@ void ScContentTree::ToggleRoot()        // nach Selektion
     sal_uInt16 nNew = SC_CONTENT_ROOT;
     if ( nRootType == SC_CONTENT_ROOT )
     {
-        SvLBoxEntry* pEntry = GetCurEntry();
+        SvTreeListEntry* pEntry = GetCurEntry();
         if (pEntry)
         {
-            SvLBoxEntry* pParent = GetParent(pEntry);
+            SvTreeListEntry* pParent = GetParent(pEntry);
             for (sal_uInt16 i=1; i<SC_CONTENT_COUNT; i++)
                 if ( pEntry == pRootNodes[i] || pParent == pRootNodes[i] )
                     nNew = i;
@@ -1462,7 +1462,7 @@ void ScContentTree::ApplySettings()
                 // select
                 if( nRootSel == nEntry )
                 {
-                    SvLBoxEntry* pEntry = NULL;
+                    SvTreeListEntry* pEntry = NULL;
                     if( bExp && (nChildSel != SC_CONTENT_NOCHILD) )
                         pEntry = GetEntry( pRootNodes[ nEntry ], nChildSel );
                     Select( pEntry ? pEntry : pRootNodes[ nEntry ] );
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index c4df06a4c1a6..0167bfb4fa22 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -42,10 +42,10 @@ public:
     OptionString(const rtl::OUString& rDesc, const rtl::OUString& rValue) :
         maDesc(rDesc), maValue(rValue) {}
 
-    virtual void Paint(const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry);
+    virtual void Paint(const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvTreeListEntry* pEntry);
 };
 
-void OptionString::Paint(const Point& rPos, SvTreeListBox& rDev, sal_uInt16 /*nFlags*/, SvLBoxEntry* /*pEntry*/)
+void OptionString::Paint(const Point& rPos, SvTreeListBox& rDev, sal_uInt16 /*nFlags*/, SvTreeListEntry* /*pEntry*/)
 {
     Point aPos = rPos;
     rtl::OUString aDesc = maDesc + rtl::OUString(": ");
@@ -139,7 +139,7 @@ void ScCalcOptionsDialog::FillOptionsList()
 
     {
         // Syntax for INDIRECT function.
-        SvLBoxEntry* pEntry = new SvLBoxEntry;
+        SvTreeListEntry* pEntry = new SvTreeListEntry;
         pEntry->AddItem(new SvLBoxString(pEntry, 0, rtl::OUString()));
         pEntry->AddItem(new SvLBoxContextBmp(pEntry, 0, Image(), Image(), 0));
         OptionString* pItem = new OptionString(
@@ -150,7 +150,7 @@ void ScCalcOptionsDialog::FillOptionsList()
 
     {
         // Treat empty string as zero.
-        SvLBoxEntry* pEntry = new SvLBoxEntry;
+        SvTreeListEntry* pEntry = new SvTreeListEntry;
         pEntry->AddItem(new SvLBoxString(pEntry, 0, rtl::OUString()));
         pEntry->AddItem(new SvLBoxContextBmp(pEntry, 0, Image(), Image(), 0));
         OptionString* pItem = new OptionString(
@@ -236,7 +236,7 @@ void ScCalcOptionsDialog::ListOptionValueChanged()
             maLbSettings.SetUpdateMode(false);
 
             SvLBoxTreeList* pModel = maLbSettings.GetModel();
-            SvLBoxEntry* pEntry = pModel->GetEntry(NULL, 0);
+            SvTreeListEntry* pEntry = pModel->GetEntry(NULL, 0);
             if (!pEntry)
                 return;
 
@@ -264,7 +264,7 @@ void ScCalcOptionsDialog::RadioValueChanged()
             maLbSettings.SetUpdateMode(false);
 
             SvLBoxTreeList* pModel = maLbSettings.GetModel();
-            SvLBoxEntry* pEntry = pModel->GetEntry(NULL, 1);
+            SvTreeListEntry* pEntry = pModel->GetEntry(NULL, 1);
             if (!pEntry)
                 return;