Merge SvListEntry and SvLBoxEntry into SvTreeListEntry.

Change-Id: I89cfc8c1288c00674fe64e791c149743d377d5ee

8 files changed, 67 insertions, 67 deletions

diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index b79feb12d2d2..50d0644a0b8e 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -985,7 +985,7 @@ namespace svx
         while( nCnt )
         {
             Reference< XConversionDictionary >  xDict = m_aDictList[ n ];
-            SvLBoxEntry*                        pEntry = m_aDictsLB.SvTreeListBox::GetEntry( n );
+            SvTreeListEntry*                        pEntry = m_aDictsLB.SvTreeListBox::GetEntry( n );
 
             DBG_ASSERT( xDict.is(), "-HangulHanjaOptionsDialog::OkHdl(): someone is evaporated..." );
             DBG_ASSERT( pEntry, "-HangulHanjaOptionsDialog::OkHdl(): no one there in list?" );
@@ -1071,7 +1071,7 @@ namespace svx
 
     IMPL_LINK_NOARG(HangulHanjaOptionsDialog, EditDictHdl)
     {
-        SvLBoxEntry*    pEntry = m_aDictsLB.FirstSelected();
+        SvTreeListEntry*    pEntry = m_aDictsLB.FirstSelected();
         DBG_ASSERT( pEntry, "+HangulHanjaEditDictDialog::EditDictHdl(): call of edit should not be possible with no selection!" );
         if( pEntry )
         {
@@ -1165,7 +1165,7 @@ namespace svx
 
     HangulHanjaOptionsDialog::~HangulHanjaOptionsDialog()
     {
-        SvLBoxEntry*    pEntry = m_aDictsLB.First();
+        SvTreeListEntry*    pEntry = m_aDictsLB.First();
         String*         pDel;
         while( pEntry )
         {
@@ -1181,7 +1181,7 @@ namespace svx
 
     void HangulHanjaOptionsDialog::AddDict( const String& _rName, bool _bChecked )
     {
-        SvLBoxEntry*    pEntry = m_aDictsLB.SvTreeListBox::InsertEntry( _rName );
+        SvTreeListEntry*    pEntry = m_aDictsLB.SvTreeListBox::InsertEntry( _rName );
         m_aDictsLB.SetCheckButtonState( pEntry, _bChecked? SV_BUTTON_CHECKED : SV_BUTTON_UNCHECKED );
         pEntry->SetUserData( new String( _rName ) );
     }
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index 69d9ff63fac8..848f8b1d657a 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -311,7 +311,7 @@ sal_Bool SvxHlinkDlgMarkWnd::RefreshFromDoc( OUString aURL )
 |*
 |************************************************************************/
 
-int SvxHlinkDlgMarkWnd::FillTree( uno::Reference< container::XNameAccess > xLinks, SvLBoxEntry* pParentEntry )
+int SvxHlinkDlgMarkWnd::FillTree( uno::Reference< container::XNameAccess > xLinks, SvTreeListEntry* pParentEntry )
 {
     int nEntries=0;
     const uno::Sequence< OUString > aNames( xLinks->getElementNames() );
@@ -360,7 +360,7 @@ int SvxHlinkDlgMarkWnd::FillTree( uno::Reference< container::XNameAccess > xLink
                 // create userdata
                 TargetData *pData = new TargetData ( aLink, bIsTarget );
 
-                SvLBoxEntry* pEntry;
+                SvTreeListEntry* pEntry;
 
                 try
                 {
@@ -418,7 +418,7 @@ int SvxHlinkDlgMarkWnd::FillTree( uno::Reference< container::XNameAccess > xLink
 
 void SvxHlinkDlgMarkWnd::ClearTree()
 {
-    SvLBoxEntry* pEntry = maLbTree.First();
+    SvTreeListEntry* pEntry = maLbTree.First();
 
     while ( pEntry )
     {
@@ -437,10 +437,10 @@ void SvxHlinkDlgMarkWnd::ClearTree()
 |*
 |************************************************************************/
 
-SvLBoxEntry* SvxHlinkDlgMarkWnd::FindEntry ( String aStrName )
+SvTreeListEntry* SvxHlinkDlgMarkWnd::FindEntry ( String aStrName )
 {
     sal_Bool bFound=sal_False;
-    SvLBoxEntry* pEntry = maLbTree.First();
+    SvTreeListEntry* pEntry = maLbTree.First();
 
     while ( pEntry && !bFound )
     {
@@ -462,7 +462,7 @@ SvLBoxEntry* SvxHlinkDlgMarkWnd::FindEntry ( String aStrName )
 
 void SvxHlinkDlgMarkWnd::SelectEntry ( String aStrMark )
 {
-    SvLBoxEntry* pEntry = FindEntry ( aStrMark );
+    SvTreeListEntry* pEntry = FindEntry ( aStrMark );
     if ( pEntry )
     {
         maLbTree.Select ( pEntry );
@@ -478,7 +478,7 @@ void SvxHlinkDlgMarkWnd::SelectEntry ( String aStrMark )
 
 IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl)
 {
-    SvLBoxEntry* pEntry = maLbTree.GetCurEntry();
+    SvTreeListEntry* pEntry = maLbTree.GetCurEntry();
 
     if ( pEntry )
     {
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 8ab01c089c1f..68429f218272 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -151,7 +151,7 @@ IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox )
     if(nSelectionCount > 1)
     {
         // possibly deselect old entries in case of multi-selection
-        SvLBoxEntry* pEntry = 0;
+        SvTreeListEntry* pEntry = 0;
         SvBaseLink* pLink = 0;
         pEntry = pSvTabListBox->GetHdlEntry();
         pLink = (SvBaseLink*)pEntry->GetUserData();
@@ -269,7 +269,7 @@ IMPL_LINK_NOARG(SvBaseLinksDlg, UpdateNowClickHdl)
     std::vector< SvBaseLink* > aLnkArr;
     std::vector< sal_uInt16 > aPosArr;
 
-    SvLBoxEntry* pE = rListBox.FirstSelected();
+    SvTreeListEntry* pE = rListBox.FirstSelected();
     while( pE )
     {
         sal_uInt16 nFndPos = (sal_uInt16)rListBox.GetModel()->GetAbsPos( pE );
@@ -322,7 +322,7 @@ IMPL_LINK_NOARG(SvBaseLinksDlg, UpdateNowClickHdl)
 
         if( pE )
         {
-            SvLBoxEntry* pSelEntry = rListBox.FirstSelected();
+            SvTreeListEntry* pSelEntry = rListBox.FirstSelected();
             if( pE != pSelEntry )
                 rListBox.Select( pSelEntry, sal_False );
             rListBox.Select( pE );
@@ -344,7 +344,7 @@ IMPL_LINK( SvBaseLinksDlg, ChangeSourceClickHdl, PushButton *, pPushButton )
         PathDialog aPathDlg( this );
         String sType, sFile, sLinkName;
         String  sFilter;
-        SvLBoxEntry* pEntry = Links().FirstSelected();
+        SvTreeListEntry* pEntry = Links().FirstSelected();
         SvBaseLink* pLink = (SvBaseLink*)pEntry->GetUserData();
         pLinkMgr->GetDisplayNames( pLink, &sType, &sFile, 0, 0 );
         INetURLObject aUrl(sFile);
@@ -428,7 +428,7 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton )
                 pLinkMgr = 0;
                 SetManager( pNewMgr );
 
-                SvLBoxEntry* pEntry = Links().GetEntry( nPos ? --nPos : 0 );
+                SvTreeListEntry* pEntry = Links().GetEntry( nPos ? --nPos : 0 );
                 if( pEntry )
                     Links().SetCurEntry( pEntry );
             }
@@ -443,7 +443,7 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton )
         {
 
             SvBaseLinkMemberList aLinkList;
-            SvLBoxEntry* pEntry = Links().FirstSelected();
+            SvTreeListEntry* pEntry = Links().FirstSelected();
             while ( pEntry )
             {
                 void * pUD = pEntry->GetUserData();
@@ -492,7 +492,7 @@ IMPL_LINK( SvBaseLinksDlg, UpdateWaitingHdl, Timer*, pTimer )
     Links().SetUpdateMode(sal_False);
     for( sal_uLong nPos = Links().GetEntryCount(); nPos; )
     {
-        SvLBoxEntry* pBox = Links().GetEntry( --nPos );
+        SvTreeListEntry* pBox = Links().GetEntry( --nPos );
         SvBaseLinkRef xLink( (SvBaseLink*)pBox->GetUserData() );
         if( xLink.Is() )
         {
@@ -529,7 +529,7 @@ IMPL_LINK( SvBaseLinksDlg, EndEditHdl, sfx2::SvBaseLink*, _pLink )
         {
             Links().SetUpdateMode(sal_False);
             Links().GetModel()->Remove( Links().GetEntry( nPos ) );
-            SvLBoxEntry* pToUnselect = Links().FirstSelected();
+            SvTreeListEntry* pToUnselect = Links().FirstSelected();
             InsertEntry( *_pLink, nPos, sal_True );
             if(pToUnselect)
                 Links().Select(pToUnselect, sal_False);
@@ -595,7 +595,7 @@ void SvBaseLinksDlg::SetManager( LinkManager* pNewMgr )
 
         if( !rLnks.empty() )
         {
-            SvLBoxEntry* pEntry = Links().GetEntry( 0 );
+            SvTreeListEntry* pEntry = Links().GetEntry( 0 );
             Links().SetCurEntry( pEntry );
             Links().Select( pEntry );
             LinksSelectHdl( 0 );
@@ -638,7 +638,7 @@ void SvBaseLinksDlg::InsertEntry( const SvBaseLink& rLink, sal_uInt16 nPos, sal_
     aEntry += '\t';
     aEntry += ImplGetStateStr( rLink );
 
-    SvLBoxEntry * pE = Links().InsertEntryToColumn( aEntry, nPos );
+    SvTreeListEntry * pE = Links().InsertEntryToColumn( aEntry, nPos );
     pE->SetUserData( (void*)&rLink );
     if(bSelect)
         Links().Select(pE);
@@ -646,7 +646,7 @@ void SvBaseLinksDlg::InsertEntry( const SvBaseLink& rLink, sal_uInt16 nPos, sal_
 
 SvBaseLink* SvBaseLinksDlg::GetSelEntry( sal_uInt16* pPos )
 {
-    SvLBoxEntry* pE = Links().FirstSelected();
+    SvTreeListEntry* pE = Links().FirstSelected();
     sal_uInt16 nPos;
     if( pE && LISTBOX_ENTRY_NOTFOUND !=
         ( nPos = (sal_uInt16)Links().GetModel()->GetAbsPos( pE ) ) )
@@ -666,7 +666,7 @@ void SvBaseLinksDlg::SetType( SvBaseLink& rLink,
 {
     rLink.SetUpdateMode( nType );
     rLink.Update();
-    SvLBoxEntry* pBox = Links().GetEntry( nSelPos );
+    SvTreeListEntry* pBox = Links().GetEntry( nSelPos );
     Links().SetEntryText( ImplGetStateStr( rLink ), pBox, 3 );
     if( pLinkMgr->GetPersist() )
         pLinkMgr->GetPersist()->SetModified();
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index 5353edad37ea..da177364a5d2 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -68,7 +68,7 @@ IMPL_LINK_NOARG(SvxMultiPathDialog, SelectHdl_Impl)
 
 IMPL_LINK( SvxMultiPathDialog, CheckHdl_Impl, svx::SvxRadioButtonListBox *, pBox )
 {
-    SvLBoxEntry* pEntry =
+    SvTreeListEntry* pEntry =
         pBox ? pBox->GetEntry( pBox->GetCurMousePoint() ) : aRadioLB.FirstSelected();
     if ( pEntry )
         aRadioLB.HandleEntryChecked( pEntry );
@@ -98,7 +98,7 @@ IMPL_LINK_NOARG(SvxMultiPathDialog, AddHdl_Impl)
             {
                 rtl::OUString sNewEntry( '\t' );
                 sNewEntry += sInsPath;
-                SvLBoxEntry* pEntry = aRadioLB.InsertEntry( sNewEntry );
+                SvTreeListEntry* pEntry = aRadioLB.InsertEntry( sNewEntry );
                 String* pData = new String( aURL );
                 pEntry->SetUserData( pData );
             }
@@ -134,7 +134,7 @@ IMPL_LINK_NOARG(SvxMultiPathDialog, DelHdl_Impl)
 {
     if ( pImpl->bIsRadioButtonMode )
     {
-        SvLBoxEntry* pEntry = aRadioLB.FirstSelected();
+        SvTreeListEntry* pEntry = aRadioLB.FirstSelected();
         delete (String*)pEntry->GetUserData();
         bool bChecked = aRadioLB.GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED;
         sal_uLong nPos = aRadioLB.GetEntryPos( pEntry );
@@ -224,7 +224,7 @@ SvxMultiPathDialog::~SvxMultiPathDialog()
     nPos = (sal_uInt16)aRadioLB.GetEntryCount();
     while ( nPos-- )
     {
-        SvLBoxEntry* pEntry = aRadioLB.GetEntry( nPos );
+        SvTreeListEntry* pEntry = aRadioLB.GetEntry( nPos );
         delete (String*)pEntry->GetUserData();
     }
     delete pImpl;
@@ -242,7 +242,7 @@ String SvxMultiPathDialog::GetPath() const
         String sWritable;
         for ( sal_uInt16 i = 0; i < aRadioLB.GetEntryCount(); ++i )
         {
-            SvLBoxEntry* pEntry = aRadioLB.GetEntry(i);
+            SvTreeListEntry* pEntry = aRadioLB.GetEntry(i);
             if ( aRadioLB.GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED )
                 sWritable = *(String*)pEntry->GetUserData();
             else
@@ -286,7 +286,7 @@ void SvxMultiPathDialog::SetPath( const String& rPath )
         {
             rtl::OUString sEntry( '\t' );
             sEntry += (bIsSystemPath ? sSystemPath : sPath);
-            SvLBoxEntry* pEntry = aRadioLB.InsertEntry( sEntry );
+            SvTreeListEntry* pEntry = aRadioLB.InsertEntry( sEntry );
             String* pURL = new String( sPath );
             pEntry->SetUserData( pURL );
         }
@@ -302,7 +302,7 @@ void SvxMultiPathDialog::SetPath( const String& rPath )
 
     if ( pImpl->bIsRadioButtonMode && nCount > 0 )
     {
-        SvLBoxEntry* pEntry = aRadioLB.GetEntry( nCount - 1 );
+        SvTreeListEntry* pEntry = aRadioLB.GetEntry( nCount - 1 );
         if ( pEntry )
         {
             aRadioLB.SetCheckButtonState( pEntry, SV_BUTTON_CHECKED );
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index c1faf050b9db..cd85721d9688 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -96,7 +96,7 @@ SFTreeListBox::~SFTreeListBox()
     deleteAllTree();
 }
 
-void SFTreeListBox::delUserData( SvLBoxEntry* pEntry )
+void SFTreeListBox::delUserData( SvTreeListEntry* pEntry )
 {
     if ( pEntry )
     {
@@ -116,14 +116,14 @@ void SFTreeListBox::delUserData( SvLBoxEntry* pEntry )
     }
 }
 
-void SFTreeListBox::deleteTree( SvLBoxEntry* pEntry )
+void SFTreeListBox::deleteTree( SvTreeListEntry* pEntry )
 {
 
     delUserData( pEntry );
     pEntry = FirstChild( pEntry );
     while ( pEntry )
     {
-        SvLBoxEntry* pNextEntry = NextSibling( pEntry );
+        SvTreeListEntry* pNextEntry = NextSibling( pEntry );
         deleteTree( pEntry );
         GetModel()->Remove( pEntry );
         pEntry = pNextEntry;
@@ -132,7 +132,7 @@ void SFTreeListBox::deleteTree( SvLBoxEntry* pEntry )
 
 void SFTreeListBox::deleteAllTree()
 {
-    SvLBoxEntry* pEntry =  GetEntry( 0 );
+    SvTreeListEntry* pEntry =  GetEntry( 0 );
 
     // TBD - below is a candidate for a destroyAllTrees method
     if ( pEntry )
@@ -140,7 +140,7 @@ void SFTreeListBox::deleteAllTree()
         while ( pEntry )
         {
             String text = GetEntryText( pEntry );
-            SvLBoxEntry* pNextEntry = NextSibling( pEntry ) ;
+            SvTreeListEntry* pNextEntry = NextSibling( pEntry ) ;
             deleteTree( pEntry );
             GetModel()->Remove( pEntry );
             pEntry = pNextEntry;
@@ -303,7 +303,7 @@ SFTreeListBox::getLangNodeFromRootNode( Reference< browse::XBrowseNode >& rootNo
     return langNode;
 }
 
-void SFTreeListBox:: RequestSubEntries( SvLBoxEntry* pRootEntry, Reference< ::com::sun::star::script::browse::XBrowseNode >& node,
+void SFTreeListBox:: RequestSubEntries( SvTreeListEntry* pRootEntry, Reference< ::com::sun::star::script::browse::XBrowseNode >& node,
                                        Reference< XModel >& model )
 {
     if (! node.is() )
@@ -353,11 +353,11 @@ void SFTreeListBox::ExpandAllTrees()
 }
 
 SAL_WNODEPRECATED_DECLARATIONS_PUSH
-SvLBoxEntry * SFTreeListBox::insertEntry(
-    String const & rText, sal_uInt16 nBitmap, SvLBoxEntry * pParent,
+SvTreeListEntry * SFTreeListBox::insertEntry(
+    String const & rText, sal_uInt16 nBitmap, SvTreeListEntry * pParent,
     bool bChildrenOnDemand, std::auto_ptr< SFEntry > aUserData, ::rtl::OUString factoryURL )
 {
-    SvLBoxEntry * p;
+    SvTreeListEntry * p;
     if( nBitmap == IMG_DOCUMENT && !factoryURL.isEmpty() )
     {
         Image aImage = SvFileInformationManager::GetFileImage( INetURLObject(factoryURL), false );
@@ -374,8 +374,8 @@ SvLBoxEntry * SFTreeListBox::insertEntry(
 SAL_WNODEPRECATED_DECLARATIONS_POP
 
 SAL_WNODEPRECATED_DECLARATIONS_PUSH
-SvLBoxEntry * SFTreeListBox::insertEntry(
-    String const & rText, sal_uInt16 nBitmap, SvLBoxEntry * pParent,
+SvTreeListEntry * SFTreeListBox::insertEntry(
+    String const & rText, sal_uInt16 nBitmap, SvTreeListEntry * pParent,
     bool bChildrenOnDemand, std::auto_ptr< SFEntry > aUserData )
 {
     Image aImage;
@@ -395,14 +395,14 @@ SvLBoxEntry * SFTreeListBox::insertEntry(
     {
         aImage = m_docImage;
     }
-    SvLBoxEntry * p = InsertEntry(
+    SvTreeListEntry * p = InsertEntry(
         rText, aImage, aImage, pParent, bChildrenOnDemand, LIST_APPEND,
         aUserData.release()); // XXX possible leak
    return p;
 }
 SAL_WNODEPRECATED_DECLARATIONS_POP
 
-void SFTreeListBox::RequestingChildren( SvLBoxEntry* pEntry )
+void SFTreeListBox::RequestingChildren( SvTreeListEntry* pEntry )
 {
     SFEntry* userData = 0;
     if ( !pEntry )
@@ -657,7 +657,7 @@ IMPL_LINK( SvxScriptOrgDialog, ScriptSelectHdl, SvTreeListBox *, pBox )
         return 0;
     }
 
-    SvLBoxEntry* pEntry = pBox->GetHdlEntry();
+    SvTreeListEntry* pEntry = pBox->GetHdlEntry();
 
     SFEntry* userData = 0;
     if ( !pEntry )
@@ -692,7 +692,7 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton )
     {
         if ( aScriptsBox.IsSelected( aScriptsBox.GetHdlEntry() ) )
         {
-            SvLBoxEntry* pEntry = aScriptsBox.GetHdlEntry();
+            SvTreeListEntry* pEntry = aScriptsBox.GetHdlEntry();
             SFEntry* userData = 0;
             if ( !pEntry )
             {
@@ -738,7 +738,7 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton )
                     }
 
 
-                    SvLBoxEntry* pParent = aScriptsBox.GetParent( pEntry );
+                    SvTreeListEntry* pParent = aScriptsBox.GetParent( pEntry );
                     while ( pParent && !mspNode.is() )
                     {
                         SFEntry* mspUserData = (SFEntry*)pParent->GetUserData();
@@ -825,7 +825,7 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton )
     return 0;
 }
 
-Reference< browse::XBrowseNode > SvxScriptOrgDialog::getBrowseNode( SvLBoxEntry* pEntry )
+Reference< browse::XBrowseNode > SvxScriptOrgDialog::getBrowseNode( SvTreeListEntry* pEntry )
 {
     Reference< browse::XBrowseNode > node;
     if ( pEntry )
@@ -840,7 +840,7 @@ Reference< browse::XBrowseNode > SvxScriptOrgDialog::getBrowseNode( SvLBoxEntry*
     return node;
 }
 
-Reference< XModel > SvxScriptOrgDialog::getModel( SvLBoxEntry* pEntry )
+Reference< XModel > SvxScriptOrgDialog::getModel( SvTreeListEntry* pEntry )
 {
     Reference< XModel > model;
     if ( pEntry )
@@ -855,7 +855,7 @@ Reference< XModel > SvxScriptOrgDialog::getModel( SvLBoxEntry* pEntry )
     return model;
 }
 
-void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry )
+void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry )
 {
 
     Reference< browse::XBrowseNode >  aChildNode;
@@ -994,7 +994,7 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry )
     if ( aChildNode.is() )
     {
         String aChildName = aChildNode->getName();
-        SvLBoxEntry* pNewEntry = NULL;
+        SvTreeListEntry* pNewEntry = NULL;
 
 
         ::rtl::OUString name( aChildName );
@@ -1045,7 +1045,7 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry )
     }
 }
 
-void SvxScriptOrgDialog::renameEntry( SvLBoxEntry* pEntry )
+void SvxScriptOrgDialog::renameEntry( SvTreeListEntry* pEntry )
 {
 
     Reference< browse::XBrowseNode >  aChildNode;
@@ -1122,7 +1122,7 @@ void SvxScriptOrgDialog::renameEntry( SvLBoxEntry* pEntry )
         aErrorBox.Execute();
     }
 }
-void SvxScriptOrgDialog::deleteEntry( SvLBoxEntry* pEntry )
+void SvxScriptOrgDialog::deleteEntry( SvTreeListEntry* pEntry )
 {
     sal_Bool result = sal_False;
     Reference< browse::XBrowseNode > node = getBrowseNode( pEntry );
@@ -1225,7 +1225,7 @@ void SvxScriptOrgDialog::StoreCurrentSelection()
     String aDescription;
     if ( aScriptsBox.IsSelected( aScriptsBox.GetHdlEntry() ) )
     {
-        SvLBoxEntry* pEntry = aScriptsBox.GetHdlEntry();
+        SvTreeListEntry* pEntry = aScriptsBox.GetHdlEntry();
         while( pEntry )
         {
             aDescription.Insert( aScriptsBox.GetEntryText( pEntry ), 0 );
@@ -1243,12 +1243,12 @@ void SvxScriptOrgDialog::RestorePreviousSelection()
     String aStoredEntry = String( m_lastSelection[ m_sLanguage ] );
     if( aStoredEntry.Len() <= 0 )
         return;
-    SvLBoxEntry* pEntry = 0;
+    SvTreeListEntry* pEntry = 0;
     sal_uInt16 nIndex = 0;
     while ( nIndex != STRING_NOTFOUND )
     {
         String aTmp( aStoredEntry.GetToken( 0, ';', nIndex ) );
-        SvLBoxEntry* pTmpEntry = aScriptsBox.FirstChild( pEntry );
+        SvTreeListEntry* pTmpEntry = aScriptsBox.FirstChild( pEntry );
         ::rtl::OUString debugStr(aTmp);
         while ( pTmpEntry )
         {
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index 646d55dd0c68..f5d296d2a44b 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -171,7 +171,7 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog( Window* pParent,
 
             // item resources are in svx
             sal_uInt32 nId  = aAttrNames.FindIndex( nSlot );
-            SvLBoxEntry* pEntry = NULL;
+            SvTreeListEntry* pEntry = NULL;
             if ( RESARRAY_INDEX_NOTFOUND != nId )
                 pEntry = aAttrLB.SvTreeListBox::InsertEntry( aAttrNames.GetString(nId) );
             else
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 47a396549d91..e8a711ecbc8e 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -130,7 +130,7 @@ void ReplaceEdit::SetText( const XubString& rStr, const Selection& rNewSelection
 
 AlternativesString::AlternativesString(
     ThesaurusAlternativesCtrl &rControl,
-    SvLBoxEntry* pEntry, sal_uInt16 nFlags, const String& rStr ) :
+    SvTreeListEntry* pEntry, sal_uInt16 nFlags, const String& rStr ) :
 
     SvLBoxString( pEntry, nFlags, rStr ),
     m_rControlImpl( rControl )
@@ -140,7 +140,7 @@ AlternativesString::AlternativesString(
 void AlternativesString::Paint(
     const Point& rPos,
     SvTreeListBox& rDev, sal_uInt16,
-    SvLBoxEntry* pEntry )
+    SvTreeListEntry* pEntry )
 {
     AlternativesExtraData* pData = m_rControlImpl.GetExtraData( pEntry );
     Point aPos( rPos );
@@ -187,7 +187,7 @@ void ThesaurusAlternativesCtrl::ClearExtraData()
 }
 
 void ThesaurusAlternativesCtrl::SetExtraData(
-    const SvLBoxEntry *pEntry,
+    const SvTreeListEntry *pEntry,
     const AlternativesExtraData &rData )
 {
     if (!pEntry)
@@ -201,7 +201,7 @@ void ThesaurusAlternativesCtrl::SetExtraData(
 }
 
 AlternativesExtraData * ThesaurusAlternativesCtrl::GetExtraData(
-    const SvLBoxEntry *pEntry )
+    const SvTreeListEntry *pEntry )
 {
     AlternativesExtraData *pRes = NULL;
     UserDataMap_t::iterator aIt( m_aUserData.find( pEntry ) );
@@ -210,9 +210,9 @@ AlternativesExtraData * ThesaurusAlternativesCtrl::GetExtraData(
     return pRes;
 }
 
-SvLBoxEntry * ThesaurusAlternativesCtrl::AddEntry( sal_Int32 nVal, const String &rText, bool bIsHeader )
+SvTreeListEntry * ThesaurusAlternativesCtrl::AddEntry( sal_Int32 nVal, const String &rText, bool bIsHeader )
 {
-    SvLBoxEntry* pEntry = new SvLBoxEntry;
+    SvTreeListEntry* pEntry = new SvTreeListEntry;
     String aText;
     if (bIsHeader && nVal >= 0)
     {
@@ -392,7 +392,7 @@ IMPL_LINK( SvxThesaurusDialog, WordSelectHdl_Impl, ComboBox *, pBox )
 
 IMPL_LINK( SvxThesaurusDialog, AlternativesSelectHdl_Impl, SvxCheckListBox *, pBox )
 {
-    SvLBoxEntry *pEntry = pBox ? pBox->GetCurEntry() : NULL;
+    SvTreeListEntry *pEntry = pBox ? pBox->GetCurEntry() : NULL;
     if (pEntry)
     {
         AlternativesExtraData * pData = m_pAlternativesCT->GetExtraData( pEntry );
@@ -409,7 +409,7 @@ IMPL_LINK( SvxThesaurusDialog, AlternativesSelectHdl_Impl, SvxCheckListBox *, pB
 
 IMPL_LINK( SvxThesaurusDialog, AlternativesDoubleClickHdl_Impl, SvxCheckListBox *, pBox )
 {
-    SvLBoxEntry *pEntry = pBox ? pBox->GetCurEntry() : NULL;
+    SvTreeListEntry *pEntry = pBox ? pBox->GetCurEntry() : NULL;
     if (pEntry)
     {
         AlternativesExtraData * pData = m_pAlternativesCT->GetExtraData( pEntry );
diff --git a/cui/source/dialogs/thesdlg_impl.hxx b/cui/source/dialogs/thesdlg_impl.hxx
index 8c827fde6b72..1349ab3cb7b0 100644
--- a/cui/source/dialogs/thesdlg_impl.hxx
+++ b/cui/source/dialogs/thesdlg_impl.hxx
@@ -45,7 +45,7 @@
 using namespace ::com::sun::star;
 using ::rtl::OUString;
 
-class SvLBoxEntry;
+class SvTreeListEntry;
 class ThesaurusAlternativesCtrl;
 
 class AlternativesString : public SvLBoxString
@@ -54,9 +54,9 @@ class AlternativesString : public SvLBoxString
 public:
 
     AlternativesString( ThesaurusAlternativesCtrl &rControl,
-        SvLBoxEntry* pEntry, sal_uInt16 nFlags, const String& rStr );
+        SvTreeListEntry* pEntry, sal_uInt16 nFlags, const String& rStr );
 
-    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);
 };
 
 #endif