Merge SvListEntry and SvLBoxEntry into SvTreeListEntry.

Change-Id: I89cfc8c1288c00674fe64e791c149743d377d5ee

5 files changed, 121 insertions, 121 deletions

diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 1bfbfd48853f..0d6eb9e4a5ab 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -622,18 +622,18 @@ static long AccCfgTabs[] =
 class SfxAccCfgLBoxString_Impl : public SvLBoxString
 {
     public:
-    SfxAccCfgLBoxString_Impl(      SvLBoxEntry* pEntry,
+    SfxAccCfgLBoxString_Impl(      SvTreeListEntry* pEntry,
                                    sal_uInt16       nFlags,
                              const String&      sText );
 
     virtual ~SfxAccCfgLBoxString_Impl();
 
     virtual void Paint(
-        const Point& aPos, SvTreeListBox& rDevice, sal_uInt16 nFlags, SvLBoxEntry* pEntry);
+        const Point& aPos, SvTreeListBox& rDevice, sal_uInt16 nFlags, SvTreeListEntry* pEntry);
 };
 
 //-----------------------------------------------
-SfxAccCfgLBoxString_Impl::SfxAccCfgLBoxString_Impl(      SvLBoxEntry* pEntry,
+SfxAccCfgLBoxString_Impl::SfxAccCfgLBoxString_Impl(      SvTreeListEntry* pEntry,
                                                          sal_uInt16       nFlags,
                                                    const String&      sText )
         : SvLBoxString(pEntry, nFlags, sText)
@@ -646,7 +646,7 @@ SfxAccCfgLBoxString_Impl::~SfxAccCfgLBoxString_Impl()
 }
 
 void SfxAccCfgLBoxString_Impl::Paint(
-    const Point& aPos, SvTreeListBox& rDevice, sal_uInt16 /*nFlags*/, SvLBoxEntry* pEntry)
+    const Point& aPos, SvTreeListBox& rDevice, sal_uInt16 /*nFlags*/, SvTreeListEntry* pEntry)
 {
     if (!pEntry)
         return;
@@ -663,7 +663,7 @@ void SfxAccCfgLBoxString_Impl::Paint(
 }
 
 //-----------------------------------------------
-void SfxAccCfgTabListBox_Impl::InitEntry(      SvLBoxEntry* pEntry ,
+void SfxAccCfgTabListBox_Impl::InitEntry(      SvTreeListEntry* pEntry ,
                                          const XubString&   sText  ,
                                          const Image&       aImage1,
                                          const Image&       aImage2,
@@ -692,7 +692,7 @@ void SfxAccCfgTabListBox_Impl::KeyInput(const KeyEvent& aKey)
         (nCode1 != KEY_PAGEDOWN)
        )
     {
-        SvLBoxEntry* pEntry = First();
+        SvTreeListEntry* pEntry = First();
         while (pEntry)
         {
             TAccInfo* pUserData = (TAccInfo*)pEntry->GetUserData();
@@ -798,7 +798,7 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( Window* pParent, const SfxIt
 SfxAcceleratorConfigPage::~SfxAcceleratorConfigPage()
 {
     // free memory - remove all dynamic user data
-    SvLBoxEntry* pEntry = aEntriesBox.First();
+    SvTreeListEntry* pEntry = aEntriesBox.First();
     while (pEntry)
     {
         TAccInfo* pUserData = (TAccInfo*)pEntry->GetUserData();
@@ -876,7 +876,7 @@ void SfxAcceleratorConfigPage::InitAccCfg()
     This is needed as we have to paint disabled entries by ourself. No support for that in the
     original SvTabListBox!
   */
-void SfxAcceleratorConfigPage::CreateCustomItems(      SvLBoxEntry* pEntry,
+void SfxAcceleratorConfigPage::CreateCustomItems(      SvTreeListEntry* pEntry,
                                                  const String&      sCol1 ,
                                                  const String&      sCol2 )
 {
@@ -921,7 +921,7 @@ void SfxAcceleratorConfigPage::Init(const css::uno::Reference< css::ui::XAcceler
         if (!sKey.Len())
             continue;
         TAccInfo*    pEntry   = new TAccInfo(i1, nListPos, aKey);
-        SvLBoxEntry* pLBEntry = aEntriesBox.InsertEntryToColumn(sKey, 0L, LIST_APPEND, 0xFFFF);
+        SvTreeListEntry* pLBEntry = aEntriesBox.InsertEntryToColumn(sKey, 0L, LIST_APPEND, 0xFFFF);
         pLBEntry->SetUserData(pEntry);
     }
 
@@ -944,7 +944,7 @@ void SfxAcceleratorConfigPage::Init(const css::uno::Reference< css::ui::XAcceler
 
         aEntriesBox.SetEntryText(sLabel, nPos, nCol);
 
-        SvLBoxEntry* pLBEntry = aEntriesBox.GetEntry(0, nPos);
+        SvTreeListEntry* pLBEntry = aEntriesBox.GetEntry(0, nPos);
         TAccInfo*    pEntry   = (TAccInfo*)pLBEntry->GetUserData();
 
         pEntry->m_bIsConfigurable = sal_True;
@@ -964,7 +964,7 @@ void SfxAcceleratorConfigPage::Init(const css::uno::Reference< css::ui::XAcceler
             continue;
 
         // Hardcoded function mapped so no ID possible and mark entry as not changeable
-        SvLBoxEntry* pLBEntry = aEntriesBox.GetEntry(0, nPos);
+        SvTreeListEntry* pLBEntry = aEntriesBox.GetEntry(0, nPos);
         TAccInfo*    pEntry   = (TAccInfo*)pLBEntry->GetUserData();
 
         pEntry->m_bIsConfigurable = sal_False;
@@ -981,7 +981,7 @@ void SfxAcceleratorConfigPage::Apply(const css::uno::Reference< css::ui::XAccele
     // Go through the list from the bottom to the top ...
     // because logical accelerator must be preferred instead of
     // physical ones!
-    SvLBoxEntry* pEntry = aEntriesBox.First();
+    SvTreeListEntry* pEntry = aEntriesBox.First();
     while (pEntry)
     {
         TAccInfo*          pUserData = (TAccInfo*)pEntry->GetUserData();
@@ -1115,7 +1115,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox )
         aChangeButton.Enable( sal_False );
 
         // #i36994 First selected can return zero!
-        SvLBoxEntry*    pLBEntry = aEntriesBox.FirstSelected();
+        SvTreeListEntry*    pLBEntry = aEntriesBox.FirstSelected();
         if ( pLBEntry != 0 )
         {
             sal_uInt16          nPos                = (sal_uInt16) aEntriesBox.GetModel()->GetRelPos( pLBEntry );
@@ -1131,14 +1131,14 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox )
 
             // update key box
             aKeyBox.Clear();
-            SvLBoxEntry* pIt = aEntriesBox.First();
+            SvTreeListEntry* pIt = aEntriesBox.First();
             while ( pIt )
             {
                 TAccInfo* pUserData = (TAccInfo*)pIt->GetUserData();
                 if ( pUserData && pUserData->m_sCommand == sPossibleNewCommand )
                 {
                     TAccInfo*    pU1 = new TAccInfo(-1, -1, pUserData->m_aKey);
-                    SvLBoxEntry* pE1 = aKeyBox.InsertEntry( pUserData->m_aKey.GetName(), 0L, sal_True, LIST_APPEND );
+                    SvTreeListEntry* pE1 = aKeyBox.InsertEntry( pUserData->m_aKey.GetName(), 0L, sal_True, LIST_APPEND );
                     pE1->SetUserData(pU1);
                     pE1->EnableChildrenOnDemand( sal_False );
                 }
@@ -1149,10 +1149,10 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox )
     else
     {
         // goto selected "key" entry of the key box
-        SvLBoxEntry* pE2 = 0;
+        SvTreeListEntry* pE2 = 0;
         TAccInfo*    pU2 = 0;
         sal_uInt16       nP2 = LISTBOX_ENTRY_NOTFOUND;
-        SvLBoxEntry* pE3 = 0;
+        SvTreeListEntry* pE3 = 0;
 
         pE2 = aKeyBox.FirstSelected();
         if (pE2)
@@ -1194,7 +1194,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RadioHdl)
      pGroupLBox->Init(m_xSMGR, m_xFrame, m_sModuleLongName);
 
     // pb: #133213# do not select NULL entries
-    SvLBoxEntry* pEntry = aEntriesBox.GetEntry( 0, 0 );
+    SvTreeListEntry* pEntry = aEntriesBox.GetEntry( 0, 0 );
     if ( pEntry )
         aEntriesBox.Select( pEntry );
     pEntry = pGroupLBox->GetEntry( 0, 0 );
@@ -1472,7 +1472,7 @@ void SfxAcceleratorConfigPage::Reset( const SfxItemSet& rSet )
 sal_uInt16 SfxAcceleratorConfigPage::MapKeyCodeToPos(const KeyCode& aKey) const
 {
     sal_uInt16       nCode1 = aKey.GetCode()+aKey.GetModifier();
-    SvLBoxEntry* pEntry = aEntriesBox.First();
+    SvTreeListEntry* pEntry = aEntriesBox.First();
     sal_uInt16       i      = 0;
 
     while (pEntry)
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 50e21ff19710..03ca2fe25865 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1256,7 +1256,7 @@ void MenuSaveInData::Apply(
     SvxConfigEntry* pRootEntry_,
     uno::Reference< container::XIndexContainer >& rMenuBar,
     uno::Reference< lang::XSingleComponentFactory >& rFactory,
-    SvLBoxEntry *pParentEntry )
+    SvTreeListEntry *pParentEntry )
 {
     (void)pRootEntry_;
     (void)pParentEntry;
@@ -1353,14 +1353,14 @@ MenuSaveInData::Reset()
 class PopupPainter : public SvLBoxString
 {
 public:
-    PopupPainter( SvLBoxEntry* pEntry, const String& rStr )
+    PopupPainter( SvTreeListEntry* pEntry, const String& rStr )
         : SvLBoxString( pEntry, 0, rStr )
     { }
 
     ~PopupPainter() { }
 
     void Paint( const Point& rPos, SvTreeListBox& rOutDev,
-        sal_uInt16 nViewDataEntryFlags, SvLBoxEntry* pEntry )
+        sal_uInt16 nViewDataEntryFlags, SvTreeListEntry* pEntry )
     {
         SvLBoxString::Paint( rPos, rOutDev, nViewDataEntryFlags, pEntry );
 
@@ -1438,7 +1438,7 @@ SvxMenuEntriesListBox::~SvxMenuEntriesListBox()
 
 // drag and drop support
 DragDropMode SvxMenuEntriesListBox::NotifyStartDrag(
-    TransferDataContainer& aTransferDataContainer, SvLBoxEntry* pEntry )
+    TransferDataContainer& aTransferDataContainer, SvTreeListEntry* pEntry )
 {
     (void)aTransferDataContainer;
     (void)pEntry;
@@ -1470,14 +1470,14 @@ sal_Int8 SvxMenuEntriesListBox::AcceptDrop( const AcceptDropEvent& rEvt )
     return SvTreeListBox::AcceptDrop( aNewAcceptDropEvent );
 }
 
-sal_Bool SvxMenuEntriesListBox::NotifyAcceptDrop( SvLBoxEntry* )
+sal_Bool SvxMenuEntriesListBox::NotifyAcceptDrop( SvTreeListEntry* )
 {
     return sal_True;
 }
 
 sal_Bool SvxMenuEntriesListBox::NotifyMoving(
-    SvLBoxEntry* pTarget, SvLBoxEntry* pSource,
-    SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos)
+    SvTreeListEntry* pTarget, SvTreeListEntry* pSource,
+    SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos)
 {
     // only try to do a move if we are dragging within the list box
     if ( m_bIsInternalDrag )
@@ -1500,8 +1500,8 @@ sal_Bool SvxMenuEntriesListBox::NotifyMoving(
 }
 
 sal_Bool SvxMenuEntriesListBox::NotifyCopying(
-    SvLBoxEntry* pTarget, SvLBoxEntry* pSource,
-    SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos)
+    SvTreeListEntry* pTarget, SvTreeListEntry* pSource,
+    SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos)
 {
     (void)pSource;
     (void)rpNewParent;
@@ -2063,8 +2063,8 @@ SvxEntries* SvxConfigPage::FindParentForChild(
     return NULL;
 }
 
-SvLBoxEntry* SvxConfigPage::AddFunction(
-    SvLBoxEntry* pTarget, bool bFront, bool bAllowDuplicates )
+SvTreeListEntry* SvxConfigPage::AddFunction(
+    SvTreeListEntry* pTarget, bool bFront, bool bAllowDuplicates )
 {
     String aDisplayName = pSelectorDlg->GetSelectedDisplayName();
     String aHelpText = pSelectorDlg->GetSelectedHelpText();
@@ -2106,16 +2106,16 @@ SvLBoxEntry* SvxConfigPage::AddFunction(
     return InsertEntry( pNewEntryData, pTarget, bFront );
 }
 
-SvLBoxEntry* SvxConfigPage::InsertEntry(
+SvTreeListEntry* SvxConfigPage::InsertEntry(
     SvxConfigEntry* pNewEntryData,
-    SvLBoxEntry* pTarget,
+    SvTreeListEntry* pTarget,
     bool bFront )
 {
     // Grab the entries list for the currently selected menu
     SvxEntries* pEntries = GetTopLevelSelection()->GetEntries();
 
-    SvLBoxEntry* pNewEntry = NULL;
-    SvLBoxEntry* pCurEntry =
+    SvTreeListEntry* pNewEntry = NULL;
+    SvTreeListEntry* pCurEntry =
         pTarget != NULL ? pTarget : aContentsListBox->GetCurEntry();
 
     if ( bFront )
@@ -2166,10 +2166,10 @@ SvLBoxEntry* SvxConfigPage::InsertEntry(
     return pNewEntry;
 }
 
-SvLBoxEntry* SvxConfigPage::InsertEntryIntoUI(
+SvTreeListEntry* SvxConfigPage::InsertEntryIntoUI(
     SvxConfigEntry* pNewEntryData, sal_uLong nPos )
 {
-    SvLBoxEntry* pNewEntry = NULL;
+    SvTreeListEntry* pNewEntry = NULL;
 
     if (pNewEntryData->IsSeparator())
     {
@@ -2227,9 +2227,9 @@ IMPL_LINK( SvxConfigPage, MoveHdl, Button *, pButton )
 
 void SvxConfigPage::MoveEntry( bool bMoveUp )
 {
-    SvLBoxEntry *pSourceEntry = aContentsListBox->FirstSelected();
-    SvLBoxEntry *pTargetEntry = NULL;
-    SvLBoxEntry *pToSelect = NULL;
+    SvTreeListEntry *pSourceEntry = aContentsListBox->FirstSelected();
+    SvTreeListEntry *pTargetEntry = NULL;
+    SvTreeListEntry *pToSelect = NULL;
 
     if ( !pSourceEntry )
     {
@@ -2260,7 +2260,7 @@ void SvxConfigPage::MoveEntry( bool bMoveUp )
 }
 
 bool SvxConfigPage::MoveEntryData(
-    SvLBoxEntry* pSourceEntry, SvLBoxEntry* pTargetEntry )
+    SvTreeListEntry* pSourceEntry, SvTreeListEntry* pTargetEntry )
 {
     //modified by shizhoubo for issue53677
     if ( NULL == pSourceEntry || NULL == pTargetEntry )
@@ -2400,7 +2400,7 @@ void SvxMenuConfigPage::UpdateButtonStates()
     PopupMenu* pPopup = aModifyCommandButton.GetPopupMenu();
 
     // Disable Up and Down buttons depending on current selection
-    SvLBoxEntry* selection = aContentsListBox->GetCurEntry();
+    SvTreeListEntry* selection = aContentsListBox->GetCurEntry();
 
     if ( aContentsListBox->GetEntryCount() == 0 || selection == NULL )
     {
@@ -2416,8 +2416,8 @@ void SvxMenuConfigPage::UpdateButtonStates()
         return;
     }
 
-    SvLBoxEntry* first = aContentsListBox->First();
-    SvLBoxEntry* last = aContentsListBox->Last();
+    SvTreeListEntry* first = aContentsListBox->First();
+    SvTreeListEntry* last = aContentsListBox->Last();
 
     aMoveUpButton.Enable( selection != first );
     aMoveDownButton.Enable( selection != last );
@@ -2460,7 +2460,7 @@ void SvxMenuConfigPage::DeleteSelectedTopLevel()
 
 bool SvxMenuConfigPage::DeleteSelectedContent()
 {
-    SvLBoxEntry *pActEntry = aContentsListBox->FirstSelected();
+    SvTreeListEntry *pActEntry = aContentsListBox->FirstSelected();
 
     if ( pActEntry != NULL )
     {
@@ -2651,7 +2651,7 @@ IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton )
         }
         case ID_RENAME:
         {
-            SvLBoxEntry* pActEntry = aContentsListBox->GetCurEntry();
+            SvTreeListEntry* pActEntry = aContentsListBox->GetCurEntry();
             SvxConfigEntry* pEntry =
                 (SvxConfigEntry*) pActEntry->GetUserData();
 
@@ -2782,7 +2782,7 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog(
     if ( entries != NULL )
     {
         SvxConfigEntry* pEntry;
-        SvLBoxEntry* pLBEntry;
+        SvTreeListEntry* pLBEntry;
 
         pEntries = new SvxEntries();
         SvxEntries::const_iterator iter = entries->begin();
@@ -2911,9 +2911,9 @@ IMPL_LINK( SvxMainMenuOrganizerDialog, SelectHdl, Control*, pCtrl )
 void SvxMainMenuOrganizerDialog::UpdateButtonStates()
 {
     // Disable Up and Down buttons depending on current selection
-    SvLBoxEntry* selection = aMenuListBox.GetCurEntry();
-    SvLBoxEntry* first = aMenuListBox.First();
-    SvLBoxEntry* last = aMenuListBox.Last();
+    SvTreeListEntry* selection = aMenuListBox.GetCurEntry();
+    SvTreeListEntry* first = aMenuListBox.First();
+    SvTreeListEntry* last = aMenuListBox.Last();
 
     aMoveUpButton.Enable( selection != first );
     aMoveDownButton.Enable( selection != last );
@@ -2921,8 +2921,8 @@ void SvxMainMenuOrganizerDialog::UpdateButtonStates()
 
 IMPL_LINK( SvxMainMenuOrganizerDialog, MoveHdl, Button *, pButton )
 {
-    SvLBoxEntry *pSourceEntry = aMenuListBox.FirstSelected();
-    SvLBoxEntry *pTargetEntry = NULL;
+    SvTreeListEntry *pSourceEntry = aMenuListBox.FirstSelected();
+    SvTreeListEntry *pTargetEntry = NULL;
 
     if ( !pSourceEntry )
     {
@@ -3205,7 +3205,7 @@ void SvxToolbarConfigPage::DeleteSelectedTopLevel()
 
 bool SvxToolbarConfigPage::DeleteSelectedContent()
 {
-    SvLBoxEntry *pActEntry = aContentsListBox->FirstSelected();
+    SvTreeListEntry *pActEntry = aContentsListBox->FirstSelected();
 
     if ( pActEntry != NULL )
     {
@@ -3375,7 +3375,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton )
     {
         case ID_RENAME:
         {
-            SvLBoxEntry* pActEntry = aContentsListBox->GetCurEntry();
+            SvTreeListEntry* pActEntry = aContentsListBox->GetCurEntry();
             SvxConfigEntry* pEntry =
                 (SvxConfigEntry*) pActEntry->GetUserData();
 
@@ -3402,7 +3402,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton )
         }
         case ID_DEFAULT_COMMAND:
         {
-            SvLBoxEntry* pActEntry = aContentsListBox->GetCurEntry();
+            SvTreeListEntry* pActEntry = aContentsListBox->GetCurEntry();
             SvxConfigEntry* pEntry =
                 (SvxConfigEntry*) pActEntry->GetUserData();
 
@@ -3449,7 +3449,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton )
 
                 aContentsListBox->GetModel()->Remove( pActEntry );
 
-                SvLBoxEntry* pNewLBEntry =
+                SvTreeListEntry* pNewLBEntry =
                     InsertEntryIntoUI( pEntry, nSelectionPos );
 
                 aContentsListBox->SetCheckButtonState( pNewLBEntry,
@@ -3472,7 +3472,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton )
             SvxConfigEntry* pNewEntryData = new SvxConfigEntry;
             pNewEntryData->SetUserDefined( sal_True );
 
-            SvLBoxEntry* pNewLBEntry = InsertEntry( pNewEntryData );
+            SvTreeListEntry* pNewLBEntry = InsertEntry( pNewEntryData );
 
             aContentsListBox->SetCheckButtonState(
                 pNewLBEntry, SV_BUTTON_TRISTATE );
@@ -3499,7 +3499,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton )
         }
         case ID_CHANGE_SYMBOL:
         {
-            SvLBoxEntry* pActEntry = aContentsListBox->GetCurEntry();
+            SvTreeListEntry* pActEntry = aContentsListBox->GetCurEntry();
             SvxConfigEntry* pEntry =
                 (SvxConfigEntry*) pActEntry->GetUserData();
 
@@ -3556,7 +3556,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton )
                         Image aImage( newgraphic );
 
                         aContentsListBox->GetModel()->Remove( pActEntry );
-                        SvLBoxEntry* pNewLBEntry =
+                        SvTreeListEntry* pNewLBEntry =
                             InsertEntryIntoUI( pEntry, nSelectionPos );
 
                         aContentsListBox->SetCheckButtonState( pNewLBEntry,
@@ -3582,7 +3582,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton )
         }
         case ID_RESET_SYMBOL:
         {
-            SvLBoxEntry* pActEntry = aContentsListBox->GetCurEntry();
+            SvTreeListEntry* pActEntry = aContentsListBox->GetCurEntry();
             SvxConfigEntry* pEntry =
                 (SvxConfigEntry*) pActEntry->GetUserData();
 
@@ -3616,7 +3616,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton )
                 Image aImage( backup );
                 aContentsListBox->GetModel()->Remove( pActEntry );
 
-                SvLBoxEntry* pNewLBEntry =
+                SvTreeListEntry* pNewLBEntry =
                     InsertEntryIntoUI( pEntry, nSelectionPos );
 
                 aContentsListBox->SetCheckButtonState( pNewLBEntry,
@@ -4525,7 +4525,7 @@ void SvxToolbarConfigPage::UpdateButtonStates()
 
     aDescriptionField.Clear();
 
-    SvLBoxEntry* selection = aContentsListBox->GetCurEntry();
+    SvTreeListEntry* selection = aContentsListBox->GetCurEntry();
     if ( aContentsListBox->GetEntryCount() == 0 || selection == NULL )
     {
         return;
@@ -4621,7 +4621,7 @@ IMPL_LINK( SvxToolbarConfigPage, SelectToolbar, ListBox *, pBox )
     {
         SvxConfigEntry* pEntry = *iter;
 
-        SvLBoxEntry* pNewLBEntry = InsertEntryIntoUI( pEntry );
+        SvTreeListEntry* pNewLBEntry = InsertEntryIntoUI( pEntry );
 
         if (pEntry->IsBinding())
         {
@@ -4741,10 +4741,10 @@ IMPL_LINK( SvxToolbarConfigPage, AddFunctionHdl,
     return 0;
 }
 
-SvLBoxEntry* SvxToolbarConfigPage::AddFunction(
-    SvLBoxEntry* pTarget, bool bFront, bool bAllowDuplicates )
+SvTreeListEntry* SvxToolbarConfigPage::AddFunction(
+    SvTreeListEntry* pTarget, bool bFront, bool bAllowDuplicates )
 {
-    SvLBoxEntry* pNewLBEntry =
+    SvTreeListEntry* pNewLBEntry =
         SvxConfigPage::AddFunction( pTarget, bFront, bAllowDuplicates );
 
     SvxConfigEntry* pEntry = (SvxConfigEntry*) pNewLBEntry->GetUserData();
@@ -4864,7 +4864,7 @@ void SvxToolbarEntriesListBox::DataChanged( const DataChangedEvent& rDCEvt )
 
 // --------------------------------------------------------
 
-void SvxToolbarEntriesListBox::ChangeVisibility( SvLBoxEntry* pEntry )
+void SvxToolbarEntriesListBox::ChangeVisibility( SvTreeListEntry* pEntry )
 {
     if ( pEntry != NULL )
     {
@@ -4908,8 +4908,8 @@ void SvxToolbarEntriesListBox::KeyInput( const KeyEvent& rKeyEvent )
 }
 
 sal_Bool SvxToolbarEntriesListBox::NotifyMoving(
-    SvLBoxEntry* pTarget, SvLBoxEntry* pSource,
-    SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos)
+    SvTreeListEntry* pTarget, SvTreeListEntry* pSource,
+    SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos)
 {
     bool result = SvxMenuEntriesListBox::NotifyMoving(
         pTarget, pSource, rpNewParent, rNewChildPos );
@@ -4930,9 +4930,9 @@ sal_Bool SvxToolbarEntriesListBox::NotifyMoving(
 }
 
 sal_Bool SvxToolbarEntriesListBox::NotifyCopying(
-    SvLBoxEntry*  pTarget,
-    SvLBoxEntry*  pSource,
-    SvLBoxEntry*& rpNewParent,
+    SvTreeListEntry*  pTarget,
+    SvTreeListEntry*  pSource,
+    SvTreeListEntry*& rpNewParent,
     sal_uLong&      rNewChildPos)
 {
     (void)pSource;
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index b457e5899d93..61db17f448bc 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -320,7 +320,7 @@ void SfxConfigFunctionListBox_Impl::ClearAll()
 
 String SfxConfigFunctionListBox_Impl::GetSelectedScriptURI()
 {
-    SvLBoxEntry *pEntry = FirstSelected();
+    SvTreeListEntry *pEntry = FirstSelected();
     if ( pEntry )
     {
         SfxGroupInfo_Impl *pData = (SfxGroupInfo_Impl*) pEntry->GetUserData();
@@ -332,7 +332,7 @@ String SfxConfigFunctionListBox_Impl::GetSelectedScriptURI()
 
 String SfxConfigFunctionListBox_Impl::GetCurCommand()
 {
-    SvLBoxEntry *pEntry = FirstSelected();
+    SvTreeListEntry *pEntry = FirstSelected();
     if (!pEntry)
         return String();
     SfxGroupInfo_Impl *pData = (SfxGroupInfo_Impl*) pEntry->GetUserData();
@@ -343,7 +343,7 @@ String SfxConfigFunctionListBox_Impl::GetCurCommand()
 
 String SfxConfigFunctionListBox_Impl::GetCurLabel()
 {
-    SvLBoxEntry *pEntry = FirstSelected();
+    SvTreeListEntry *pEntry = FirstSelected();
     if (!pEntry)
         return String();
     SfxGroupInfo_Impl *pData = (SfxGroupInfo_Impl*) pEntry->GetUserData();
@@ -448,7 +448,7 @@ String SfxConfigGroupListBox_Impl::GetGroup()
     Returns the name of the selected function group/the selected basic.
 */
 {
-    SvLBoxEntry *pEntry = FirstSelected();
+    SvTreeListEntry *pEntry = FirstSelected();
     while ( pEntry )
     {
         SfxGroupInfo_Impl *pInfo = (SfxGroupInfo_Impl*) pEntry->GetUserData();
@@ -486,7 +486,7 @@ void SfxConfigGroupListBox_Impl::InitModule()
             catch(const css::container::NoSuchElementException&)
                 { continue; }
 
-            SvLBoxEntry*        pEntry = InsertEntry(sGroupName, NULL);
+            SvTreeListEntry*        pEntry = InsertEntry(sGroupName, NULL);
             SfxGroupInfo_Impl* pInfo   = new SfxGroupInfo_Impl(SFX_CFGGROUP_FUNCTION, rGroupID);
             pEntry->SetUserData(pInfo);
         }
@@ -616,7 +616,7 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
                     static_cast<void *>(rootNode.get()));
 
             String aTitle(pImp->m_sDlgMacros);
-            SvLBoxEntry *pNewEntry = InsertEntry( aTitle, NULL );
+            SvTreeListEntry *pNewEntry = InsertEntry( aTitle, NULL );
             pNewEntry->SetUserData( pInfo );
             pNewEntry->EnableChildrenOnDemand( sal_True );
             aArr.push_back( pInfo );
@@ -687,7 +687,7 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
                                     0, static_cast<void *>( theChild.get()));
 
                             Image aImage = GetImage( theChild, xCtx, bIsRootNode );
-                            SvLBoxEntry* pNewEntry =
+                            SvTreeListEntry* pNewEntry =
                                 InsertEntry( uiName, NULL);
                             SetExpandedEntryBmp(  pNewEntry, aImage );
                             SetCollapsedEntryBmp( pNewEntry, aImage );
@@ -723,7 +723,7 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
     if ( m_xSMGR.is() )
     {
         String sStyle( pImp->m_aStrGroupStyles );
-        SvLBoxEntry *pEntry = InsertEntry( sStyle, 0 );
+        SvTreeListEntry *pEntry = InsertEntry( sStyle, 0 );
         SfxGroupInfo_Impl *pInfo = new SfxGroupInfo_Impl( SFX_CFGGROUP_STYLES, 0, 0 ); // TODO last parameter should contain user data
         aArr.push_back( pInfo );
         pEntry->SetUserData( pInfo );
@@ -866,7 +866,7 @@ void SfxConfigGroupListBox_Impl::GroupSelected()
     All functions/macros are displayed in the functionlistbox.
 */
 {
-    SvLBoxEntry *pEntry = FirstSelected();
+    SvTreeListEntry *pEntry = FirstSelected();
     SfxGroupInfo_Impl *pInfo = (SfxGroupInfo_Impl*) pEntry->GetUserData();
     pFunctionListBox->SetUpdateMode(sal_False);
     pFunctionListBox->ClearAll();
@@ -892,7 +892,7 @@ void SfxConfigGroupListBox_Impl::GroupSelected()
             {
                 const css::frame::DispatchInformation& rInfo      = lCommands[i];
                 ::rtl::OUString                        sUIName    = MapCommand2UIName(rInfo.Command);
-                SvLBoxEntry*                           pFuncEntry = pFunctionListBox->InsertEntry(sUIName, NULL);
+                SvTreeListEntry*                           pFuncEntry = pFunctionListBox->InsertEntry(sUIName, NULL);
                 SfxGroupInfo_Impl*                     pGrpInfo   = new SfxGroupInfo_Impl(SFX_CFGFUNCTION_SLOT, 0);
                 pGrpInfo->sCommand = rInfo.Command;
                 pGrpInfo->sLabel   = sUIName;
@@ -935,7 +935,7 @@ void SfxConfigGroupListBox_Impl::GroupSelected()
                                 SfxGroupInfo_Impl* pGrpInfo = new SfxGroupInfo_Impl( SFX_CFGFUNCTION_SCRIPT, 0, pScriptURI );
 
                                 Image aImage = GetImage( children[n], Reference< XComponentContext >(), sal_False );
-                                SvLBoxEntry* pNewEntry =
+                                SvTreeListEntry* pNewEntry =
                                     pFunctionListBox->InsertEntry( children[n]->getName(), NULL );
                                 pFunctionListBox->SetExpandedEntryBmp( pNewEntry, aImage );
                                 pFunctionListBox->SetCollapsedEntryBmp(pNewEntry, aImage );
@@ -969,7 +969,7 @@ void SfxConfigGroupListBox_Impl::GroupSelected()
                      ++pIt                   )
                 {
                     SfxStyleInfo_Impl* pStyle = new SfxStyleInfo_Impl(*pIt);
-                    SvLBoxEntry* pFuncEntry = pFunctionListBox->InsertEntry( pStyle->sLabel, NULL );
+                    SvTreeListEntry* pFuncEntry = pFunctionListBox->InsertEntry( pStyle->sLabel, NULL );
                     SfxGroupInfo_Impl *pGrpInfo = new SfxGroupInfo_Impl( SFX_CFGGROUP_STYLES, 0, pStyle );
                     pFunctionListBox->aArr.push_back( pGrpInfo );
                     pGrpInfo->sCommand = pStyle->sCommand;
@@ -990,7 +990,7 @@ void SfxConfigGroupListBox_Impl::GroupSelected()
     pFunctionListBox->SetUpdateMode(sal_True);
 }
 
-sal_Bool SfxConfigGroupListBox_Impl::Expand( SvLBoxEntry* pParent )
+sal_Bool SfxConfigGroupListBox_Impl::Expand( SvTreeListEntry* pParent )
 {
     sal_Bool bRet = SvTreeListBox::Expand( pParent );
     if ( bRet )
@@ -1005,7 +1005,7 @@ sal_Bool SfxConfigGroupListBox_Impl::Expand( SvLBoxEntry* pParent )
         }
         else
         {
-            SvLBoxEntry *pEntry = GetFirstEntryInView();
+            SvTreeListEntry *pEntry = GetFirstEntryInView();
             sal_uLong nParentPos = 0;
             while ( pEntry && pEntry != pParent )
             {
@@ -1021,7 +1021,7 @@ sal_Bool SfxConfigGroupListBox_Impl::Expand( SvLBoxEntry* pParent )
     return bRet;
 }
 
-void SfxConfigGroupListBox_Impl::RequestingChildren( SvLBoxEntry *pEntry )
+void SfxConfigGroupListBox_Impl::RequestingChildren( SvTreeListEntry *pEntry )
 /*  Description
     A basic or a library is opened.
 */
@@ -1089,7 +1089,7 @@ void SfxConfigGroupListBox_Impl::RequestingChildren( SvLBoxEntry *pEntry )
                                         0, static_cast<void *>( theChild.get()));
 
                                 Image aImage = GetImage( theChild, Reference< XComponentContext >(), sal_False );
-                                SvLBoxEntry* pNewEntry =
+                                SvTreeListEntry* pNewEntry =
                                     InsertEntry( theChild->getName(), pEntry );
                                 SetExpandedEntryBmp( pNewEntry, aImage );
                                 SetCollapsedEntryBmp(pNewEntry, aImage );
@@ -1133,7 +1133,7 @@ void SfxConfigGroupListBox_Impl::RequestingChildren( SvLBoxEntry *pEntry )
                      ++pIt                          )
                 {
                     SfxStyleInfo_Impl* pFamily = new SfxStyleInfo_Impl(*pIt);
-                    SvLBoxEntry* pStyleEntry = InsertEntry( pFamily->sLabel, pEntry );
+                    SvTreeListEntry* pStyleEntry = InsertEntry( pFamily->sLabel, pEntry );
                     SfxGroupInfo_Impl *pGrpInfo = new SfxGroupInfo_Impl( SFX_CFGGROUP_STYLES, 0, pFamily );
                     aArr.push_back( pGrpInfo );
                     pStyleEntry->SetUserData( pGrpInfo );
@@ -1170,21 +1170,21 @@ void SfxConfigGroupListBox_Impl::SelectMacro( const String& rBasic,
         aModule = rMacro.GetToken( nCount-2, '.' );
     }
 
-    SvLBoxEntry *pEntry = FirstChild(0);
+    SvTreeListEntry *pEntry = FirstChild(0);
     while ( pEntry )
     {
         String aEntryBas = GetEntryText( pEntry );
         if ( aEntryBas == aBasicName )
         {
             Expand( pEntry );
-            SvLBoxEntry *pLib = FirstChild( pEntry );
+            SvTreeListEntry *pLib = FirstChild( pEntry );
             while ( pLib )
             {
                 String aEntryLib = GetEntryText( pLib );
                 if ( aEntryLib == aLib )
                 {
                     Expand( pLib );
-                    SvLBoxEntry *pMod = FirstChild( pLib );
+                    SvTreeListEntry *pMod = FirstChild( pLib );
                     while ( pMod )
                     {
                         String aEntryMod = GetEntryText( pMod );
@@ -1193,7 +1193,7 @@ void SfxConfigGroupListBox_Impl::SelectMacro( const String& rBasic,
                             Expand( pMod );
                             MakeVisible( pMod );
                             Select( pMod );
-                            SvLBoxEntry *pMethod = pFunctionListBox->First();
+                            SvTreeListEntry *pMethod = pFunctionListBox->First();
                             while ( pMethod )
                             {
                                 String aEntryMethod = GetEntryText( pMethod );
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 7aa0c95e3101..2b0e57d2aa71 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -194,7 +194,7 @@ void _HeaderTabListBox::Enable( bool bEnable, bool bChild )
 //     and it is not read only
 void _SvxMacroTabPage::EnableButtons()
 {
-    const SvLBoxEntry* pE = mpImpl->pEventLB->GetListBox().FirstSelected();
+    const SvTreeListEntry* pE = mpImpl->pEventLB->GetListBox().FirstSelected();
     if ( pE )
     {
         SvLBoxString* pEventMacro = (SvLBoxString*)pE->GetItem( LB_MACROS_ITEMPOS );
@@ -222,7 +222,7 @@ _SvxMacroTabPage::~_SvxMacroTabPage()
 {
     // need to delete the user data
     SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox();
-    SvLBoxEntry* pE = rListBox.GetEntry( 0 );
+    SvTreeListEntry* pE = rListBox.GetEntry( 0 );
     while( pE )
     {
         ::rtl::OUString* pEventName = (::rtl::OUString*)pE->GetUserData();
@@ -433,13 +433,13 @@ class IconLBoxString : public SvLBoxString
     int m_nxImageOffset;
 
     public:
-        IconLBoxString( SvLBoxEntry* pEntry, sal_uInt16 nFlags, const String& sText,
+        IconLBoxString( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const String& sText,
             Image* pMacroImg, Image* pComponentImg );
-        virtual void Paint(const Point& aPos, SvTreeListBox& aDevice, sal_uInt16 nFlags, SvLBoxEntry* pEntry );
+        virtual void Paint(const Point& aPos, SvTreeListBox& aDevice, sal_uInt16 nFlags, SvTreeListEntry* pEntry );
 };
 
 
-IconLBoxString::IconLBoxString( SvLBoxEntry* pEntry, sal_uInt16 nFlags, const String& sText,
+IconLBoxString::IconLBoxString( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const String& sText,
     Image* pMacroImg, Image* pComponentImg )
         : SvLBoxString( pEntry, nFlags, sText )
         , m_pMacroImg( pMacroImg )
@@ -450,7 +450,7 @@ IconLBoxString::IconLBoxString( SvLBoxEntry* pEntry, sal_uInt16 nFlags, const St
 
 //===============================================
 void IconLBoxString::Paint( const Point& aPos, SvTreeListBox& aDevice,
-                               sal_uInt16 /*nFlags*/, SvLBoxEntry* /*pEntry*/ )
+                               sal_uInt16 /*nFlags*/, SvTreeListEntry* /*pEntry*/ )
 {
     String aTxt( GetText() );
     if( aTxt.Len() )
@@ -490,7 +490,7 @@ void _SvxMacroTabPage::DisplayAppEvents( bool appEvents)
     SvHeaderTabListBox&        rListBox = mpImpl->pEventLB->GetListBox();
     mpImpl->pEventLB->SetUpdateMode( sal_False );
     rListBox.Clear();
-    SvLBoxEntry*    pE = rListBox.GetEntry( 0 );
+    SvTreeListEntry*    pE = rListBox.GetEntry( 0 );
     EventsHash* eventsHash;
     Reference< container::XNameReplace> nameReplace;
     if(bAppEvents)
@@ -538,7 +538,7 @@ void _SvxMacroTabPage::DisplayAppEvents( bool appEvents)
         String displayName( CUI_RES( displayableEvent->nEventResourceID ) );
 
         displayName += '\t';
-        SvLBoxEntry*    _pE = rListBox.InsertEntry( displayName );
+        SvTreeListEntry*    _pE = rListBox.InsertEntry( displayName );
         ::rtl::OUString* pEventName = new ::rtl::OUString( sEventName );
         _pE->SetUserData( (void*)pEventName );
         String sNew( eventURL );
@@ -565,7 +565,7 @@ IMPL_STATIC_LINK( _SvxMacroTabPage, SelectEvent_Impl, SvTabListBox*, EMPTYARG )
 {
     _SvxMacroTabPage_Impl*    pImpl = pThis->mpImpl;
     SvHeaderTabListBox&        rListBox = pImpl->pEventLB->GetListBox();
-    SvLBoxEntry*            pE = rListBox.FirstSelected();
+    SvTreeListEntry*            pE = rListBox.FirstSelected();
     sal_uLong                    nPos;
 
     if( !pE || LISTBOX_ENTRY_NOTFOUND ==
@@ -594,7 +594,7 @@ long _SvxMacroTabPage::GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton*
 {
     _SvxMacroTabPage_Impl*    pImpl = pThis->mpImpl;
     SvHeaderTabListBox& rListBox = pImpl->pEventLB->GetListBox();
-    SvLBoxEntry* pE = rListBox.FirstSelected();
+    SvTreeListEntry* pE = rListBox.FirstSelected();
     sal_uLong nPos;
     if( !pE || LISTBOX_ENTRY_NOTFOUND ==
         ( nPos = rListBox.GetModel()->GetAbsPos( pE ) ) )
@@ -844,7 +844,7 @@ SvxMacroTabPage::SvxMacroTabPage( Window* pParent, const Reference< frame::XFram
     InitAndSetHandler( xNameReplace, Reference< container::XNameReplace>(0), Reference< util::XModifiable >(0));
     DisplayAppEvents(true);
     SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox();
-    SvLBoxEntry* pE = rListBox.GetEntry( (sal_uLong)nSelectedIndex );
+    SvTreeListEntry* pE = rListBox.GetEntry( (sal_uLong)nSelectedIndex );
     if( pE )
         rListBox.Select(pE);
 }
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index c7424aab776f..9c5cae324a6c 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -89,7 +89,7 @@ SvxConfigFunctionListBox_Impl::~SvxConfigFunctionListBox_Impl()
     ClearAll();
 }
 
-SvLBoxEntry* SvxConfigFunctionListBox_Impl::GetLastSelectedEntry()
+SvTreeListEntry* SvxConfigFunctionListBox_Impl::GetLastSelectedEntry()
 {
     if ( m_pDraggingEntry != NULL )
     {
@@ -120,7 +120,7 @@ IMPL_LINK_NOARG(SvxConfigFunctionListBox_Impl, TimerHdl)
 {
     aTimer.Stop();
     Point aMousePos = GetPointerPosPixel();
-    SvLBoxEntry *pEntry = GetCurEntry();
+    SvTreeListEntry *pEntry = GetCurEntry();
     if ( pEntry && GetEntry( aMousePos ) == pEntry && pCurEntry == pEntry )
         Help::ShowBalloon( this, OutputToScreenPixel( aMousePos ), GetHelpText( pEntry ) );
     return 0L;
@@ -132,7 +132,7 @@ void SvxConfigFunctionListBox_Impl::ClearAll()
     Clear();
 }
 
-String SvxConfigFunctionListBox_Impl::GetHelpText( SvLBoxEntry *pEntry )
+String SvxConfigFunctionListBox_Impl::GetHelpText( SvTreeListEntry *pEntry )
 {
     SvxGroupInfo_Impl *pInfo =
         pEntry ? (SvxGroupInfo_Impl*) pEntry->GetUserData(): 0;
@@ -163,7 +163,7 @@ void SvxConfigFunctionListBox_Impl::FunctionSelected()
 
 // drag and drop support
 DragDropMode SvxConfigFunctionListBox_Impl::NotifyStartDrag(
-    TransferDataContainer& /*aTransferDataContainer*/, SvLBoxEntry* pEntry )
+    TransferDataContainer& /*aTransferDataContainer*/, SvTreeListEntry* pEntry )
 {
     m_pDraggingEntry = pEntry;
     return GetDragDropMode();
@@ -275,7 +275,7 @@ namespace
     }
 }
 
-void SvxConfigGroupListBox_Impl::fillScriptList( const Reference< browse::XBrowseNode >& _rxRootNode, SvLBoxEntry* _pParentEntry, bool _bCheapChildrenOnDemand )
+void SvxConfigGroupListBox_Impl::fillScriptList( const Reference< browse::XBrowseNode >& _rxRootNode, SvTreeListEntry* _pParentEntry, bool _bCheapChildrenOnDemand )
 {
     OSL_PRECOND( _rxRootNode.is(), "SvxConfigGroupListBox_Impl::fillScriptList: invalid root node!" );
     if ( !_rxRootNode.is() )
@@ -340,7 +340,7 @@ void SvxConfigGroupListBox_Impl::fillScriptList( const Reference< browse::XBrows
                 if ( children[n]->getType() == browse::BrowseNodeTypes::SCRIPT )
                     continue;
 
-                SvLBoxEntry* pNewEntry = InsertEntry( sUIName, _pParentEntry );
+                SvTreeListEntry* pNewEntry = InsertEntry( sUIName, _pParentEntry );
 
                 Image aImage = GetImage( theChild, comphelper::getProcessComponentContext(), bIsRootNode );
                 SetExpandedEntryBmp( pNewEntry, aImage );
@@ -475,7 +475,7 @@ void SvxConfigGroupListBox_Impl::Init()
                 {
                 }
 
-                SvLBoxEntry *pEntry = InsertEntry( group, NULL );
+                SvTreeListEntry *pEntry = InsertEntry( group, NULL );
 
                 SvxGroupInfo_Impl *pInfo =
                     new SvxGroupInfo_Impl( SVX_CFGGROUP_FUNCTION, gids[i] );
@@ -510,7 +510,7 @@ void SvxConfigGroupListBox_Impl::Init()
             String aTitle =
                 String( CUI_RES( STR_SELECTOR_MACROS ) );
 
-            SvLBoxEntry *pNewEntry = InsertEntry( aTitle, NULL );
+            SvTreeListEntry *pNewEntry = InsertEntry( aTitle, NULL );
             pNewEntry->SetUserData( pInfo );
             pNewEntry->EnableChildrenOnDemand( sal_True );
             aArr.push_back( pInfo );
@@ -620,7 +620,7 @@ SvxConfigGroupListBox_Impl::getDocumentModel(
 
 void SvxConfigGroupListBox_Impl::GroupSelected()
 {
-    SvLBoxEntry *pEntry = FirstSelected();
+    SvTreeListEntry *pEntry = FirstSelected();
     SvxGroupInfo_Impl *pInfo = (SvxGroupInfo_Impl*) pEntry->GetUserData();
     pFunctionListBox->SetUpdateMode(sal_False);
     pFunctionListBox->ClearAll();
@@ -635,7 +635,7 @@ void SvxConfigGroupListBox_Impl::GroupSelected()
     {
         case SVX_CFGGROUP_FUNCTION :
         {
-            SvLBoxEntry *_pEntry = FirstSelected();
+            SvTreeListEntry *_pEntry = FirstSelected();
             if ( _pEntry != NULL )
             {
                 SvxGroupInfo_Impl *_pInfo =
@@ -697,7 +697,7 @@ void SvxConfigGroupListBox_Impl::GroupSelected()
                         aLabel = commands[i].Command;
                     }
 
-                    SvLBoxEntry* pFuncEntry = NULL;
+                    SvTreeListEntry* pFuncEntry = NULL;
                     if ( !!aImage )
                     {
                         pFuncEntry = pFunctionListBox->InsertEntry(
@@ -764,7 +764,7 @@ void SvxConfigGroupListBox_Impl::GroupSelected()
                                     SVX_CFGFUNCTION_SCRIPT, 123, uri, description );
 
                             Image aImage = GetImage( children[n], Reference< XComponentContext >(), sal_False );
-                            SvLBoxEntry* pNewEntry =
+                            SvTreeListEntry* pNewEntry =
                                 pFunctionListBox->InsertEntry( children[n]->getName(), NULL );
                             pFunctionListBox->SetExpandedEntryBmp( pNewEntry, aImage );
                             pFunctionListBox->SetCollapsedEntryBmp(pNewEntry, aImage );
@@ -796,7 +796,7 @@ void SvxConfigGroupListBox_Impl::GroupSelected()
     pFunctionListBox->SetUpdateMode(sal_True);
 }
 
-sal_Bool SvxConfigGroupListBox_Impl::Expand( SvLBoxEntry* pParent )
+sal_Bool SvxConfigGroupListBox_Impl::Expand( SvTreeListEntry* pParent )
 {
     sal_Bool bRet = SvTreeListBox::Expand( pParent );
     if ( bRet )
@@ -811,7 +811,7 @@ sal_Bool SvxConfigGroupListBox_Impl::Expand( SvLBoxEntry* pParent )
         }
         else
         {
-            SvLBoxEntry *pEntry = GetFirstEntryInView();
+            SvTreeListEntry *pEntry = GetFirstEntryInView();
             sal_uLong nParentPos = 0;
             while ( pEntry && pEntry != pParent )
             {
@@ -827,7 +827,7 @@ sal_Bool SvxConfigGroupListBox_Impl::Expand( SvLBoxEntry* pParent )
     return bRet;
 }
 
-void SvxConfigGroupListBox_Impl::RequestingChildren( SvLBoxEntry *pEntry )
+void SvxConfigGroupListBox_Impl::RequestingChildren( SvTreeListEntry *pEntry )
 {
     SvxGroupInfo_Impl *pInfo = (SvxGroupInfo_Impl*) pEntry->GetUserData();
     pInfo->bWasOpened = sal_True;
@@ -1043,8 +1043,8 @@ IMPL_LINK( SvxScriptSelectorDialog, ClickHdl, Button *, pButton )
         else
         {
             // Select the next entry in the list if possible
-            SvLBoxEntry* current = aCommands.FirstSelected();
-            SvLBoxEntry* next = aCommands.NextSibling( current );
+            SvTreeListEntry* current = aCommands.FirstSelected();
+            SvTreeListEntry* next = aCommands.NextSibling( current );
 
             if ( next != NULL )
             {
@@ -1073,7 +1073,7 @@ SvxScriptSelectorDialog::GetScriptURL() const
 {
     OUString result;
 
-    SvLBoxEntry *pEntry = const_cast< SvxScriptSelectorDialog* >( this )->aCommands.GetLastSelectedEntry();
+    SvTreeListEntry *pEntry = const_cast< SvxScriptSelectorDialog* >( this )->aCommands.GetLastSelectedEntry();
     if ( pEntry )
     {
         SvxGroupInfo_Impl *pData = (SvxGroupInfo_Impl*) pEntry->GetUserData();