Merge SvListEntry and SvLBoxEntry into SvTreeListEntry.

Change-Id: I89cfc8c1288c00674fe64e791c149743d377d5ee

1 files changed, 9 insertions, 9 deletions

diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx
index c2828114c164..c4a8c7ec69d8 100644
--- a/cui/source/inc/selector.hxx
+++ b/cui/source/inc/selector.hxx
@@ -93,9 +93,9 @@ class SvxConfigFunctionListBox_Impl : public SvTreeListBox
 {
 friend class SvxConfigGroupListBox_Impl;
     Timer                           aTimer;
-    SvLBoxEntry*                    pCurEntry;
+    SvTreeListEntry*                    pCurEntry;
     SvxGroupInfoArr_Impl            aArr;
-    SvLBoxEntry*                    m_pDraggingEntry;
+    SvTreeListEntry*                    m_pDraggingEntry;
 
     DECL_LINK(TimerHdl, void *);
     virtual void                    MouseMove( const MouseEvent& rMEvt );
@@ -104,16 +104,16 @@ public:
                                     SvxConfigFunctionListBox_Impl( Window*, const ResId& );
                                     ~SvxConfigFunctionListBox_Impl();
     void                            ClearAll();
-    String                          GetHelpText( SvLBoxEntry *pEntry );
+    String                          GetHelpText( SvTreeListEntry *pEntry );
     using Window::GetHelpText;
-    SvLBoxEntry*                    GetLastSelectedEntry();
+    SvTreeListEntry*                    GetLastSelectedEntry();
     void                            FunctionSelected();
 
     // drag n drop methods
     virtual sal_Int8    AcceptDrop( const AcceptDropEvent& rEvt );
 
     virtual DragDropMode    NotifyStartDrag(
-        TransferDataContainer&, SvLBoxEntry* );
+        TransferDataContainer&, SvTreeListEntry* );
 
     virtual void        DragFinished( sal_Int8 );
 };
@@ -152,13 +152,13 @@ class SvxConfigGroupListBox_Impl : public SvTreeListBox
 private:
     void    fillScriptList(
         const ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& _rxRootNode,
-        SvLBoxEntry* _pParentEntry,
+        SvTreeListEntry* _pParentEntry,
         bool _bCheapChildrenOnDemand
     );
 
 protected:
-    virtual void    RequestingChildren( SvLBoxEntry *pEntry);
-    virtual sal_Bool    Expand( SvLBoxEntry* pParent );
+    virtual void    RequestingChildren( SvTreeListEntry *pEntry);
+    virtual sal_Bool    Expand( SvTreeListEntry* pParent );
     using SvListView::Expand;
 
 public:
@@ -172,7 +172,7 @@ public:
             ~SvxConfigGroupListBox_Impl();
 
     void    Init();
-    void    Open( SvLBoxEntry*, sal_Bool );
+    void    Open( SvTreeListEntry*, sal_Bool );
     void    ClearAll();
     void    GroupSelected();