Merge SvListEntry and SvLBoxEntry into SvTreeListEntry.

Change-Id: I89cfc8c1288c00674fe64e791c149743d377d5ee

10 files changed, 183 insertions, 183 deletions

diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index 8ca38127b4df..1619261e7d78 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -191,17 +191,17 @@ class WatchTreeListBox : public SvHeaderTabListBox
     String aEditingRes;
 
 protected:
-    virtual sal_Bool    EditingEntry( SvLBoxEntry* pEntry, Selection& rSel  );
-    virtual sal_Bool    EditedEntry( SvLBoxEntry* pEntry, const OUString& rNewText );
+    virtual sal_Bool    EditingEntry( SvTreeListEntry* pEntry, Selection& rSel  );
+    virtual sal_Bool    EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText );
 
-    bool            ImplBasicEntryEdited( SvLBoxEntry* pEntry, const String& rResult );
-    SbxBase*        ImplGetSBXForEntry( SvLBoxEntry* pEntry, bool& rbArrayElement );
+    bool            ImplBasicEntryEdited( SvTreeListEntry* pEntry, const String& rResult );
+    SbxBase*        ImplGetSBXForEntry( SvTreeListEntry* pEntry, bool& rbArrayElement );
 
 public:
     WatchTreeListBox( Window* pParent, WinBits nWinBits );
     ~WatchTreeListBox();
 
-    void            RequestingChildren( SvLBoxEntry * pParent );
+    void            RequestingChildren( SvTreeListEntry * pParent );
     void            UpdateWatches( bool bBasicStopped = false );
 
     using           SvTabListBox::SetTabs;
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 914a916fcb0e..134533cd9245 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1363,7 +1363,7 @@ void WatchWindow::AddWatch( const String& rVName )
 
     OUString aWatchStr_( aVar );
     aWatchStr_ += OUString( "\t\t" );
-    SvLBoxEntry* pNewEntry = aTreeListBox.InsertEntry( aWatchStr_, 0, true, LIST_APPEND );
+    SvTreeListEntry* pNewEntry = aTreeListBox.InsertEntry( aWatchStr_, 0, true, LIST_APPEND );
     pNewEntry->SetUserData( pWatchItem );
 
     aTreeListBox.Select(pNewEntry, true);
@@ -1375,7 +1375,7 @@ void WatchWindow::AddWatch( const String& rVName )
 
 bool WatchWindow::RemoveSelectedWatch()
 {
-    SvLBoxEntry* pEntry = aTreeListBox.GetCurEntry();
+    SvTreeListEntry* pEntry = aTreeListBox.GetCurEntry();
     if ( pEntry )
     {
         aTreeListBox.GetModel()->Remove( pEntry );
@@ -1406,7 +1406,7 @@ IMPL_LINK_INLINE_END( WatchWindow, ButtonHdl, ImageButton *, pButton )
 
 IMPL_LINK_NOARG_INLINE_START(WatchWindow, TreeListHdl)
 {
-    SvLBoxEntry* pCurEntry = aTreeListBox.GetCurEntry();
+    SvTreeListEntry* pCurEntry = aTreeListBox.GetCurEntry();
     if ( pCurEntry && pCurEntry->GetUserData() )
         aXEdit.SetText( ((WatchItem*)pCurEntry->GetUserData())->maName );
 
@@ -1724,7 +1724,7 @@ WatchTreeListBox::WatchTreeListBox( Window* pParent, WinBits nWinBits )
 WatchTreeListBox::~WatchTreeListBox()
 {
     // Destroy user data
-    SvLBoxEntry* pEntry = First();
+    SvTreeListEntry* pEntry = First();
     while ( pEntry )
     {
         delete (WatchItem*)pEntry->GetUserData();
@@ -1746,7 +1746,7 @@ void WatchTreeListBox::SetTabs()
     }
 }
 
-void WatchTreeListBox::RequestingChildren( SvLBoxEntry * pParent )
+void WatchTreeListBox::RequestingChildren( SvTreeListEntry * pParent )
 {
     if( !StarBASIC::IsRunning() )
         return;
@@ -1754,7 +1754,7 @@ void WatchTreeListBox::RequestingChildren( SvLBoxEntry * pParent )
     if( GetChildCount( pParent ) > 0 )
         return;
 
-    SvLBoxEntry* pEntry = pParent;
+    SvTreeListEntry* pEntry = pParent;
     WatchItem* pItem = (WatchItem*)pEntry->GetUserData();
 
     SbxDimArray* pArray = pItem->mpArray;
@@ -1780,7 +1780,7 @@ void WatchTreeListBox::RequestingChildren( SvLBoxEntry * pParent )
 
             pItem->maMemberList.push_back(String(pVar->GetName()));
             String const& rName = pItem->maMemberList.back();
-            SvLBoxEntry* pChildEntry = SvTreeListBox::InsertEntry( rName, pEntry );
+            SvTreeListEntry* pChildEntry = SvTreeListBox::InsertEntry( rName, pEntry );
             pChildEntry->SetUserData(new WatchItem(rName));
         }
         if( nPropCount > 0 )
@@ -1828,7 +1828,7 @@ void WatchTreeListBox::RequestingChildren( SvLBoxEntry * pParent )
             aDisplayName += aIndexStr;
             pChildItem->maDisplayName = aDisplayName;
 
-            SvLBoxEntry* pChildEntry = SvTreeListBox::InsertEntry( aDisplayName, pEntry );
+            SvTreeListEntry* pChildEntry = SvTreeListBox::InsertEntry( aDisplayName, pEntry );
             nElementCount++;
             pChildEntry->SetUserData( pChildItem );
         }
@@ -1839,7 +1839,7 @@ void WatchTreeListBox::RequestingChildren( SvLBoxEntry * pParent )
     }
 }
 
-SbxBase* WatchTreeListBox::ImplGetSBXForEntry( SvLBoxEntry* pEntry, bool& rbArrayElement )
+SbxBase* WatchTreeListBox::ImplGetSBXForEntry( SvTreeListEntry* pEntry, bool& rbArrayElement )
 {
     SbxBase* pSBX = NULL;
     rbArrayElement = false;
@@ -1847,7 +1847,7 @@ SbxBase* WatchTreeListBox::ImplGetSBXForEntry( SvLBoxEntry* pEntry, bool& rbArra
     WatchItem* pItem = (WatchItem*)pEntry->GetUserData();
     String aVName( pItem->maName );
 
-    SvLBoxEntry* pParentEntry = GetParent( pEntry );
+    SvTreeListEntry* pParentEntry = GetParent( pEntry );
     WatchItem* pParentItem = pParentEntry ? (WatchItem*)pParentEntry->GetUserData() : NULL;
     if( pParentItem )
     {
@@ -1879,7 +1879,7 @@ SbxBase* WatchTreeListBox::ImplGetSBXForEntry( SvLBoxEntry* pEntry, bool& rbArra
     return pSBX;
 }
 
-sal_Bool WatchTreeListBox::EditingEntry( SvLBoxEntry* pEntry, Selection& )
+sal_Bool WatchTreeListBox::EditingEntry( SvTreeListEntry* pEntry, Selection& )
 {
     WatchItem* pItem = (WatchItem*)pEntry->GetUserData();
 
@@ -1904,7 +1904,7 @@ sal_Bool WatchTreeListBox::EditingEntry( SvLBoxEntry* pEntry, Selection& )
     return bEdit;
 }
 
-sal_Bool WatchTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const OUString& rNewText )
+sal_Bool WatchTreeListBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText )
 {
     WatchItem* pItem = (WatchItem*)pEntry->GetUserData();
     String aVName( pItem->maName );
@@ -1920,7 +1920,7 @@ sal_Bool WatchTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const OUString& rNe
     return aResult != aEditingRes && ImplBasicEntryEdited(pEntry, aResult);
 }
 
-bool WatchTreeListBox::ImplBasicEntryEdited( SvLBoxEntry* pEntry, const String& rResult )
+bool WatchTreeListBox::ImplBasicEntryEdited( SvTreeListEntry* pEntry, const String& rResult )
 {
     bool bArrayElement;
     SbxBase* pSBX = ImplGetSBXForEntry( pEntry, bArrayElement );
@@ -1953,12 +1953,12 @@ bool WatchTreeListBox::ImplBasicEntryEdited( SvLBoxEntry* pEntry, const String&
 namespace
 {
 
-void implCollapseModifiedObjectEntry( SvLBoxEntry* pParent, WatchTreeListBox* pThis )
+void implCollapseModifiedObjectEntry( SvTreeListEntry* pParent, WatchTreeListBox* pThis )
 {
     pThis->Collapse( pParent );
 
     SvLBoxTreeList* pModel = pThis->GetModel();
-    SvLBoxEntry* pDeleteEntry;
+    SvTreeListEntry* pDeleteEntry;
     while( (pDeleteEntry = pThis->SvTreeListBox::GetEntry( pParent, 0 )) != NULL )
     {
         implCollapseModifiedObjectEntry( pDeleteEntry, pThis );
@@ -1998,7 +1998,7 @@ String implCreateTypeStringForDimArray( WatchItem* pItem, SbxDataType eType )
     return aRetStr;
 }
 
-void implEnableChildren( SvLBoxEntry* pEntry, bool bEnable )
+void implEnableChildren( SvTreeListEntry* pEntry, bool bEnable )
 {
     if( bEnable )
     {
@@ -2023,7 +2023,7 @@ void WatchTreeListBox::UpdateWatches( bool bBasicStopped )
     SbxError eOld = SbxBase::GetError();
     setBasicWatchMode( true );
 
-    SvLBoxEntry* pEntry = First();
+    SvTreeListEntry* pEntry = First();
     while ( pEntry )
     {
         WatchItem* pItem = (WatchItem*)pEntry->GetUserData();
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index 8ef1a92fe785..feac68eaaa6d 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -198,7 +198,7 @@ TreeListBox::~TreeListBox ()
     m_aNotifier.dispose();
 
     // destroy user data
-    SvLBoxEntry* pEntry = First();
+    SvTreeListEntry* pEntry = First();
     while ( pEntry )
     {
         delete static_cast<Entry*>(pEntry->GetUserData());
@@ -218,7 +218,7 @@ void TreeListBox::ScanEntry( const ScriptDocument& rDocument, LibraryLocation eL
     SetUpdateMode(false);
 
     // level 1: BasicManager (application, document, ...)
-    SvLBoxEntry* pDocumentRootEntry = FindRootEntry( rDocument, eLocation );
+    SvTreeListEntry* pDocumentRootEntry = FindRootEntry( rDocument, eLocation );
     if ( pDocumentRootEntry && IsExpanded( pDocumentRootEntry ) )
         ImpCreateLibEntries( pDocumentRootEntry, rDocument, eLocation );
     if ( !pDocumentRootEntry )
@@ -239,7 +239,7 @@ void TreeListBox::ScanEntry( const ScriptDocument& rDocument, LibraryLocation eL
     SetUpdateMode(true);
 }
 
-void TreeListBox::ImpCreateLibEntries( SvLBoxEntry* pDocumentRootEntry, const ScriptDocument& rDocument, LibraryLocation eLocation )
+void TreeListBox::ImpCreateLibEntries( SvTreeListEntry* pDocumentRootEntry, const ScriptDocument& rDocument, LibraryLocation eLocation )
 {
     // get a sorted list of library names
     Sequence< OUString > aLibNames( rDocument.getLibraryNames() );
@@ -283,7 +283,7 @@ void TreeListBox::ImpCreateLibEntries( SvLBoxEntry* pDocumentRootEntry, const Sc
                 nId = bLoaded ? RID_IMG_DLGLIB : RID_IMG_DLGLIBNOTLOADED;
             else
                 nId = bLoaded ? RID_IMG_MODLIB : RID_IMG_MODLIBNOTLOADED;
-            SvLBoxEntry* pLibRootEntry = FindEntry( pDocumentRootEntry, aLibName, OBJ_TYPE_LIBRARY );
+            SvTreeListEntry* pLibRootEntry = FindEntry( pDocumentRootEntry, aLibName, OBJ_TYPE_LIBRARY );
             if ( pLibRootEntry )
             {
                 SetEntryBitmaps( pLibRootEntry, Image( IDEResId( nId ) ) );
@@ -303,7 +303,7 @@ void TreeListBox::ImpCreateLibEntries( SvLBoxEntry* pDocumentRootEntry, const Sc
     }
 }
 
-void TreeListBox::ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const OUString& rLibName )
+void TreeListBox::ImpCreateLibSubEntries( SvTreeListEntry* pLibRootEntry, const ScriptDocument& rDocument, const OUString& rLibName )
 {
     // modules
     if ( nMode & BROWSEMODE_MODULES )
@@ -326,7 +326,7 @@ void TreeListBox::ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const Scri
                     for ( sal_Int32 i = 0 ; i < nModCount ; i++ )
                     {
                         OUString aModName = pModNames[ i ];
-                        SvLBoxEntry* pModuleEntry = FindEntry( pLibRootEntry, aModName, OBJ_TYPE_MODULE );
+                        SvTreeListEntry* pModuleEntry = FindEntry( pLibRootEntry, aModName, OBJ_TYPE_MODULE );
                         if ( !pModuleEntry )
                             pModuleEntry = AddEntry(
                                 aModName,
@@ -345,7 +345,7 @@ void TreeListBox::ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const Scri
                             for ( sal_Int32 j = 0 ; j < nCount ; j++ )
                             {
                                 OUString aName = pNames[ j ];
-                                SvLBoxEntry* pEntry = FindEntry( pModuleEntry, aName, OBJ_TYPE_METHOD );
+                                SvTreeListEntry* pEntry = FindEntry( pModuleEntry, aName, OBJ_TYPE_METHOD );
                                 if ( !pEntry )
                                     pEntry = AddEntry(
                                         aName,
@@ -382,7 +382,7 @@ void TreeListBox::ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const Scri
                 for ( sal_Int32 i = 0 ; i < nDlgCount ; i++ )
                 {
                     OUString aDlgName = pDlgNames[ i ];
-                    SvLBoxEntry* pDialogEntry = FindEntry( pLibRootEntry, aDlgName, OBJ_TYPE_DIALOG );
+                    SvTreeListEntry* pDialogEntry = FindEntry( pLibRootEntry, aDlgName, OBJ_TYPE_DIALOG );
                     if ( !pDialogEntry )
                         pDialogEntry = AddEntry(
                             aDlgName,
@@ -400,7 +400,7 @@ void TreeListBox::ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const Scri
     }
 }
 
-void TreeListBox::ImpCreateLibSubEntriesInVBAMode( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const OUString& rLibName )
+void TreeListBox::ImpCreateLibSubEntriesInVBAMode( SvTreeListEntry* pLibRootEntry, const ScriptDocument& rDocument, const OUString& rLibName )
 {
 
     std::vector<std::pair<EntryType, OUString> > aEntries;
@@ -414,7 +414,7 @@ void TreeListBox::ImpCreateLibSubEntriesInVBAMode( SvLBoxEntry* pLibRootEntry, c
     {
         EntryType eType = iter->first;
         OUString aEntryName = iter->second;
-        SvLBoxEntry* pLibSubRootEntry = FindEntry( pLibRootEntry, aEntryName, eType );
+        SvTreeListEntry* pLibSubRootEntry = FindEntry( pLibRootEntry, aEntryName, eType );
         if( pLibSubRootEntry )
         {
             SetEntryBitmaps( pLibSubRootEntry, Image( IDEResId( RID_IMG_MODLIB ) ) );
@@ -433,7 +433,7 @@ void TreeListBox::ImpCreateLibSubEntriesInVBAMode( SvLBoxEntry* pLibRootEntry, c
     }
 }
 
-void TreeListBox::ImpCreateLibSubSubEntriesInVBAMode( SvLBoxEntry* pLibSubRootEntry, const ScriptDocument& rDocument, const OUString& rLibName )
+void TreeListBox::ImpCreateLibSubSubEntriesInVBAMode( SvTreeListEntry* pLibSubRootEntry, const ScriptDocument& rDocument, const OUString& rLibName )
 {
     uno::Reference< container::XNameContainer > xLib = rDocument.getOrCreateLibrary( E_SCRIPTS, rLibName );
     if( !xLib.is() )
@@ -486,7 +486,7 @@ void TreeListBox::ImpCreateLibSubSubEntriesInVBAMode( SvLBoxEntry* pLibSubRootEn
                 }
             }
             OUString aEntryName(aEntryNameBuf.makeStringAndClear());
-            SvLBoxEntry* pModuleEntry = FindEntry( pLibSubRootEntry, aEntryName, OBJ_TYPE_MODULE );
+            SvTreeListEntry* pModuleEntry = FindEntry( pLibSubRootEntry, aEntryName, OBJ_TYPE_MODULE );
             if ( !pModuleEntry )
                 pModuleEntry = AddEntry(
                     aEntryName,
@@ -505,7 +505,7 @@ void TreeListBox::ImpCreateLibSubSubEntriesInVBAMode( SvLBoxEntry* pLibSubRootEn
                 for ( sal_Int32 j = 0 ; j < nCount ; j++ )
                 {
                     OUString aName = pNames[ j ];
-                    SvLBoxEntry* pEntry = FindEntry( pModuleEntry, aName, OBJ_TYPE_METHOD );
+                    SvTreeListEntry* pEntry = FindEntry( pModuleEntry, aName, OBJ_TYPE_METHOD );
                     if ( !pEntry )
                         pEntry = AddEntry(
                             aName,
@@ -523,10 +523,10 @@ void TreeListBox::ImpCreateLibSubSubEntriesInVBAMode( SvLBoxEntry* pLibSubRootEn
     }
 }
 
-SvLBoxEntry* TreeListBox::ImpFindEntry( SvLBoxEntry* pParent, const OUString& rText )
+SvTreeListEntry* TreeListBox::ImpFindEntry( SvTreeListEntry* pParent, const OUString& rText )
 {
     sal_uLong nRootPos = 0;
-    SvLBoxEntry* pEntry = pParent ? FirstChild( pParent ) : GetEntry( nRootPos );
+    SvTreeListEntry* pEntry = pParent ? FirstChild( pParent ) : GetEntry( nRootPos );
     while ( pEntry )
     {
         if (  rText.equals(GetEntryText( pEntry )) )
@@ -590,8 +590,8 @@ void TreeListBox::UpdateEntries()
     EntryDescriptor aCurDesc( GetEntryDescriptor( FirstSelected() ) );
 
     // removing the invalid entries
-    SvLBoxEntry* pLastValid = 0;
-    SvLBoxEntry* pEntry = First();
+    SvTreeListEntry* pLastValid = 0;
+    SvTreeListEntry* pEntry = First();
     while ( pEntry )
     {
         if ( IsValidEntry( pEntry ) )
@@ -607,7 +607,7 @@ void TreeListBox::UpdateEntries()
 }
 
 // Removes the entry from the tree.
-void TreeListBox::RemoveEntry (SvLBoxEntry* pEntry)
+void TreeListBox::RemoveEntry (SvTreeListEntry* pEntry)
 {
     // removing the associated user data
     delete static_cast<Entry*>(pEntry->GetUserData());
@@ -619,7 +619,7 @@ void TreeListBox::RemoveEntry (SvLBoxEntry* pEntry)
 void TreeListBox::RemoveEntry (ScriptDocument const& rDocument)
 {
     // finding the entry of rDocument
-    for (SvLBoxEntry* pEntry = First(); pEntry; pEntry = Next(pEntry))
+    for (SvTreeListEntry* pEntry = First(); pEntry; pEntry = Next(pEntry))
         if (rDocument == GetEntryDescriptor(pEntry).GetDocument())
         {
             RemoveEntry(pEntry);
@@ -627,9 +627,9 @@ void TreeListBox::RemoveEntry (ScriptDocument const& rDocument)
         }
 }
 
-SvLBoxEntry* TreeListBox::CloneEntry( SvLBoxEntry* pSource )
+SvTreeListEntry* TreeListBox::CloneEntry( SvTreeListEntry* pSource )
 {
-    SvLBoxEntry* pNew = SvTreeListBox::CloneEntry( pSource );
+    SvTreeListEntry* pNew = SvTreeListBox::CloneEntry( pSource );
     Entry* pUser = static_cast<Entry*>(pSource->GetUserData());
 
     DBG_ASSERT( pUser, "User-Daten?!" );
@@ -640,10 +640,10 @@ SvLBoxEntry* TreeListBox::CloneEntry( SvLBoxEntry* pSource )
     return pNew;
 }
 
-SvLBoxEntry* TreeListBox::FindEntry( SvLBoxEntry* pParent, const OUString& rText, EntryType eType )
+SvTreeListEntry* TreeListBox::FindEntry( SvTreeListEntry* pParent, const OUString& rText, EntryType eType )
 {
     sal_uLong nRootPos = 0;
-    SvLBoxEntry* pEntry = pParent ? FirstChild( pParent ) : GetEntry( nRootPos );
+    SvTreeListEntry* pEntry = pParent ? FirstChild( pParent ) : GetEntry( nRootPos );
     while ( pEntry )
     {
         Entry* pBasicEntry = static_cast<Entry*>(pEntry->GetUserData());
@@ -662,7 +662,7 @@ long TreeListBox::ExpandingHdl()
     bool bOK = true;
     if ( GetModel()->GetDepth( GetHdlEntry() ) == 1 )
     {
-        SvLBoxEntry* pCurEntry = GetCurEntry();
+        SvTreeListEntry* pCurEntry = GetCurEntry();
         EntryDescriptor aDesc( GetEntryDescriptor( pCurEntry ) );
         ScriptDocument aDocument( aDesc.GetDocument() );
         OSL_ENSURE( aDocument.isAlive(), "TreeListBox::ExpandingHdl: no document, or document is dead!" );
@@ -692,7 +692,7 @@ long TreeListBox::ExpandingHdl()
     return bOK;
 }
 
-bool TreeListBox::IsEntryProtected( SvLBoxEntry* pEntry )
+bool TreeListBox::IsEntryProtected( SvTreeListEntry* pEntry )
 {
     bool bProtected = false;
     if ( pEntry && ( GetModel()->GetDepth( pEntry ) == 1 ) )
@@ -718,15 +718,15 @@ bool TreeListBox::IsEntryProtected( SvLBoxEntry* pEntry )
 }
 
 SAL_WNODEPRECATED_DECLARATIONS_PUSH
-SvLBoxEntry* TreeListBox::AddEntry(
+SvTreeListEntry* TreeListBox::AddEntry(
     OUString const& rText,
     const Image& rImage,
-    SvLBoxEntry* pParent,
+    SvTreeListEntry* pParent,
     bool bChildrenOnDemand,
     std::auto_ptr<Entry> aUserData
 )
 {
-    SvLBoxEntry* p = InsertEntry(
+    SvTreeListEntry* p = InsertEntry(
         rText, rImage, rImage, pParent, bChildrenOnDemand, LIST_APPEND,
         aUserData.release() // XXX possible leak
     );
@@ -734,7 +734,7 @@ SvLBoxEntry* TreeListBox::AddEntry(
 }
 SAL_WNODEPRECATED_DECLARATIONS_POP
 
-void TreeListBox::SetEntryBitmaps( SvLBoxEntry * pEntry, const Image& rImage )
+void TreeListBox::SetEntryBitmaps( SvTreeListEntry * pEntry, const Image& rImage )
 {
     SetExpandedEntryBmp(  pEntry, rImage );
     SetCollapsedEntryBmp( pEntry, rImage );
@@ -809,7 +809,7 @@ void TreeListBox::GetRootEntryBitmaps( const ScriptDocument& rDocument, Image& r
 
 void TreeListBox::SetCurrentEntry (EntryDescriptor& rDesc)
 {
-    SvLBoxEntry* pCurEntry = 0;
+    SvTreeListEntry* pCurEntry = 0;
     EntryDescriptor aDesc = rDesc;
     if ( aDesc.GetType() == OBJ_TYPE_UNKNOWN )
     {
@@ -822,7 +822,7 @@ void TreeListBox::SetCurrentEntry (EntryDescriptor& rDesc)
     ScriptDocument aDocument = aDesc.GetDocument();
     OSL_ENSURE( aDocument.isValid(), "TreeListBox::SetCurrentEntry: invalid document!" );
     LibraryLocation eLocation = aDesc.GetLocation();
-    SvLBoxEntry* pRootEntry = FindRootEntry( aDocument, eLocation );
+    SvTreeListEntry* pRootEntry = FindRootEntry( aDocument, eLocation );
     if ( pRootEntry )
     {
         pCurEntry = pRootEntry;
@@ -830,7 +830,7 @@ void TreeListBox::SetCurrentEntry (EntryDescriptor& rDesc)
         if ( !aLibName.isEmpty() )
         {
             Expand( pRootEntry );
-            SvLBoxEntry* pLibEntry = FindEntry( pRootEntry, aLibName, OBJ_TYPE_LIBRARY );
+            SvTreeListEntry* pLibEntry = FindEntry( pRootEntry, aLibName, OBJ_TYPE_LIBRARY );
             if ( pLibEntry )
             {
                 pCurEntry = pLibEntry;
@@ -838,7 +838,7 @@ void TreeListBox::SetCurrentEntry (EntryDescriptor& rDesc)
                 if( !aLibSubName.isEmpty() )
                 {
                     Expand( pLibEntry );
-                    SvLBoxEntry* pLibSubEntry = ImpFindEntry( pLibEntry, aLibSubName );
+                    SvTreeListEntry* pLibSubEntry = ImpFindEntry( pLibEntry, aLibSubName );
                     if( pLibSubEntry )
                     {
                         pCurEntry = pLibSubEntry;
@@ -851,7 +851,7 @@ void TreeListBox::SetCurrentEntry (EntryDescriptor& rDesc)
                     EntryType eType = OBJ_TYPE_MODULE;
                     if ( aDesc.GetType() == OBJ_TYPE_DIALOG )
                         eType = OBJ_TYPE_DIALOG;
-                    SvLBoxEntry* pEntry = FindEntry( pCurEntry, aName, eType );
+                    SvTreeListEntry* pEntry = FindEntry( pCurEntry, aName, eType );
                     if ( pEntry )
                     {
                         pCurEntry = pEntry;
@@ -859,7 +859,7 @@ void TreeListBox::SetCurrentEntry (EntryDescriptor& rDesc)
                         if ( !aMethodName.isEmpty() )
                         {
                             Expand( pEntry );
-                            SvLBoxEntry* pSubEntry = FindEntry( pEntry, aMethodName, OBJ_TYPE_METHOD );
+                            SvTreeListEntry* pSubEntry = FindEntry( pEntry, aMethodName, OBJ_TYPE_METHOD );
                             if ( pSubEntry )
                             {
                                 pCurEntry = pSubEntry;
diff --git a/basctl/source/basicide/bastype2.hxx b/basctl/source/basicide/bastype2.hxx
index 1c0de301f33f..45ce1a3ac64c 100644
--- a/basctl/source/basicide/bastype2.hxx
+++ b/basctl/source/basicide/bastype2.hxx
@@ -31,7 +31,7 @@
 #include "basobj.hxx"
 
 class SbModule;
-class SvLBoxEntry;
+class SvTreeListEntry;
 class SbxVariable;
 
 namespace basctl
@@ -178,20 +178,20 @@ private:
     sal_uInt16 nMode;
     DocumentEventNotifier m_aNotifier;
 
-    void            SetEntryBitmaps( SvLBoxEntry * pEntry, const Image& rImage );
+    void            SetEntryBitmaps( SvTreeListEntry * pEntry, const Image& rImage );
     virtual void    MouseButtonDown( const MouseEvent& rMEvt );
 
 protected:
-    virtual void            RequestingChildren( SvLBoxEntry* pParent );
+    virtual void            RequestingChildren( SvTreeListEntry* pParent );
     virtual void            ExpandedHdl();
-    virtual SvLBoxEntry*    CloneEntry( SvLBoxEntry* pSource );
+    virtual SvTreeListEntry*    CloneEntry( SvTreeListEntry* pSource );
     virtual long            ExpandingHdl();
 
-    void                    ImpCreateLibEntries( SvLBoxEntry* pShellRootEntry, const ScriptDocument& rDocument, LibraryLocation eLocation );
-    void                    ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const OUString& rLibName );
-    void                    ImpCreateLibSubEntriesInVBAMode( SvLBoxEntry* pLibRootEntry, const ScriptDocument& rDocument, const OUString& rLibName );
-    void                    ImpCreateLibSubSubEntriesInVBAMode( SvLBoxEntry* pLibSubRootEntry, const ScriptDocument& rDocument, const OUString& rLibName );
-    SvLBoxEntry*            ImpFindEntry( SvLBoxEntry* pParent, const OUString& rText );
+    void                    ImpCreateLibEntries( SvTreeListEntry* pShellRootEntry, const ScriptDocument& rDocument, LibraryLocation eLocation );
+    void                    ImpCreateLibSubEntries( SvTreeListEntry* pLibRootEntry, const ScriptDocument& rDocument, const OUString& rLibName );
+    void                    ImpCreateLibSubEntriesInVBAMode( SvTreeListEntry* pLibRootEntry, const ScriptDocument& rDocument, const OUString& rLibName );
+    void                    ImpCreateLibSubSubEntriesInVBAMode( SvTreeListEntry* pLibSubRootEntry, const ScriptDocument& rDocument, const OUString& rLibName );
+    SvTreeListEntry*            ImpFindEntry( SvTreeListEntry* pParent, const OUString& rText );
 
     // DocumentEventListener
     virtual void onDocumentCreated( const ScriptDocument& _rDocument );
@@ -212,27 +212,27 @@ public:
     void            ScanAllEntries();
     void            UpdateEntries();
 
-    bool            IsEntryProtected( SvLBoxEntry* pEntry );
+    bool            IsEntryProtected( SvTreeListEntry* pEntry );
 
     void            SetMode( sal_uInt16 nM ) { nMode = nM; }
     sal_uInt16          GetMode() const { return nMode; }
 
-    SbModule*       FindModule( SvLBoxEntry* pEntry );
-    SbxVariable*    FindVariable( SvLBoxEntry* pEntry );
-    SvLBoxEntry*    FindRootEntry( const ScriptDocument& rDocument, LibraryLocation eLocation );
-    SvLBoxEntry*    FindEntry( SvLBoxEntry* pParent, const OUString& rText, EntryType eType );
+    SbModule*       FindModule( SvTreeListEntry* pEntry );
+    SbxVariable*    FindVariable( SvTreeListEntry* pEntry );
+    SvTreeListEntry*    FindRootEntry( const ScriptDocument& rDocument, LibraryLocation eLocation );
+    SvTreeListEntry*    FindEntry( SvTreeListEntry* pParent, const OUString& rText, EntryType eType );
 
-    EntryDescriptor GetEntryDescriptor( SvLBoxEntry* pEntry );
+    EntryDescriptor GetEntryDescriptor( SvTreeListEntry* pEntry );
 
     ItemType        ConvertType (EntryType eType);
-    bool            IsValidEntry( SvLBoxEntry* pEntry );
+    bool            IsValidEntry( SvTreeListEntry* pEntry );
 
-    SvLBoxEntry*    AddEntry(
+    SvTreeListEntry*    AddEntry(
         const OUString& rText, const Image& rImage,
-        SvLBoxEntry* pParent, bool bChildrenOnDemand,
+        SvTreeListEntry* pParent, bool bChildrenOnDemand,
         std::auto_ptr<Entry> aUserData
     );
-    void            RemoveEntry (SvLBoxEntry*);
+    void            RemoveEntry (SvTreeListEntry*);
     void            RemoveEntry (ScriptDocument const&);
 
     OUString GetRootEntryName( const ScriptDocument& rDocument, LibraryLocation eLocation ) const;
diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx
index 17c66a7cbe40..d201081dd30a 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -38,10 +38,10 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star;
 
 
-typedef std::deque< SvLBoxEntry* > EntryArray;
+typedef std::deque< SvTreeListEntry* > EntryArray;
 
 
-void TreeListBox::RequestingChildren( SvLBoxEntry* pEntry )
+void TreeListBox::RequestingChildren( SvTreeListEntry* pEntry )
 {
     EntryDescriptor aDesc = GetEntryDescriptor(pEntry);
     ScriptDocument aDocument = aDesc.GetDocument();
@@ -133,12 +133,12 @@ void TreeListBox::RequestingChildren( SvLBoxEntry* pEntry )
 
 void TreeListBox::ExpandedHdl()
 {
-    SvLBoxEntry* pEntry = GetHdlEntry();
+    SvTreeListEntry* pEntry = GetHdlEntry();
     DBG_ASSERT( pEntry, "Was wurde zugeklappt?" );
 
     if ( !IsExpanded( pEntry ) && pEntry->HasChildrenOnDemand() )
     {
-        SvLBoxEntry* pChild = FirstChild( pEntry );
+        SvTreeListEntry* pChild = FirstChild( pEntry );
         while ( pChild )
         {
             GetModel()->Remove( pChild );   // does also call the DTOR
@@ -163,7 +163,7 @@ void TreeListBox::ScanAllEntries()
     }
 }
 
-SbxVariable* TreeListBox::FindVariable( SvLBoxEntry* pEntry )
+SbxVariable* TreeListBox::FindVariable( SvTreeListEntry* pEntry )
 {
     if ( !pEntry )
         return 0;
@@ -199,7 +199,7 @@ SbxVariable* TreeListBox::FindVariable( SvLBoxEntry* pEntry )
     {
         for ( size_t n = 0; n < aEntries.size(); n++ )
         {
-            SvLBoxEntry* pLE = aEntries[n];
+            SvTreeListEntry* pLE = aEntries[n];
             DBG_ASSERT( pLE, "Can not find entry in array" );
             Entry* pBE = static_cast<Entry*>(pLE->GetUserData());
             DBG_ASSERT( pBE, "The data in the entry not found!" );
@@ -260,7 +260,7 @@ SbxVariable* TreeListBox::FindVariable( SvLBoxEntry* pEntry )
     return pVar;
 }
 
-EntryDescriptor TreeListBox::GetEntryDescriptor( SvLBoxEntry* pEntry )
+EntryDescriptor TreeListBox::GetEntryDescriptor( SvTreeListEntry* pEntry )
 {
     ScriptDocument aDocument( ScriptDocument::getApplicationScriptDocument() );
     LibraryLocation eLocation = LIBRARY_LOCATION_UNKNOWN;
@@ -306,7 +306,7 @@ EntryDescriptor TreeListBox::GetEntryDescriptor( SvLBoxEntry* pEntry )
     {
         for ( size_t n = 0; n < aEntries.size(); n++ )
         {
-            SvLBoxEntry* pLE = aEntries[n];
+            SvTreeListEntry* pLE = aEntries[n];
             DBG_ASSERT( pLE, "Entrie im Array nicht gefunden" );
             Entry* pBE = static_cast<Entry*>(pLE->GetUserData());
             DBG_ASSERT( pBE, "Keine Daten im Eintrag gefunden!" );
@@ -376,7 +376,7 @@ ItemType TreeListBox::ConvertType (EntryType eType)
     }
 }
 
-bool TreeListBox::IsValidEntry( SvLBoxEntry* pEntry )
+bool TreeListBox::IsValidEntry( SvTreeListEntry* pEntry )
 {
     bool bIsValid = false;
 
@@ -431,16 +431,16 @@ bool TreeListBox::IsValidEntry( SvLBoxEntry* pEntry )
     return bIsValid;
 }
 
-SbModule* TreeListBox::FindModule( SvLBoxEntry* pEntry )
+SbModule* TreeListBox::FindModule( SvTreeListEntry* pEntry )
 {
     return dynamic_cast<SbModule*>(FindVariable(pEntry));
 }
 
-SvLBoxEntry* TreeListBox::FindRootEntry( const ScriptDocument& rDocument, LibraryLocation eLocation )
+SvTreeListEntry* TreeListBox::FindRootEntry( const ScriptDocument& rDocument, LibraryLocation eLocation )
 {
     OSL_ENSURE( rDocument.isValid(), "basctl::TreeListBox::FindRootEntry: invalid document!" );
     sal_uLong nRootPos = 0;
-    SvLBoxEntry* pRootEntry = GetEntry( nRootPos );
+    SvTreeListEntry* pRootEntry = GetEntry( nRootPos );
     while ( pRootEntry )
     {
         DBG_ASSERT( static_cast<Entry*>(pRootEntry->GetUserData())->GetType() == OBJ_TYPE_DOCUMENT, "Kein Shelleintrag?" );
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index 9bc56e994098..3e07dfd86ac3 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -135,7 +135,7 @@ void MacroChooser::StoreMacroDescription()
 {
     EntryDescriptor aDesc = aBasicBox.GetEntryDescriptor(aBasicBox.FirstSelected());
     String aMethodName;
-    SvLBoxEntry* pEntry = aMacroBox.FirstSelected();
+    SvTreeListEntry* pEntry = aMacroBox.FirstSelected();
     if ( pEntry )
         aMethodName = aMacroBox.GetEntryText( pEntry );
     else
@@ -170,9 +170,9 @@ void MacroChooser::RestoreMacroDescription()
     if ( aLastMacro.Len() )
     {
         // find entry in macro box
-        SvLBoxEntry* pEntry = 0;
+        SvTreeListEntry* pEntry = 0;
         sal_uLong nPos = 0;
-        SvLBoxEntry* pE = aMacroBox.GetEntry( nPos );
+        SvTreeListEntry* pE = aMacroBox.GetEntry( nPos );
         while ( pE )
         {
             if ( aMacroBox.GetEntryText( pE ) == aLastMacro )
@@ -199,7 +199,7 @@ short MacroChooser::Execute()
     aRunButton.GrabFocus();
 
     // #104198 Check if "wrong" document is active
-    SvLBoxEntry* pSelectedEntry = aBasicBox.GetCurEntry();
+    SvTreeListEntry* pSelectedEntry = aBasicBox.GetCurEntry();
     EntryDescriptor aDesc( aBasicBox.GetEntryDescriptor( pSelectedEntry ) );
     const ScriptDocument& rSelectedDoc( aDesc.GetDocument() );
 
@@ -208,15 +208,15 @@ short MacroChooser::Execute()
     {
         // Search for the right entry
         sal_uLong nRootPos = 0;
-        SvLBoxEntry* pRootEntry = aBasicBox.GetEntry( nRootPos );
+        SvTreeListEntry* pRootEntry = aBasicBox.GetEntry( nRootPos );
         while( pRootEntry )
         {
             EntryDescriptor aCmpDesc( aBasicBox.GetEntryDescriptor( pRootEntry ) );
             const ScriptDocument& rCmpDoc( aCmpDesc.GetDocument() );
             if ( rCmpDoc.isDocument() && rCmpDoc.isActive() )
             {
-                SvLBoxEntry* pEntry = pRootEntry;
-                SvLBoxEntry* pLastValid = pEntry;
+                SvTreeListEntry* pEntry = pRootEntry;
+                SvTreeListEntry* pLastValid = pEntry;
                 while ( pEntry )
                 {
                     pLastValid = pEntry;
@@ -267,7 +267,7 @@ SbMethod* MacroChooser::GetMacro()
     SbModule* pModule = aBasicBox.FindModule( aBasicBox.GetCurEntry() );
     if ( pModule )
     {
-        SvLBoxEntry* pEntry = aMacroBox.FirstSelected();
+        SvTreeListEntry* pEntry = aMacroBox.FirstSelected();
         if ( pEntry )
         {
             String aMacroName( aMacroBox.GetEntryText( pEntry ) );
@@ -315,7 +315,7 @@ void MacroChooser::DeleteMacro()
         String aModName = pModule->GetName();
         OSL_VERIFY( aDocument.updateModule( aLibName, aModName, aSource ) );
 
-        SvLBoxEntry* pEntry = aMacroBox.FirstSelected();
+        SvTreeListEntry* pEntry = aMacroBox.FirstSelected();
         DBG_ASSERT( pEntry, "DeleteMacro: Entry ?!" );
         aMacroBox.GetModel()->Remove( pEntry );
         bForceStoreBasic = true;
@@ -325,7 +325,7 @@ void MacroChooser::DeleteMacro()
 SbMethod* MacroChooser::CreateMacro()
 {
     SbMethod* pMethod = 0;
-    SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry();
+    SvTreeListEntry* pCurEntry = aBasicBox.GetCurEntry();
     EntryDescriptor aDesc = aBasicBox.GetEntryDescriptor(pCurEntry);
     ScriptDocument aDocument( aDesc.GetDocument() );
     OSL_ENSURE( aDocument.isAlive(), "MacroChooser::CreateMacro: no document!" );
@@ -380,7 +380,7 @@ SbMethod* MacroChooser::CreateMacro()
     return pMethod;
 }
 
-void MacroChooser::SaveSetCurEntry( SvTreeListBox& rBox, SvLBoxEntry* pEntry )
+void MacroChooser::SaveSetCurEntry( SvTreeListBox& rBox, SvTreeListEntry* pEntry )
 {
     // the edit would be killed by the highlight otherwise:
 
@@ -394,9 +394,9 @@ void MacroChooser::SaveSetCurEntry( SvTreeListBox& rBox, SvLBoxEntry* pEntry )
 
 void MacroChooser::CheckButtons()
 {
-    SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry();
+    SvTreeListEntry* pCurEntry = aBasicBox.GetCurEntry();
     EntryDescriptor aDesc = aBasicBox.GetEntryDescriptor(pCurEntry);
-    SvLBoxEntry* pMacroEntry = aMacroBox.FirstSelected();
+    SvTreeListEntry* pMacroEntry = aMacroBox.FirstSelected();
     SbMethod* pMethod = GetMacro();
 
     // check, if corresponding libraries are readonly
@@ -532,7 +532,7 @@ IMPL_LINK( MacroChooser, BasicSelectHdl, SvTreeListBox *, pBox )
 
         if ( aMacroBox.GetEntryCount() )
         {
-            SvLBoxEntry* pEntry = aMacroBox.GetEntry( 0 );
+            SvTreeListEntry* pEntry = aMacroBox.GetEntry( 0 );
             DBG_ASSERT( pEntry, "Entry ?!" );
             aMacroBox.SetCurEntry( pEntry );
         }
@@ -551,19 +551,19 @@ IMPL_LINK( MacroChooser, EditModifyHdl, Edit *, pEdit )
 
     // select the module in which the macro is put at Neu (new),
     // if BasicManager or Lib is selecting
-    SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry();
+    SvTreeListEntry* pCurEntry = aBasicBox.GetCurEntry();
     if ( pCurEntry )
     {
         sal_uInt16 nDepth = aBasicBox.GetModel()->GetDepth( pCurEntry );
         if ( ( nDepth == 1 ) && ( aBasicBox.IsEntryProtected( pCurEntry ) ) )
         {
             // then put to the respective Std-Lib...
-            SvLBoxEntry* pManagerEntry = aBasicBox.GetModel()->GetParent( pCurEntry );
+            SvTreeListEntry* pManagerEntry = aBasicBox.GetModel()->GetParent( pCurEntry );
             pCurEntry = aBasicBox.GetModel()->FirstChild( pManagerEntry );
         }
         if ( nDepth < 2 )
         {
-            SvLBoxEntry* pNewEntry = pCurEntry;
+            SvTreeListEntry* pNewEntry = pCurEntry;
             while ( pCurEntry && ( nDepth < 2 ) )
             {
                 pCurEntry = aBasicBox.FirstChild( pCurEntry );
@@ -581,7 +581,7 @@ IMPL_LINK( MacroChooser, EditModifyHdl, Edit *, pEdit )
             bool bFound = false;
             for ( sal_uInt16 n = 0; n < aMacroBox.GetEntryCount(); n++ )
             {
-                SvLBoxEntry* pEntry = aMacroBox.GetEntry( n );
+                SvTreeListEntry* pEntry = aMacroBox.GetEntry( n );
                 DBG_ASSERT( pEntry, "Entry ?!" );
                 if ( aMacroBox.GetEntryText( pEntry ).CompareIgnoreCaseToAscii( aEdtText ) == COMPARE_EQUAL )
                 {
@@ -592,7 +592,7 @@ IMPL_LINK( MacroChooser, EditModifyHdl, Edit *, pEdit )
             }
             if ( !bFound )
             {
-                SvLBoxEntry* pEntry = aMacroBox.FirstSelected();
+                SvTreeListEntry* pEntry = aMacroBox.FirstSelected();
                 // if the entry exists ->Select ->Desription...
                 if ( pEntry )
                     aMacroBox.Select( pEntry, false );
@@ -654,7 +654,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
     }
     else if ( ( pButton == &aEditButton ) || ( pButton == &aNewDelButton ) )
     {
-        SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry();
+        SvTreeListEntry* pCurEntry = aBasicBox.GetCurEntry();
         EntryDescriptor aDesc = aBasicBox.GetEntryDescriptor(pCurEntry);
         ScriptDocument aDocument( aDesc.GetDocument() );
         DBG_ASSERT( aDocument.isAlive(), "MacroChooser::ButtonHdl: no document, or document is dead!" );
@@ -673,7 +673,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
         SfxMacroInfoItem aInfoItem( SID_BASICIDE_ARG_MACROINFO, pBasMgr, aLib, aMod, aSub, String() );
         if ( pButton == &aEditButton )
         {
-            SvLBoxEntry* pEntry = aMacroBox.FirstSelected();
+            SvTreeListEntry* pEntry = aMacroBox.FirstSelected();
             if ( pEntry )
                 aInfoItem.SetMethod( aMacroBox.GetEntryText( pEntry ) );
             StoreMacroDescription();
@@ -728,7 +728,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
 
     else if ( pButton == &aAssignButton )
     {
-        SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry();
+        SvTreeListEntry* pCurEntry = aBasicBox.GetCurEntry();
         EntryDescriptor aDesc = aBasicBox.GetEntryDescriptor(pCurEntry);
         ScriptDocument aDocument( aDesc.GetDocument() );
         DBG_ASSERT( aDocument.isAlive(), "MacroChooser::ButtonHdl: no document, or document is dead!" );
@@ -750,14 +750,14 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
     }
     else if ( pButton == &aNewLibButton )
     {
-        SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry();
+        SvTreeListEntry* pCurEntry = aBasicBox.GetCurEntry();
         EntryDescriptor aDesc = aBasicBox.GetEntryDescriptor(pCurEntry);
         ScriptDocument aDocument( aDesc.GetDocument() );
         createLibImpl( static_cast<Window*>( this ), aDocument, NULL, &aBasicBox );
     }
     else if ( pButton == &aNewModButton )
     {
-        SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry();
+        SvTreeListEntry* pCurEntry = aBasicBox.GetCurEntry();
         EntryDescriptor aDesc = aBasicBox.GetEntryDescriptor(pCurEntry);
         ScriptDocument aDocument( aDesc.GetDocument() );
         String aLibName( aDesc.GetLibName() );
@@ -793,7 +793,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
 
 void MacroChooser::UpdateFields()
 {
-    SvLBoxEntry*    pMacroEntry = aMacroBox.GetCurEntry();
+    SvTreeListEntry*    pMacroEntry = aMacroBox.GetCurEntry();
     String          aEmptyStr;
 
     aMacroNameEdit.SetText( aEmptyStr );
diff --git a/basctl/source/basicide/macrodlg.hxx b/basctl/source/basicide/macrodlg.hxx
index 083cb2ef532a..4262882aecf6 100644
--- a/basctl/source/basicide/macrodlg.hxx
+++ b/basctl/source/basicide/macrodlg.hxx
@@ -80,7 +80,7 @@ private:
     DECL_LINK( ButtonHdl, Button * );
 
     void                CheckButtons();
-    void                SaveSetCurEntry( SvTreeListBox& rBox, SvLBoxEntry* pEntry );
+    void                SaveSetCurEntry( SvTreeListBox& rBox, SvTreeListEntry* pEntry );
     void                UpdateFields();
 
     void                EnableButton( Button& rButton, bool bEnable );
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 4986ad2dad37..a972bf5c5fa2 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -119,15 +119,15 @@ public:
 class LibLBoxString : public SvLBoxString
 {
 public:
-    LibLBoxString( SvLBoxEntry* pEntry, sal_uInt16 nFlags, const String& rTxt ) :
+    LibLBoxString( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const String& rTxt ) :
         SvLBoxString( pEntry, nFlags, rTxt ) {}
 
-    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 LibLBoxString::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16, SvLBoxEntry* pEntry )
+void LibLBoxString::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16, SvTreeListEntry* pEntry )
 {
     // Change text color if library is read only:
     bool bReadOnly = false;
@@ -180,7 +180,7 @@ CheckBox::~CheckBox()
     delete pCheckButton;
 
     // delete user data
-    SvLBoxEntry* pEntry = First();
+    SvTreeListEntry* pEntry = First();
     while ( pEntry )
     {
         delete static_cast<LibUserData*>(pEntry->GetUserData());
@@ -216,19 +216,19 @@ void CheckBox::SetMode (ObjectMode::Mode e)
 
 //----------------------------------------------------------------------------
 
-SvLBoxEntry* CheckBox::DoInsertEntry( const String& rStr, sal_uLong nPos )
+SvTreeListEntry* CheckBox::DoInsertEntry( const String& rStr, sal_uLong nPos )
 {
     return SvTabListBox::InsertEntryToColumn( rStr, nPos, 0 );
 }
 
 //----------------------------------------------------------------------------
 
-SvLBoxEntry* CheckBox::FindEntry( const String& rName )
+SvTreeListEntry* CheckBox::FindEntry( const String& rName )
 {
     sal_uLong nCount = GetEntryCount();
     for ( sal_uLong i = 0; i < nCount; i++ )
     {
-        SvLBoxEntry* pEntry = GetEntry( i );
+        SvTreeListEntry* pEntry = GetEntry( i );
         DBG_ASSERT( pEntry, "pEntry?!" );
         if ( rName.CompareIgnoreCaseToAscii( GetEntryText( pEntry, 0 ) ) == COMPARE_EQUAL )
             return pEntry;
@@ -242,7 +242,7 @@ void CheckBox::CheckEntryPos( sal_uLong nPos )
 {
     if ( nPos < GetEntryCount() )
     {
-        SvLBoxEntry* pEntry = GetEntry( nPos );
+        SvTreeListEntry* pEntry = GetEntry( nPos );
 
         if ( GetCheckButtonState( pEntry ) != SV_BUTTON_CHECKED )
             SetCheckButtonState( pEntry, SvButtonState(SV_BUTTON_CHECKED) );
@@ -260,7 +260,7 @@ bool CheckBox::IsChecked( sal_uLong nPos ) const
 
 //----------------------------------------------------------------------------
 
-void CheckBox::InitEntry( SvLBoxEntry* pEntry, const XubString& rTxt, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind )
+void CheckBox::InitEntry( SvTreeListEntry* pEntry, const XubString& rTxt, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind )
 {
     SvTabListBox::InitEntry( pEntry, rTxt, rImg1, rImg2, eButtonKind );
 
@@ -279,7 +279,7 @@ void CheckBox::InitEntry( SvLBoxEntry* pEntry, const XubString& rTxt, const Imag
 
 //----------------------------------------------------------------------------
 
-sal_Bool CheckBox::EditingEntry( SvLBoxEntry* pEntry, Selection& )
+sal_Bool CheckBox::EditingEntry( SvTreeListEntry* pEntry, Selection& )
 {
     if (eMode != ObjectMode::Module)
         return false;
@@ -327,7 +327,7 @@ sal_Bool CheckBox::EditingEntry( SvLBoxEntry* pEntry, Selection& )
 
 //----------------------------------------------------------------------------
 
-sal_Bool CheckBox::EditedEntry( SvLBoxEntry* pEntry, const OUString& rNewName )
+sal_Bool CheckBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewName )
 {
     bool bValid = rNewName.getLength() <= 30 && IsValidSbxName(rNewName);
     OUString aOldName( GetEntryText( pEntry, 0 ) );
@@ -558,7 +558,7 @@ LibPage::~LibPage()
 
 void LibPage::CheckButtons()
 {
-    SvLBoxEntry* pCur = aLibBox.GetCurEntry();
+    SvTreeListEntry* pCur = aLibBox.GetCurEntry();
     if ( pCur )
     {
         OUString aLibName = aLibBox.GetEntryText( pCur, 0 );
@@ -656,7 +656,7 @@ IMPL_LINK( LibPage, ButtonHdl, Button *, pButton )
         SFX_APP()->ExecuteSlot( aRequest );
 
         SfxUsrAnyItem aDocItem( SID_BASICIDE_ARG_DOCUMENT_MODEL, makeAny( m_aCurDocument.getDocumentOrNull() ) );
-        SvLBoxEntry* pCurEntry = aLibBox.GetCurEntry();
+        SvTreeListEntry* pCurEntry = aLibBox.GetCurEntry();
         DBG_ASSERT( pCurEntry, "Entry?!" );
         String aLibName( aLibBox.GetEntryText( pCurEntry, 0 ) );
         SfxStringItem aLibNameItem( SID_BASICIDE_ARG_LIBNAME, aLibName );
@@ -681,7 +681,7 @@ IMPL_LINK( LibPage, ButtonHdl, Button *, pButton )
     }
     else if ( pButton == &aPasswordButton )
     {
-        SvLBoxEntry* pCurEntry = aLibBox.GetCurEntry();
+        SvTreeListEntry* pCurEntry = aLibBox.GetCurEntry();
         OUString aLibName( aLibBox.GetEntryText( pCurEntry, 0 ) );
 
         // load module library (if not loaded)
@@ -748,7 +748,7 @@ IMPL_LINK_INLINE_START( LibPage, CheckPasswordHdl, SvxPasswordDialog *, pDlg )
 {
     long nRet = 0;
 
-    SvLBoxEntry* pCurEntry = aLibBox.GetCurEntry();
+    SvTreeListEntry* pCurEntry = aLibBox.GetCurEntry();
     OUString aLibName( aLibBox.GetEntryText( pCurEntry, 0 ) );
     Reference< script::XLibraryContainerPassword > xPasswd( m_aCurDocument.getLibraryContainer( E_SCRIPTS ), UNO_QUERY );
 
@@ -899,7 +899,7 @@ void LibPage::InsertLib()
                 if ( !( ( xModLibContImport.is() && xModLibContImport->hasByName( aLibName ) && xModLibContImport->isLibraryLink( aLibName ) ) ||
                         ( xDlgLibContImport.is() && xDlgLibContImport->hasByName( aLibName ) && xDlgLibContImport->isLibraryLink( aLibName ) ) ) )
                 {
-                    SvLBoxEntry* pEntry = pLibDlg->GetLibBox().DoInsertEntry( aLibName );
+                    SvTreeListEntry* pEntry = pLibDlg->GetLibBox().DoInsertEntry( aLibName );
                     sal_uInt16 nPos = (sal_uInt16) pLibDlg->GetLibBox().GetModel()->GetAbsPos( pEntry );
                     pLibDlg->GetLibBox().CheckEntryPos(nPos);
                 }
@@ -928,7 +928,7 @@ void LibPage::InsertLib()
                     {
                         if ( pLibDlg->GetLibBox().IsChecked( nLib ) )
                         {
-                            SvLBoxEntry* pEntry = pLibDlg->GetLibBox().GetEntry( nLib );
+                            SvTreeListEntry* pEntry = pLibDlg->GetLibBox().GetEntry( nLib );
                             DBG_ASSERT( pEntry, "Entry?!" );
                             OUString aLibName( pLibDlg->GetLibBox().GetEntryText( pEntry, 0 ) );
                             Reference< script::XLibraryContainer2 > xModLibContainer( m_aCurDocument.getLibraryContainer( E_SCRIPTS ), UNO_QUERY );
@@ -1001,7 +1001,7 @@ void LibPage::InsertLib()
                             if ( bRemove )
                             {
                                 // remove listbox entry
-                                SvLBoxEntry* pEntry_ = aLibBox.FindEntry( aLibName );
+                                SvTreeListEntry* pEntry_ = aLibBox.FindEntry( aLibName );
                                 if ( pEntry_ )
                                     aLibBox.SvTreeListBox::GetModel()->Remove( pEntry_ );
 
@@ -1141,7 +1141,7 @@ void LibPage::InsertLib()
                         }
                     }
 
-                    SvLBoxEntry* pFirstNew = aLibBox.GetEntry( nNewPos );
+                    SvTreeListEntry* pFirstNew = aLibBox.GetEntry( nNewPos );
                     if ( pFirstNew )
                         aLibBox.SetCurEntry( pFirstNew );
                 }
@@ -1158,7 +1158,7 @@ void LibPage::InsertLib()
 
 void LibPage::Export( void )
 {
-    SvLBoxEntry* pCurEntry = aLibBox.GetCurEntry();
+    SvTreeListEntry* pCurEntry = aLibBox.GetCurEntry();
     String aLibName( aLibBox.GetEntryText( pCurEntry, 0 ) );
 
     // Password verification
@@ -1417,7 +1417,7 @@ void LibPage::ExportAsBasic( const String& aLibName )
 
 void LibPage::DeleteCurrent()
 {
-    SvLBoxEntry* pCurEntry = aLibBox.GetCurEntry();
+    SvTreeListEntry* pCurEntry = aLibBox.GetCurEntry();
     String aLibName( aLibBox.GetEntryText( pCurEntry, 0 ) );
 
     // check, if library is link
@@ -1518,7 +1518,7 @@ void LibPage::SetCurLib()
                     ImpInsertLibEntry( aLibName, i );
             }
 
-            SvLBoxEntry* pEntry_ = aLibBox.FindEntry( OUString( "Standard" ) );
+            SvTreeListEntry* pEntry_ = aLibBox.FindEntry( OUString( "Standard" ) );
             if ( !pEntry_ )
                 pEntry_ = aLibBox.GetEntry( 0 );
             aLibBox.SetCurEntry( pEntry_ );
@@ -1528,7 +1528,7 @@ void LibPage::SetCurLib()
 
 //----------------------------------------------------------------------------
 
-SvLBoxEntry* LibPage::ImpInsertLibEntry( const String& rLibName, sal_uLong nPos )
+SvTreeListEntry* LibPage::ImpInsertLibEntry( const String& rLibName, sal_uLong nPos )
 {
     // check, if library is password protected
     bool bProtected = false;
@@ -1543,7 +1543,7 @@ SvLBoxEntry* LibPage::ImpInsertLibEntry( const String& rLibName, sal_uLong nPos
         }
     }
 
-    SvLBoxEntry* pNewEntry = aLibBox.DoInsertEntry( rLibName, nPos );
+    SvTreeListEntry* pNewEntry = aLibBox.DoInsertEntry( rLibName, nPos );
     pNewEntry->SetUserData( new LibUserData(m_aCurDocument) );
 
     if (bProtected)
@@ -1620,7 +1620,7 @@ void createLibImpl( Window* pWin, const ScriptDocument& rDocument,
 
                 if( pLibBox )
                 {
-                    SvLBoxEntry* pEntry = pLibBox->DoInsertEntry( aLibName );
+                    SvTreeListEntry* pEntry = pLibBox->DoInsertEntry( aLibName );
                     pEntry->SetUserData( new LibUserData( rDocument ) );
                     pLibBox->SetCurEntry( pEntry );
                 }
@@ -1638,8 +1638,8 @@ void createLibImpl( Window* pWin, const ScriptDocument& rDocument,
 
                 if( pBasicBox )
                 {
-                    SvLBoxEntry* pEntry = pBasicBox->GetCurEntry();
-                    SvLBoxEntry* pRootEntry = NULL;
+                    SvTreeListEntry* pEntry = pBasicBox->GetCurEntry();
+                    SvTreeListEntry* pRootEntry = NULL;
                     while( pEntry )
                     {
                         pRootEntry = pEntry;
@@ -1649,7 +1649,7 @@ void createLibImpl( Window* pWin, const ScriptDocument& rDocument,
                     sal_uInt16 nMode = pBasicBox->GetMode();
                     bool bDlgMode = ( nMode & BROWSEMODE_DIALOGS ) && !( nMode & BROWSEMODE_MODULES );
                     sal_uInt16 nId = bDlgMode ? RID_IMG_DLGLIB : RID_IMG_MODLIB;
-                    SvLBoxEntry* pNewLibEntry = pBasicBox->AddEntry(
+                    SvTreeListEntry* pNewLibEntry = pBasicBox->AddEntry(
                         aLibName,
                         Image( IDEResId( nId ) ),
                         pRootEntry, false,
@@ -1659,7 +1659,7 @@ void createLibImpl( Window* pWin, const ScriptDocument& rDocument,
 
                     if( pNewLibEntry )
                     {
-                        SvLBoxEntry* pEntry_ = pBasicBox->AddEntry(
+                        SvTreeListEntry* pEntry_ = pBasicBox->AddEntry(
                             aModName,
                             Image( IDEResId( RID_IMG_MODULE ) ),
                             pNewLibEntry, false,
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index 337063dc4b7f..cfbea3e86b0e 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -59,7 +59,7 @@ ExtTreeListBox::ExtTreeListBox (Window* pParent, ResId const& rRes) :
 ExtTreeListBox::~ExtTreeListBox ()
 { }
 
-sal_Bool ExtTreeListBox::EditingEntry( SvLBoxEntry* pEntry, Selection& )
+sal_Bool ExtTreeListBox::EditingEntry( SvTreeListEntry* pEntry, Selection& )
 {
     bool bRet = false;
 
@@ -85,7 +85,7 @@ sal_Bool ExtTreeListBox::EditingEntry( SvLBoxEntry* pEntry, Selection& )
     return bRet;
 }
 
-sal_Bool ExtTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const OUString& rNewText )
+sal_Bool ExtTreeListBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText )
 {
     if ( !IsValidSbxName(rNewText) )
     {
@@ -133,7 +133,7 @@ sal_Bool ExtTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const OUString& rNewT
 }
 
 
-DragDropMode ExtTreeListBox::NotifyStartDrag( TransferDataContainer&, SvLBoxEntry* pEntry )
+DragDropMode ExtTreeListBox::NotifyStartDrag( TransferDataContainer&, SvTreeListEntry* pEntry )
 {
     DragDropMode nMode_ = SV_DRAGDROP_NONE;
 
@@ -173,14 +173,14 @@ DragDropMode ExtTreeListBox::NotifyStartDrag( TransferDataContainer&, SvLBoxEntr
 }
 
 
-sal_Bool ExtTreeListBox::NotifyAcceptDrop( SvLBoxEntry* pEntry )
+sal_Bool ExtTreeListBox::NotifyAcceptDrop( SvTreeListEntry* pEntry )
 {
     // don't drop on a BasicManager (nDepth == 0)
     sal_uInt16 nDepth = pEntry ? GetModel()->GetDepth( pEntry ) : 0;
     bool bValid = nDepth != 0;
 
     // don't drop in the same library
-    SvLBoxEntry* pSelected = FirstSelected();
+    SvTreeListEntry* pSelected = FirstSelected();
     if ( ( nDepth == 1 ) && ( pEntry == GetParent( pSelected ) ) )
         bValid = false;
     else if ( ( nDepth == 2 ) && ( GetParent( pEntry ) == GetParent( pSelected ) ) )
@@ -237,15 +237,15 @@ sal_Bool ExtTreeListBox::NotifyAcceptDrop( SvLBoxEntry* pEntry )
     return bValid;
 }
 
-sal_Bool ExtTreeListBox::NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
-                        SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos )
+sal_Bool ExtTreeListBox::NotifyMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry,
+                        SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos )
 {
     return NotifyCopyingMoving( pTarget, pEntry,
                                     rpNewParent, rNewChildPos, true );
 }
 
-sal_Bool ExtTreeListBox::NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
-                        SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos )
+sal_Bool ExtTreeListBox::NotifyCopying( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry,
+                        SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos )
 {
 //  return false;   // how do I copy an SBX?!
     return NotifyCopyingMoving( pTarget, pEntry,
@@ -311,8 +311,8 @@ void Shell::CopyDialogResources(
 }
 
 
-sal_Bool ExtTreeListBox::NotifyCopyingMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
-                        SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos, sal_Bool bMove )
+sal_Bool ExtTreeListBox::NotifyCopyingMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry,
+                        SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos, sal_Bool bMove )
 {
     (void)pEntry;
     DBG_ASSERT( pEntry, "Kein Eintrag?" );  // ASS is ok here, should not be reached
@@ -606,7 +606,7 @@ void ObjectPage::DeactivatePage()
 void ObjectPage::CheckButtons()
 {
     // enable/disable edit button
-    SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry();
+    SvTreeListEntry* pCurEntry = aBasicBox.GetCurEntry();
     EntryDescriptor aDesc = aBasicBox.GetEntryDescriptor(pCurEntry);
     ScriptDocument aDocument( aDesc.GetDocument() );
     OUString aLibName( aDesc.GetLibName() );
@@ -679,7 +679,7 @@ IMPL_LINK( ObjectPage, ButtonHdl, Button *, pButton )
         SFX_APP()->ExecuteSlot( aRequest );
 
         SfxDispatcher* pDispatcher = GetDispatcher();
-        SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry();
+        SvTreeListEntry* pCurEntry = aBasicBox.GetCurEntry();
         DBG_ASSERT( pCurEntry, "Entry?!" );
         if ( aBasicBox.GetModel()->GetDepth( pCurEntry ) >= 2 )
         {
@@ -702,7 +702,7 @@ IMPL_LINK( ObjectPage, ButtonHdl, Button *, pButton )
         {
             DBG_ASSERT( aBasicBox.GetModel()->GetDepth( pCurEntry ) == 1, "Kein LibEntry?!" );
             ScriptDocument aDocument( ScriptDocument::getApplicationScriptDocument() );
-            SvLBoxEntry* pParentEntry = aBasicBox.GetParent( pCurEntry );
+            SvTreeListEntry* pParentEntry = aBasicBox.GetParent( pCurEntry );
             if ( pParentEntry )
             {
                 DocumentEntry* pDocumentEntry = (DocumentEntry*)pParentEntry->GetUserData();
@@ -735,7 +735,7 @@ bool ObjectPage::GetSelection( ScriptDocument& rDocument, OUString& rLibName )
 {
     bool bRet = false;
 
-    SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry();
+    SvTreeListEntry* pCurEntry = aBasicBox.GetCurEntry();
     EntryDescriptor aDesc = aBasicBox.GetEntryDescriptor(pCurEntry);
     rDocument = aDesc.GetDocument();
     rLibName = aDesc.GetLibName();
@@ -827,18 +827,18 @@ void ObjectPage::NewDialog()
                     pDispatcher->Execute( SID_BASICIDE_SBXINSERTED,
                                             SFX_CALLMODE_SYNCHRON, &aSbxItem, 0L );
                 LibraryLocation eLocation = aDocument.getLibraryLocation( aLibName );
-                SvLBoxEntry* pRootEntry = aBasicBox.FindRootEntry( aDocument, eLocation );
+                SvTreeListEntry* pRootEntry = aBasicBox.FindRootEntry( aDocument, eLocation );
                 if ( pRootEntry )
                 {
                     if ( !aBasicBox.IsExpanded( pRootEntry ) )
                         aBasicBox.Expand( pRootEntry );
-                    SvLBoxEntry* pLibEntry = aBasicBox.FindEntry( pRootEntry, aLibName, OBJ_TYPE_LIBRARY );
+                    SvTreeListEntry* pLibEntry = aBasicBox.FindEntry( pRootEntry, aLibName, OBJ_TYPE_LIBRARY );
                     DBG_ASSERT( pLibEntry, "Libeintrag nicht gefunden!" );
                     if ( pLibEntry )
                     {
                         if ( !aBasicBox.IsExpanded( pLibEntry ) )
                             aBasicBox.Expand( pLibEntry );
-                        SvLBoxEntry* pEntry = aBasicBox.FindEntry( pLibEntry, aDlgName, OBJ_TYPE_DIALOG );
+                        SvTreeListEntry* pEntry = aBasicBox.FindEntry( pLibEntry, aDlgName, OBJ_TYPE_DIALOG );
                         if ( !pEntry )
                         {
                             SAL_WNODEPRECATED_DECLARATIONS_PUSH
@@ -862,7 +862,7 @@ void ObjectPage::NewDialog()
 
 void ObjectPage::DeleteCurrent()
 {
-    SvLBoxEntry* pCurEntry = aBasicBox.GetCurEntry();
+    SvTreeListEntry* pCurEntry = aBasicBox.GetCurEntry();
     DBG_ASSERT( pCurEntry, "Kein aktueller Eintrag!" );
     EntryDescriptor aDesc( aBasicBox.GetEntryDescriptor( pCurEntry ) );
     ScriptDocument aDocument( aDesc.GetDocument() );
@@ -981,22 +981,22 @@ SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument,
                 pDispatcher->Execute( SID_BASICIDE_SBXINSERTED,
                                       SFX_CALLMODE_SYNCHRON, &aSbxItem, 0L );
             LibraryLocation eLocation = rDocument.getLibraryLocation( aLibName );
-            SvLBoxEntry* pRootEntry = rBasicBox.FindRootEntry( rDocument, eLocation );
+            SvTreeListEntry* pRootEntry = rBasicBox.FindRootEntry( rDocument, eLocation );
             if ( pRootEntry )
             {
                 if ( !rBasicBox.IsExpanded( pRootEntry ) )
                     rBasicBox.Expand( pRootEntry );
-                SvLBoxEntry* pLibEntry = rBasicBox.FindEntry( pRootEntry, aLibName, OBJ_TYPE_LIBRARY );
+                SvTreeListEntry* pLibEntry = rBasicBox.FindEntry( pRootEntry, aLibName, OBJ_TYPE_LIBRARY );
                 DBG_ASSERT( pLibEntry, "Libeintrag nicht gefunden!" );
                 if ( pLibEntry )
                 {
                     if ( !rBasicBox.IsExpanded( pLibEntry ) )
                         rBasicBox.Expand( pLibEntry );
-                    SvLBoxEntry* pSubRootEntry = pLibEntry;
+                    SvTreeListEntry* pSubRootEntry = pLibEntry;
                     if( pBasic && rDocument.isInVBAMode() )
                     {
                         // add the new module in the "Modules" entry
-                        SvLBoxEntry* pLibSubEntry = rBasicBox.FindEntry( pLibEntry, IDE_RESSTR(RID_STR_NORMAL_MODULES) , OBJ_TYPE_NORMAL_MODULES );
+                        SvTreeListEntry* pLibSubEntry = rBasicBox.FindEntry( pLibEntry, IDE_RESSTR(RID_STR_NORMAL_MODULES) , OBJ_TYPE_NORMAL_MODULES );
                         if( pLibSubEntry )
                         {
                             if( !rBasicBox.IsExpanded( pLibSubEntry ) )
@@ -1005,7 +1005,7 @@ SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument,
                         }
                     }
 
-                    SvLBoxEntry* pEntry = rBasicBox.FindEntry( pSubRootEntry, aModName, OBJ_TYPE_MODULE );
+                    SvTreeListEntry* pEntry = rBasicBox.FindEntry( pSubRootEntry, aModName, OBJ_TYPE_MODULE );
                     if ( !pEntry )
                     {
                         SAL_WNODEPRECATED_DECLARATIONS_PUSH
diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx
index 1179a9cc839e..156f0ad66058 100644
--- a/basctl/source/basicide/moduldlg.hxx
+++ b/basctl/source/basicide/moduldlg.hxx
@@ -104,18 +104,18 @@ public:
 class ExtTreeListBox : public TreeListBox
 {
 protected:
-    virtual sal_Bool    EditingEntry( SvLBoxEntry* pEntry, Selection& rSel  );
-    virtual sal_Bool    EditedEntry( SvLBoxEntry* pEntry, const OUString& rNewText );
+    virtual sal_Bool    EditingEntry( SvTreeListEntry* pEntry, Selection& rSel  );
+    virtual sal_Bool    EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText );
 
-    virtual DragDropMode    NotifyStartDrag( TransferDataContainer& rData, SvLBoxEntry* pEntry );
-    virtual sal_Bool            NotifyAcceptDrop( SvLBoxEntry* pEntry );
+    virtual DragDropMode    NotifyStartDrag( TransferDataContainer& rData, SvTreeListEntry* pEntry );
+    virtual sal_Bool            NotifyAcceptDrop( SvTreeListEntry* pEntry );
 
-    virtual sal_Bool    NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
-                        SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos );
-    virtual sal_Bool    NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
-                        SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos );
-    sal_Bool            NotifyCopyingMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry,
-                        SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos, sal_Bool bMove );
+    virtual sal_Bool    NotifyMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry,
+                        SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos );
+    virtual sal_Bool    NotifyCopying( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry,
+                        SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos );
+    sal_Bool            NotifyCopyingMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry,
+                        SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos, sal_Bool bMove );
 
 public:
     ExtTreeListBox( Window* pParent, const ResId& rRes );
@@ -134,15 +134,15 @@ public:
     CheckBox( Window* pParent, const ResId& rResId );
     ~CheckBox();
 
-    SvLBoxEntry*    DoInsertEntry( const String& rStr, sal_uLong nPos = LISTBOX_APPEND );
-    SvLBoxEntry*    FindEntry( const String& rName );
+    SvTreeListEntry*    DoInsertEntry( const String& rStr, sal_uLong nPos = LISTBOX_APPEND );
+    SvTreeListEntry*    FindEntry( const String& rName );
 
     void            CheckEntryPos( sal_uLong nPos );
     bool            IsChecked( sal_uLong nPos ) const;
 
-    virtual void    InitEntry( SvLBoxEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind eButtonKind );
-    virtual sal_Bool    EditingEntry( SvLBoxEntry* pEntry, Selection& rSel );
-    virtual sal_Bool    EditedEntry( SvLBoxEntry* pEntry, const OUString& rNewText );
+    virtual void    InitEntry( SvTreeListEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind eButtonKind );
+    virtual sal_Bool    EditingEntry( SvTreeListEntry* pEntry, Selection& rSel );
+    virtual sal_Bool    EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText );
 
     void            SetDocument( const ScriptDocument& rDocument ) { m_aDocument = rDocument; }
 
@@ -259,7 +259,7 @@ protected:
     void                FillListBox();
     void                InsertListBoxEntry( const ScriptDocument& rDocument, LibraryLocation eLocation );
     void                SetCurLib();
-    SvLBoxEntry*        ImpInsertLibEntry( const String& rLibName, sal_uLong nPos );
+    SvTreeListEntry*        ImpInsertLibEntry( const String& rLibName, sal_uLong nPos );
     virtual void        ActivatePage();
     virtual void        DeactivatePage();