Merge SvListEntry and SvLBoxEntry into SvTreeListEntry.

Change-Id: I89cfc8c1288c00674fe64e791c149743d377d5ee

7 files changed, 63 insertions, 63 deletions

diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index a9378697ab37..d63ac3b67fde 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -210,10 +210,10 @@ static OUString getDescription( const Any& rTarget, bool bWithText = true )
 class CustomAnimationListEntryItem : public SvLBoxString
 {
 public:
-                    CustomAnimationListEntryItem( SvLBoxEntry*,sal_uInt16 nFlags, OUString aDescription, CustomAnimationEffectPtr pEffect, CustomAnimationList* pParent  );
+                    CustomAnimationListEntryItem( SvTreeListEntry*,sal_uInt16 nFlags, OUString aDescription, CustomAnimationEffectPtr pEffect, CustomAnimationList* pParent  );
     virtual         ~CustomAnimationListEntryItem();
-    void            InitViewData( SvTreeListBox*,SvLBoxEntry*,SvViewDataItem* );
-    void            Paint( const Point&, SvTreeListBox& rDev, sal_uInt16 nFlags,SvLBoxEntry* );
+    void            InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* );
+    void            Paint( const Point&, SvTreeListBox& rDev, sal_uInt16 nFlags,SvTreeListEntry* );
     SvLBoxItem*     Create() const;
     void            Clone( SvLBoxItem* pSource );
 
@@ -225,7 +225,7 @@ private:
 
 // --------------------------------------------------------------------
 
-CustomAnimationListEntryItem::CustomAnimationListEntryItem( SvLBoxEntry* pEntry, sal_uInt16 nFlags, OUString aDescription, CustomAnimationEffectPtr pEffect, CustomAnimationList* pParent  )
+CustomAnimationListEntryItem::CustomAnimationListEntryItem( SvTreeListEntry* pEntry, sal_uInt16 nFlags, OUString aDescription, CustomAnimationEffectPtr pEffect, CustomAnimationList* pParent  )
 : SvLBoxString( pEntry, nFlags, aDescription )
 , mpParent( pParent )
 , maDescription( aDescription )
@@ -241,7 +241,7 @@ CustomAnimationListEntryItem::~CustomAnimationListEntryItem()
 
 // --------------------------------------------------------------------
 
-void CustomAnimationListEntryItem::InitViewData( SvTreeListBox* pView, SvLBoxEntry* pEntry, SvViewDataItem* pViewData )
+void CustomAnimationListEntryItem::InitViewData( SvTreeListBox* pView, SvTreeListEntry* pEntry, SvViewDataItem* pViewData )
 {
     if( !pViewData )
         pViewData = pView->GetViewDataItem( pEntry, this );
@@ -254,7 +254,7 @@ void CustomAnimationListEntryItem::InitViewData( SvTreeListBox* pView, SvLBoxEnt
 
 // --------------------------------------------------------------------
 
-void CustomAnimationListEntryItem::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16, SvLBoxEntry* pEntry )
+void CustomAnimationListEntryItem::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16, SvTreeListEntry* pEntry )
 {
 
     SvViewDataItem* pViewData = mpParent->GetViewDataItem( pEntry, this );
@@ -323,7 +323,7 @@ void CustomAnimationListEntryItem::Clone( SvLBoxItem* )
 
 // ====================================================================
 
-class CustomAnimationListEntry : public SvLBoxEntry
+class CustomAnimationListEntry : public SvTreeListEntry
 {
 public:
     CustomAnimationListEntry();
@@ -360,11 +360,11 @@ CustomAnimationListEntry::~CustomAnimationListEntry()
 class CustomAnimationTriggerEntryItem : public SvLBoxString
 {
 public:
-                    CustomAnimationTriggerEntryItem( SvLBoxEntry*,sal_uInt16 nFlags, OUString aDescription );
+                    CustomAnimationTriggerEntryItem( SvTreeListEntry*,sal_uInt16 nFlags, OUString aDescription );
     virtual         ~CustomAnimationTriggerEntryItem();
     virtual sal_uInt16  IsA();
-    void            InitViewData( SvTreeListBox*,SvLBoxEntry*,SvViewDataItem* );
-    void            Paint( const Point&, SvTreeListBox& rDev, sal_uInt16 nFlags,SvLBoxEntry* );
+    void            InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* );
+    void            Paint( const Point&, SvTreeListBox& rDev, sal_uInt16 nFlags,SvTreeListEntry* );
     SvLBoxItem*     Create() const;
     void            Clone( SvLBoxItem* pSource );
 
@@ -374,7 +374,7 @@ private:
 
 // --------------------------------------------------------------------
 
-CustomAnimationTriggerEntryItem::CustomAnimationTriggerEntryItem( SvLBoxEntry* pEntry, sal_uInt16 nFlags, OUString aDescription )
+CustomAnimationTriggerEntryItem::CustomAnimationTriggerEntryItem( SvTreeListEntry* pEntry, sal_uInt16 nFlags, OUString aDescription )
 : SvLBoxString( pEntry, nFlags, aDescription ), maDescription( aDescription )
 {
 }
@@ -394,7 +394,7 @@ sal_uInt16 CustomAnimationTriggerEntryItem::IsA()
 
 // --------------------------------------------------------------------
 
-void CustomAnimationTriggerEntryItem::InitViewData( SvTreeListBox* pView, SvLBoxEntry* pEntry, SvViewDataItem* pViewData )
+void CustomAnimationTriggerEntryItem::InitViewData( SvTreeListBox* pView, SvTreeListEntry* pEntry, SvViewDataItem* pViewData )
 {
     if( !pViewData )
         pViewData = pView->GetViewDataItem( pEntry, this );
@@ -407,7 +407,7 @@ void CustomAnimationTriggerEntryItem::InitViewData( SvTreeListBox* pView, SvLBox
 
 // --------------------------------------------------------------------
 
-void CustomAnimationTriggerEntryItem::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16, SvLBoxEntry* )
+void CustomAnimationTriggerEntryItem::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16, SvTreeListEntry* )
 {
     Size aSize( rDev.GetOutputSizePixel().Width(), static_cast< SvTreeListBox* >(&rDev)->GetEntryHeight() );
 
@@ -668,7 +668,7 @@ void CustomAnimationList::update()
             Reference< XShape > xShape( pIS->getTriggerShape() );
             if( xShape.is() )
             {
-                SvLBoxEntry* pLBoxEntry = new CustomAnimationListEntry;
+                SvTreeListEntry* pLBoxEntry = new CustomAnimationListEntry;
                 pLBoxEntry->AddItem( new SvLBoxContextBmp( pLBoxEntry, 0, Image(), Image(), 0));
                 OUString aDescription = String( SdResId( STR_CUSTOMANIMATION_TRIGGER ) );
                 aDescription += ": ";
@@ -766,7 +766,7 @@ void CustomAnimationList::append( CustomAnimationEffectPtr pEffect )
     {
         aDescription = getDescription( aTarget, pEffect->getTargetSubItem() != ShapeAnimationSubType::ONLY_BACKGROUND );
 
-        SvLBoxEntry* pParentEntry = 0;
+        SvTreeListEntry* pParentEntry = 0;
 
         Reference< XShape > xTargetShape( pEffect->getTargetShape() );
         sal_Int32 nGroupId = pEffect->getGroupId();
@@ -777,7 +777,7 @@ void CustomAnimationList::append( CustomAnimationEffectPtr pEffect )
             pParentEntry = mpLastParentEntry;
 
         // create an entry for the effect
-        SvLBoxEntry* pEntry = new CustomAnimationListEntry( pEffect );
+        SvTreeListEntry* pEntry = new CustomAnimationListEntry( pEffect );
 
         pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0));
         pEntry->AddItem( new CustomAnimationListEntryItem( pEntry, 0, aDescription, pEffect, this ) );
diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx
index 693d6e3422dc..65f7bfa282fe 100644
--- a/sd/source/ui/animations/CustomAnimationList.hxx
+++ b/sd/source/ui/animations/CustomAnimationList.hxx
@@ -112,7 +112,7 @@ private:
 
     ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxLastTargetShape;
     sal_Int32 mnLastGroupId;
-    SvLBoxEntry* mpLastParentEntry;
+    SvTreeListEntry* mpLastParentEntry;
 
 };
 
diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx
index e1436d43b2c6..b1974fd4f572 100644
--- a/sd/source/ui/dlg/custsdlg.cxx
+++ b/sd/source/ui/dlg/custsdlg.cxx
@@ -360,7 +360,7 @@ SdDefineCustomShowDlg::SdDefineCustomShowDlg( Window* pWindow,
         for( SdCustomShow::PageVec::iterator it = rpCustomShow->PagesVector().begin();
              it != rpCustomShow->PagesVector().end(); ++it )
         {
-            SvLBoxEntry* pEntry = aLbCustomPages.InsertEntry( (*it)->GetName() );
+            SvTreeListEntry* pEntry = aLbCustomPages.InsertEntry( (*it)->GetName() );
             pEntry->SetUserData( (SdPage*) (*it) );
         }
     }
@@ -414,7 +414,7 @@ IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl, void *, p )
         if( nCount > 0 )
         {
             sal_uLong nPosCP = LIST_APPEND;
-            SvLBoxEntry* pEntry = aLbCustomPages.FirstSelected();
+            SvTreeListEntry* pEntry = aLbCustomPages.FirstSelected();
             if( pEntry )
                 nPosCP = aLbCustomPages.GetModel()->GetAbsPos( pEntry ) + 1L;
 
@@ -438,7 +438,7 @@ IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl, void *, p )
     else if( p == &aBtnRemove )
     {
         //sal_uInt16 nPos = aLbCustomPages.GetSelectEntryPos();
-        SvLBoxEntry* pEntry = aLbCustomPages.FirstSelected();
+        SvTreeListEntry* pEntry = aLbCustomPages.FirstSelected();
         if( pEntry )
         {
             sal_uLong nPos = aLbCustomPages.GetModel()->GetAbsPos( pEntry );
@@ -470,7 +470,7 @@ void SdDefineCustomShowDlg::CheckCustomShow()
 {
     sal_Bool bDifferent = sal_False;
     SdPage* pPage = NULL;
-    SvLBoxEntry* pEntry = NULL;
+    SvTreeListEntry* pEntry = NULL;
 
     // Anzahl vergleichen
     if( rpCustomShow->PagesVector().size() != aLbCustomPages.GetEntryCount() )
diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx
index c5dcc2c70a30..3f042c39941b 100644
--- a/sd/source/ui/dlg/dlgassim.cxx
+++ b/sd/source/ui/dlg/dlgassim.cxx
@@ -63,7 +63,7 @@ SdPageListControl::SdPageListControl(
 IMPL_LINK_NOARG(SdPageListControl, CheckButtonClickHdl)
 {
     SvLBoxTreeList* pTreeModel = GetModel();
-    SvLBoxEntry* pEntry = pTreeModel->First();
+    SvTreeListEntry* pEntry = pTreeModel->First();
 
     while( pEntry )
     {
@@ -88,9 +88,9 @@ void SdPageListControl::Clear()
     SvTreeListBox::Clear();
 }
 
-SvLBoxEntry* SdPageListControl::InsertPage( const String& rPageName )
+SvTreeListEntry* SdPageListControl::InsertPage( const String& rPageName )
 {
-    SvLBoxEntry* pEntry = new SvLBoxEntry;
+    SvTreeListEntry* pEntry = new SvTreeListEntry;
 
     pEntry->AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox,
                                        0, m_pCheckButton));
@@ -102,9 +102,9 @@ SvLBoxEntry* SdPageListControl::InsertPage( const String& rPageName )
     return pEntry;
 }
 
-void SdPageListControl::InsertTitle( SvLBoxEntry* pParent, const String& rTitle )
+void SdPageListControl::InsertTitle( SvTreeListEntry* pParent, const String& rTitle )
 {
-    SvLBoxEntry* pEntry = new SvLBoxEntry;
+    SvTreeListEntry* pEntry = new SvTreeListEntry;
     pEntry->AddItem( new SvLBoxString( pEntry, 0, String() ) );
     pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0));    // Sonst Puff!
     pEntry->AddItem( new SvLBoxString( pEntry, 0, rTitle ) );
@@ -122,7 +122,7 @@ void SdPageListControl::Fill( SdDrawDocument* pDoc )
         SdPage* pPage = (SdPage*) pDoc->GetPage( nPage );
         if( pPage->GetPageKind() == PK_STANDARD )
         {
-            SvLBoxEntry* pEntry = InsertPage( pPage->GetName() );
+            SvTreeListEntry* pEntry = InsertPage( pPage->GetName() );
             SetCheckButtonState(pEntry, SvButtonState( SV_BUTTON_CHECKED ) );
 
             SdrTextObj* pTO = (SdrTextObj*)pPage->GetPresObj(PRESOBJ_TEXT);
@@ -174,13 +174,13 @@ void SdPageListControl::Fill( SdDrawDocument* pDoc )
 
 sal_uInt16 SdPageListControl::GetSelectedPage()
 {
-    SvLBoxEntry* pSelEntry = GetCurEntry();
+    SvTreeListEntry* pSelEntry = GetCurEntry();
     sal_uInt16 nPage = 0;
 
     if ( pSelEntry )
     {
         SvLBoxTreeList* pTreeModel = GetModel();
-        SvLBoxEntry* pEntry = pTreeModel->First();
+        SvTreeListEntry* pEntry = pTreeModel->First();
 
         while( pEntry && pEntry != pSelEntry )
         {
@@ -197,7 +197,7 @@ sal_uInt16 SdPageListControl::GetSelectedPage()
 
 sal_Bool SdPageListControl::IsPageChecked( sal_uInt16 nPage )
 {
-    SvLBoxEntry* pEntry = GetModel()->GetEntry(nPage);
+    SvTreeListEntry* pEntry = GetModel()->GetEntry(nPage);
     return pEntry?(sal_Bool)(GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED): sal_False;
 }
 
diff --git a/sd/source/ui/dlg/dlgassim.hxx b/sd/source/ui/dlg/dlgassim.hxx
index f6f9b792bf35..cccd80e0b21e 100644
--- a/sd/source/ui/dlg/dlgassim.hxx
+++ b/sd/source/ui/dlg/dlgassim.hxx
@@ -38,8 +38,8 @@ class SdPageListControl : public SvTreeListBox
 private:
     SvLBoxButtonData*   m_pCheckButton;
 
-    SvLBoxEntry* InsertPage( const String& rPageName );
-    void InsertTitle( SvLBoxEntry* pEntry, const String& rTitle );
+    SvTreeListEntry* InsertPage( const String& rPageName );
+    void InsertTitle( SvTreeListEntry* pEntry, const String& rTitle );
 
 public:
     SdPageListControl( Window* pParent, const ResId& rResId );
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 8637efa62936..04b60ea104d3 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -309,7 +309,7 @@ sal_Bool SdPageObjsTLB::SelectEntry( const String& rName )
 
     if( rName.Len() )
     {
-        SvLBoxEntry* pEntry = NULL;
+        SvTreeListEntry* pEntry = NULL;
         String aTmp;
 
         for( pEntry = First(); pEntry && !bFound; pEntry = Next( pEntry ) )
@@ -338,7 +338,7 @@ sal_Bool SdPageObjsTLB::HasSelectedChildren( const String& rName )
 
     if( rName.Len() )
     {
-        SvLBoxEntry* pEntry = NULL;
+        SvTreeListEntry* pEntry = NULL;
         String aTmp;
 
         for( pEntry = First(); pEntry && !bFound; pEntry = Next( pEntry ) )
@@ -452,7 +452,7 @@ void SdPageObjsTLB::AddShapeList (
     SdrObject* pShape,
     const ::rtl::OUString& rsName,
     const bool bIsExcluded,
-    SvLBoxEntry* pParentEntry,
+    SvTreeListEntry* pParentEntry,
     const IconProvider& rIconProvider)
 {
     Image aIcon (rIconProvider.maImgPage);
@@ -465,7 +465,7 @@ void SdPageObjsTLB::AddShapeList (
     if (pShape != NULL)
         pUserData = pShape;
 
-    SvLBoxEntry* pEntry = InsertEntry(
+    SvTreeListEntry* pEntry = InsertEntry(
         rsName,
         aIcon,
         aIcon,
@@ -598,7 +598,7 @@ sal_Bool SdPageObjsTLB::IsEqualToDoc( const SdDrawDocument* pInDoc )
 
     SdrObject*   pObj = NULL;
     SdPage*      pPage = NULL;
-    SvLBoxEntry* pEntry = First();
+    SvTreeListEntry* pEntry = First();
     String       aName;
 
     // Alle Pages incl. Objekte vergleichen
@@ -665,7 +665,7 @@ String SdPageObjsTLB::GetSelectEntry()
 std::vector<rtl::OUString> SdPageObjsTLB::GetSelectEntryList( const sal_uInt16 nDepth ) const
 {
     std::vector<rtl::OUString> aEntries;
-    SvLBoxEntry* pEntry = FirstSelected();
+    SvTreeListEntry* pEntry = FirstSelected();
 
     while( pEntry )
     {
@@ -686,7 +686,7 @@ std::vector<rtl::OUString> SdPageObjsTLB::GetSelectEntryList( const sal_uInt16 n
 |*
 \************************************************************************/
 
-void SdPageObjsTLB::RequestingChildren( SvLBoxEntry* pFileEntry )
+void SdPageObjsTLB::RequestingChildren( SvTreeListEntry* pFileEntry )
 {
     if( !pFileEntry->HasChildren() )
     {
@@ -694,7 +694,7 @@ void SdPageObjsTLB::RequestingChildren( SvLBoxEntry* pFileEntry )
         {
             SdrObject*   pObj = NULL;
             SdPage*      pPage = NULL;
-            SvLBoxEntry* pPageEntry = NULL;
+            SvTreeListEntry* pPageEntry = NULL;
 
             Image aImgPage     = Image( BitmapEx( SdResId( BMP_PAGE     ) ) );
             Image aImgPageObjs = Image( BitmapEx( SdResId( BMP_PAGEOBJS ) ) );
@@ -852,7 +852,7 @@ void SdPageObjsTLB::CloseBookmarkDoc()
 
 void SdPageObjsTLB::SelectHdl()
 {
-    SvLBoxEntry* pEntry = FirstSelected();
+    SvTreeListEntry* pEntry = FirstSelected();
 
     mbLinkableSelected = sal_True;
 
@@ -878,7 +878,7 @@ void SdPageObjsTLB::KeyInput( const KeyEvent& rKEvt )
     if( rKEvt.GetKeyCode().GetCode() == KEY_RETURN )
     {
         // Auskommentierter Code aus svtools/source/contnr/svimpbox.cxx
-        SvLBoxEntry* pCursor = GetCurEntry();
+        SvTreeListEntry* pCursor = GetCurEntry();
         if( pCursor->HasChildren() || pCursor->HasChildrenOnDemand() )
         {
             if( IsExpanded( pCursor ) )
@@ -905,7 +905,7 @@ void SdPageObjsTLB::StartDrag( sal_Int8 nAction, const Point& rPosPixel)
     (void)rPosPixel;
 
     SdNavigatorWin* pNavWin = NULL;
-    SvLBoxEntry* pEntry = GetEntry(rPosPixel);
+    SvTreeListEntry* pEntry = GetEntry(rPosPixel);
 
     if( mpFrame->HasChildWindow( SID_NAVIGATOR ) )
         pNavWin = (SdNavigatorWin*) ( mpFrame->GetChildWindow( SID_NAVIGATOR )->GetContextWindow( SD_MOD() ) );
@@ -926,12 +926,12 @@ void SdPageObjsTLB::StartDrag( sal_Int8 nAction, const Point& rPosPixel)
 
         // Enable only the entries as drop targets that are children of the
         // page under the mouse.
-        SvLBoxEntry* pParent = GetRootLevelParent(pEntry);
+        SvTreeListEntry* pParent = GetRootLevelParent(pEntry);
         if (pParent != NULL)
         {
             SelectAll(sal_False, sal_False);
             Select(pParent, sal_True);
-            //            for (SvLBoxEntry*pChild=FirstChild(pParent); pChild!=NULL; pChild=NextSibling(pChild))
+            //            for (SvTreeListEntry*pChild=FirstChild(pParent); pChild!=NULL; pChild=NextSibling(pChild))
             //                Select(pChild, sal_True);
             EnableSelectionAsDropTarget(sal_True, sal_True);//sal_False);
         }
@@ -1076,7 +1076,7 @@ sal_Int8 SdPageObjsTLB::AcceptDrop (const AcceptDropEvent& rEvent)
     }
     else
     {
-        SvLBoxEntry* pEntry = GetDropTarget(rEvent.maPosPixel);
+        SvTreeListEntry* pEntry = GetDropTarget(rEvent.maPosPixel);
         if (rEvent.mbLeaving || !CheckDragAndDropMode( this, rEvent.mnAction ))
         {
             ImplShowTargetEmphasis( pTargetEntry, sal_False );
@@ -1201,12 +1201,12 @@ bool SdPageObjsTLB::PageBelongsToCurrentShow (const SdPage* pPage) const
 
 
 sal_Bool SdPageObjsTLB::NotifyMoving(
-    SvLBoxEntry* pTarget,
-    SvLBoxEntry* pEntry,
-    SvLBoxEntry*& rpNewParent,
+    SvTreeListEntry* pTarget,
+    SvTreeListEntry* pEntry,
+    SvTreeListEntry*& rpNewParent,
     sal_uLong& rNewChildPos)
 {
-    SvLBoxEntry* pDestination = pTarget;
+    SvTreeListEntry* pDestination = pTarget;
     while (GetParent(pDestination) != NULL && GetParent(GetParent(pDestination)) != NULL)
         pDestination = GetParent(pDestination);
 
@@ -1256,9 +1256,9 @@ sal_Bool SdPageObjsTLB::NotifyMoving(
 
 
 
-SvLBoxEntry* SdPageObjsTLB::GetDropTarget (const Point& rLocation)
+SvTreeListEntry* SdPageObjsTLB::GetDropTarget (const Point& rLocation)
 {
-    SvLBoxEntry* pEntry = SvTreeListBox::GetDropTarget(rLocation);
+    SvTreeListEntry* pEntry = SvTreeListBox::GetDropTarget(rLocation);
     if (pEntry == NULL)
         return NULL;
 
@@ -1276,11 +1276,11 @@ SvLBoxEntry* SdPageObjsTLB::GetDropTarget (const Point& rLocation)
             pEntry = GetParent(pEntry);
 
         // Advance to next sibling.
-        SvLBoxEntry* pNext;
+        SvTreeListEntry* pNext;
         sal_uInt16 nDepth (0);
         while (pEntry != NULL)
         {
-            pNext = dynamic_cast<SvLBoxEntry*>(NextVisible(pEntry, &nDepth));
+            pNext = dynamic_cast<SvTreeListEntry*>(NextVisible(pEntry, &nDepth));
             if (pNext != NULL && nDepth > 0 && nDepth!=0xffff)
                 pEntry = pNext;
             else
@@ -1296,7 +1296,7 @@ SvLBoxEntry* SdPageObjsTLB::GetDropTarget (const Point& rLocation)
 
 
 
-bool SdPageObjsTLB::IsDropAllowed (SvLBoxEntry* pEntry)
+bool SdPageObjsTLB::IsDropAllowed (SvTreeListEntry* pEntry)
 {
     if (pEntry == NULL)
         return false;
diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx
index 21d89c9a6705..50ad60e4353d 100644
--- a/sd/source/ui/inc/sdtreelb.hxx
+++ b/sd/source/ui/inc/sdtreelb.hxx
@@ -47,7 +47,7 @@ class SdNavigatorWin;
 class SdrObject;
 class SdrObjList;
 class SdPage;
-class SvLBoxEntry;
+class SvTreeListEntry;
 
 namespace sd {
 class DrawDocShell;
@@ -150,7 +150,7 @@ protected:
     virtual sal_Int8        AcceptDrop( const AcceptDropEvent& rEvt );
     virtual sal_Int8        ExecuteDrop( const ExecuteDropEvent& rEvt );
 
-    virtual void            RequestingChildren( SvLBoxEntry* pParent );
+    virtual void            RequestingChildren( SvTreeListEntry* pParent );
 
     void                    DoDrag();
     void                    OnDragFinished( sal_uInt8 nDropAction );
@@ -179,13 +179,13 @@ protected:
         associated list box entries.
     */
     virtual sal_Bool NotifyMoving(
-        SvLBoxEntry*  pTarget,
-        SvLBoxEntry*  pEntry,
-        SvLBoxEntry*& rpNewParent,
+        SvTreeListEntry*  pTarget,
+        SvTreeListEntry*  pEntry,
+        SvTreeListEntry*& rpNewParent,
         sal_uLong&        rNewChildPos);
 
     using Window::GetDropTarget;
-    virtual SvLBoxEntry* GetDropTarget (const Point& rLocation);
+    virtual SvTreeListEntry* GetDropTarget (const Point& rLocation);
 
 public:
 
@@ -238,7 +238,7 @@ private:
     /** Return <TRUE/> when the current transferable may be dropped at the
         given list box entry.
     */
-    bool IsDropAllowed (SvLBoxEntry* pEntry);
+    bool IsDropAllowed (SvTreeListEntry* pEntry);
 
     /** This inner class is defined in sdtreelb.cxx and is basically a
         container for the icons used in the list box for the entries.
@@ -265,7 +265,7 @@ private:
         SdrObject* pShape,
         const ::rtl::OUString& rsName,
         const bool bIsExcluded,
-        SvLBoxEntry* pParentEntry,
+        SvTreeListEntry* pParentEntry,
         const IconProvider& rIconProvider);
 
     /** Add the given object to a transferable object so that the object can