Merge SvListEntry and SvLBoxEntry into SvTreeListEntry.

Change-Id: I89cfc8c1288c00674fe64e791c149743d377d5ee

13 files changed, 68 insertions, 68 deletions

diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index ca4a8c5c6dbd..b2309e947da9 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -61,7 +61,7 @@ class SfxAccCfgTabListBox_Impl : public SvTabListBox
     void                        KeyInput( const KeyEvent &rKEvt );
 
 protected:
-    virtual void                InitEntry( SvLBoxEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind eButtonKind );
+    virtual void                InitEntry( SvTreeListEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind eButtonKind );
 
 public:
                                 SfxAccCfgTabListBox_Impl(
@@ -171,7 +171,7 @@ private:
     void                        Init(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& pAccMgr);
     void                        ResetConfig();
 
-    void                        CreateCustomItems( SvLBoxEntry* pEntry, const String& aCol1, const String& aCol2 );
+    void                        CreateCustomItems( SvTreeListEntry* pEntry, const String& aCol1, const String& aCol2 );
 
 public:
                                 SfxAcceleratorConfigPage( Window *pParent, const SfxItemSet& rItemSet );
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index e6cd1031d512..a695604698c1 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -83,8 +83,8 @@ class OfaACorrCheckListBox : public SvxSimpleTable
 
         sal_Bool            IsChecked(sal_uLong nPos, sal_uInt16 nCol = 0);
         void            CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, sal_Bool bChecked);
-        SvButtonState   GetCheckButtonState( SvLBoxEntry*, sal_uInt16 nCol ) const;
-        void            SetCheckButtonState( SvLBoxEntry*, sal_uInt16 nCol, SvButtonState );
+        SvButtonState   GetCheckButtonState( SvTreeListEntry*, sal_uInt16 nCol ) const;
+        void            SetCheckButtonState( SvTreeListEntry*, sal_uInt16 nCol, SvButtonState );
 };
 
 // class OfaAutocorrOptionsPage ------------------------------------------
@@ -170,7 +170,7 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage
 
         DECL_LINK(SelectHdl, OfaACorrCheckListBox*);
         DECL_LINK(EditHdl, void *);
-        SvLBoxEntry* CreateEntry(String& rTxt, sal_uInt16 nCol);
+        SvTreeListEntry* CreateEntry(String& rTxt, sal_uInt16 nCol);
 
 
         OfaSwAutoFmtOptionsPage( Window* pParent,
@@ -397,7 +397,7 @@ private:
 
     String              ChangeStringExt_Impl( sal_UCS4 );
 
-    SvLBoxEntry* CreateEntry(String& rTxt, sal_uInt16 nCol);
+    SvTreeListEntry* CreateEntry(String& rTxt, sal_uInt16 nCol);
 
                         OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet );
 public:
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 3db2a5506981..bccef1c089c1 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -179,7 +179,7 @@ private:
             com::sun::star::container::XIndexContainer >& rNewMenuBar,
         com::sun::star::uno::Reference<
             com::sun::star::lang::XSingleComponentFactory >& rFactory,
-        SvLBoxEntry *pParent = NULL );
+        SvTreeListEntry *pParent = NULL );
 
     void        ApplyMenu(
         com::sun::star::uno::Reference<
@@ -331,16 +331,16 @@ public:
 
     virtual sal_Int8    AcceptDrop( const AcceptDropEvent& rEvt );
 
-    virtual sal_Bool        NotifyAcceptDrop( SvLBoxEntry* pEntry );
+    virtual sal_Bool        NotifyAcceptDrop( SvTreeListEntry* pEntry );
 
-    virtual sal_Bool        NotifyMoving( SvLBoxEntry*, SvLBoxEntry*,
-                                      SvLBoxEntry*&, sal_uLong& );
+    virtual sal_Bool        NotifyMoving( SvTreeListEntry*, SvTreeListEntry*,
+                                      SvTreeListEntry*&, sal_uLong& );
 
-    virtual sal_Bool        NotifyCopying( SvLBoxEntry*, SvLBoxEntry*,
-                                       SvLBoxEntry*&, sal_uLong&);
+    virtual sal_Bool        NotifyCopying( SvTreeListEntry*, SvTreeListEntry*,
+                                       SvTreeListEntry*&, sal_uLong&);
 
     virtual DragDropMode    NotifyStartDrag(
-        TransferDataContainer&, SvLBoxEntry* );
+        TransferDataContainer&, SvTreeListEntry* );
 
     virtual void        DragFinished( sal_Int8 );
 
@@ -370,7 +370,7 @@ private:
     DECL_LINK(  SelectSaveInLocation, ListBox * );
     DECL_LINK(  AsyncInfoMsg, String* );
 
-    bool        SwapEntryData( SvLBoxEntry* pSourceEntry, SvLBoxEntry* pTargetEntry );
+    bool        SwapEntryData( SvTreeListEntry* pSourceEntry, SvTreeListEntry* pTargetEntry );
     void        AlignControls();
 
 protected:
@@ -428,14 +428,14 @@ protected:
 
     void            PositionContentsListBox();
 
-    SvLBoxEntry*    InsertEntry(        SvxConfigEntry* pNewEntryData,
-                                        SvLBoxEntry* pTarget = NULL,
+    SvTreeListEntry*    InsertEntry(        SvxConfigEntry* pNewEntryData,
+                                        SvTreeListEntry* pTarget = NULL,
                                         bool bFront = sal_False );
 
     void            AddSubMenusToUI(    const String& rBaseTitle,
                                         SvxConfigEntry* pParentData );
 
-    SvLBoxEntry*    InsertEntryIntoUI ( SvxConfigEntry* pNewEntryData,
+    SvTreeListEntry*    InsertEntryIntoUI ( SvxConfigEntry* pNewEntryData,
                                         sal_uLong nPos = LIST_APPEND );
 
     SvxEntries*     FindParentForChild( SvxEntries* pParentEntries,
@@ -449,14 +449,14 @@ public:
 
     SaveInData*     GetSaveInData() { return pCurrentSaveInData; }
 
-    SvLBoxEntry*    AddFunction( SvLBoxEntry* pTarget = NULL,
+    SvTreeListEntry*    AddFunction( SvTreeListEntry* pTarget = NULL,
                                  bool bFront = sal_False,
                                  bool bAllowDuplicates = sal_False );
 
     virtual void    MoveEntry( bool bMoveUp );
 
-    bool            MoveEntryData(  SvLBoxEntry* pSourceEntry,
-                                    SvLBoxEntry* pTargetEntry );
+    bool            MoveEntryData(  SvTreeListEntry* pSourceEntry,
+                                    SvTreeListEntry* pTargetEntry );
 
     sal_Bool            FillItemSet( SfxItemSet& );
     void            Reset( const SfxItemSet& );
@@ -528,7 +528,7 @@ class SvxMainMenuOrganizerDialog : public ModalDialog
     HelpButton      aHelpButton;
 
     SvxEntries*     pEntries;
-    SvLBoxEntry*    pNewMenuEntry;
+    SvTreeListEntry*    pNewMenuEntry;
     bool            bModified;
 
     void UpdateButtonStates();
@@ -556,7 +556,7 @@ class SvxToolbarEntriesListBox : public SvxMenuEntriesListBox
     SvLBoxButtonData*   m_pButtonData;
     SvxConfigPage*  pPage;
 
-    void            ChangeVisibility( SvLBoxEntry* pEntry );
+    void            ChangeVisibility( SvTreeListEntry* pEntry );
 
 protected:
 
@@ -582,10 +582,10 @@ public:
         { return m_aCheckBoxImageSizePixel; }
 
     virtual sal_Bool    NotifyMoving(
-        SvLBoxEntry*, SvLBoxEntry*, SvLBoxEntry*&, sal_uLong& );
+        SvTreeListEntry*, SvTreeListEntry*, SvTreeListEntry*&, sal_uLong& );
 
     virtual sal_Bool    NotifyCopying(
-        SvLBoxEntry*, SvLBoxEntry*, SvLBoxEntry*&, sal_uLong&);
+        SvTreeListEntry*, SvTreeListEntry*, SvTreeListEntry*&, sal_uLong&);
 
     void            KeyInput( const KeyEvent& rKeyEvent );
 };
@@ -613,7 +613,7 @@ public:
     SvxToolbarConfigPage( Window *pParent, const SfxItemSet& rItemSet );
     ~SvxToolbarConfigPage();
 
-    SvLBoxEntry*    AddFunction( SvLBoxEntry* pTarget = NULL,
+    SvTreeListEntry*    AddFunction( SvTreeListEntry* pTarget = NULL,
                                              bool bFront = sal_False,
                                              bool bAllowDuplicates = sal_True );
 
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index 52584ebc822a..d2ec922822f2 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -106,7 +106,7 @@ class SfxConfigFunctionListBox_Impl : public SvTreeListBox
 {
     friend class SfxConfigGroupListBox_Impl;
     Timer                aTimer;
-    SvLBoxEntry*         pCurEntry;
+    SvTreeListEntry*         pCurEntry;
     SfxGroupInfoArr_Impl aArr;
     SfxStylesInfo_Impl*  pStylesInfo;
 
@@ -119,7 +119,7 @@ public:
 
     void          ClearAll();
     using Window::GetHelpText;
-    String        GetHelpText( SvLBoxEntry *pEntry );
+    String        GetHelpText( SvTreeListEntry *pEntry );
     String        GetCurCommand();
     String        GetCurLabel();
     String        GetSelectedScriptURI();
@@ -163,9 +163,9 @@ class SfxConfigGroupListBox_Impl : public SvTreeListBox
     SfxStylesInfo_Impl* pStylesInfo;
 
 protected:
-    virtual void        RequestingChildren( SvLBoxEntry *pEntry);
+    virtual void        RequestingChildren( SvTreeListEntry *pEntry);
     using SvListView::Expand;
-    virtual sal_Bool        Expand( SvLBoxEntry* pParent );
+    virtual sal_Bool        Expand( SvTreeListEntry* pParent );
 
 public:
     SfxConfigGroupListBox_Impl ( Window* pParent,
@@ -179,7 +179,7 @@ public:
                              const ::rtl::OUString&                                        sModuleLongName);
     void                SetFunctionListBox( SfxConfigFunctionListBox_Impl *pBox )
                         { pFunctionListBox = pBox; }
-    void                Open( SvLBoxEntry*, sal_Bool );
+    void                Open( SvTreeListEntry*, sal_Bool );
     void                GroupSelected();
     void                SelectMacro( const SfxMacroInfoItem* );
     void                SelectMacro( const String&, const String& );
diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx
index d78e4618fe94..224b393bb493 100644
--- a/cui/source/inc/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -27,7 +27,7 @@
 #include "ControlFocusHelper.hxx"
 #include <sfx2/basedlgs.hxx>
 
-class SvLBoxEntry;
+class SvTreeListEntry;
 namespace svx
 {
     class OptHeaderTabListBox;
@@ -53,7 +53,7 @@ namespace svx
 
         HeaderBar*          pHeaderBar;
         ::svx::OptHeaderTabListBox* pPathBox;
-        SvLBoxEntry*        m_pCurEntry;
+        SvTreeListEntry*        m_pCurEntry;
         sal_uLong               m_nOldCount;
         sal_Bool                m_bModified;
 
@@ -85,7 +85,7 @@ namespace svx
             @param  _pEntry
                 The entry to remove if the entry will be changed
         */
-        void openLinkDialog(const String& _sOldName,const String& _sOldLocation,SvLBoxEntry* _pEntry = NULL);
+        void openLinkDialog(const String& _sOldName,const String& _sOldLocation,SvTreeListEntry* _pEntry = NULL);
 
 #endif
 
diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx
index eb51856f96a6..d9758f43c19c 100644
--- a/cui/source/inc/hlmarkwn.hxx
+++ b/cui/source/inc/hlmarkwn.hxx
@@ -73,9 +73,9 @@ private:
 protected:
     sal_Bool RefreshFromDoc( ::rtl::OUString aURL );
 
-    SvLBoxEntry* FindEntry ( String aStrName );
+    SvTreeListEntry* FindEntry ( String aStrName );
     void ClearTree();
-    int FillTree( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xLinks, SvLBoxEntry* pParentEntry =NULL );
+    int FillTree( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xLinks, SvTreeListEntry* pParentEntry =NULL );
 
     virtual void Move ();
 
diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx
index f1537a25a8d0..a8507a6cc2c9 100644
--- a/cui/source/inc/optdict.hxx
+++ b/cui/source/inc/optdict.hxx
@@ -151,7 +151,7 @@ private:
     void            SetDicReadonly_Impl( ::com::sun::star::uno::Reference<
                             ::com::sun::star::linguistic2::XDictionary >  &xDic );
 
-    void            RemoveDictEntry(SvLBoxEntry* pEntry);
+    void            RemoveDictEntry(SvTreeListEntry* pEntry);
     sal_uInt16          GetLBInsertPos(const String &rDicWord);
 
 #endif
diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx
index eefada0c45ff..75e4b1214063 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -40,7 +40,7 @@ namespace linguistic2{
     class XDictionaryList;
 }}}}
 
-class SvLBoxEntry;
+class SvTreeListEntry;
 class SvxLinguData_Impl;
 
 // define ----------------------------------------------------------------
@@ -75,7 +75,7 @@ class SvxEditModulesDlg : public ModalDialog
 
     SvLBoxButtonData*   pCheckButtonData;
 
-    SvLBoxEntry*    CreateEntry(String& rTxt, sal_uInt16 nCol);
+    SvTreeListEntry*    CreateEntry(String& rTxt, sal_uInt16 nCol);
 
 #ifdef _SVX_OPTLINGU_CXX
     DECL_LINK( SelectHdl_Impl, SvxCheckListBox * );
@@ -138,7 +138,7 @@ private:
     SvxLinguData_Impl*  pLinguData;
 
     SvxLinguTabPage( Window* pParent, const SfxItemSet& rCoreSet );
-    SvLBoxEntry*    CreateEntry(String& rTxt, sal_uInt16 nCol);
+    SvTreeListEntry*    CreateEntry(String& rTxt, sal_uInt16 nCol);
 
     void    AddDicBoxEntry( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx );
     sal_uLong   GetDicUserData( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx );
diff --git a/cui/source/inc/radiobtnbox.hxx b/cui/source/inc/radiobtnbox.hxx
index 21b10dcf87c0..627efe0fc3ab 100644
--- a/cui/source/inc/radiobtnbox.hxx
+++ b/cui/source/inc/radiobtnbox.hxx
@@ -41,7 +41,7 @@ public:
     SvxRadioButtonListBox(SvxSimpleTableContainer& rParent, WinBits nBits = WB_BORDER);
     ~SvxRadioButtonListBox();
 
-    void                HandleEntryChecked( SvLBoxEntry* _pEntry );
+    void                HandleEntryChecked( SvTreeListEntry* _pEntry );
 
     const Point&        GetCurMousePoint() const;
 };
diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx
index 9aef16f40e46..d1ec4d8fb752 100644
--- a/cui/source/inc/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.hxx
@@ -65,18 +65,18 @@ private:
 
     ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >
         getLangNodeFromRootNode( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& root, ::rtl::OUString& language );
-    void delUserData( SvLBoxEntry* pEntry );
+    void delUserData( SvTreeListEntry* pEntry );
 
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface  > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, ::rtl::OUString& docName );
 
 protected:
-    void                    ExpandTree( SvLBoxEntry* pRootEntry );
-    virtual void            RequestingChildren( SvLBoxEntry* pParent );
+    void                    ExpandTree( SvTreeListEntry* pRootEntry );
+    virtual void            RequestingChildren( SvTreeListEntry* pParent );
     virtual void            ExpandedHdl();
     virtual long            ExpandingHdl();
 public:
     void                    Init( const ::rtl::OUString& language );
-    void  RequestSubEntries(  SvLBoxEntry* pRootEntry, ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node,
+    void  RequestSubEntries(  SvTreeListEntry* pRootEntry, ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node,
                               ::com::sun::star::uno::Reference< com::sun::star::frame::XModel>& model  );
                     SFTreeListBox( Window* pParent, const ResId& rRes );
                     ~SFTreeListBox();
@@ -85,16 +85,16 @@ public:
 
 
 
-    SvLBoxEntry * insertEntry(String const & rText, sal_uInt16 nBitmap,
-                              SvLBoxEntry * pParent,
+    SvTreeListEntry * insertEntry(String const & rText, sal_uInt16 nBitmap,
+                              SvTreeListEntry * pParent,
                               bool bChildrenOnDemand,
                               std::auto_ptr< SFEntry > aUserData,
                               ::rtl::OUString factoryURL );
-    SvLBoxEntry * insertEntry(String const & rText, sal_uInt16 nBitmap,
-                              SvLBoxEntry * pParent,
+    SvTreeListEntry * insertEntry(String const & rText, sal_uInt16 nBitmap,
+                              SvTreeListEntry * pParent,
                               bool bChildrenOnDemand,
                               std::auto_ptr< SFEntry > aUserData );
-    void deleteTree( SvLBoxEntry * pEntry );
+    void deleteTree( SvTreeListEntry * pEntry );
     void deleteAllTree( );
 };
 
@@ -170,12 +170,12 @@ protected:
     void                CheckButtons(  ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node );
 
 
-    void        createEntry( SvLBoxEntry* pEntry );
-    void        renameEntry( SvLBoxEntry* pEntry );
-    void        deleteEntry( SvLBoxEntry* pEntry );
+    void        createEntry( SvTreeListEntry* pEntry );
+    void        renameEntry( SvTreeListEntry* pEntry );
+    void        deleteEntry( SvTreeListEntry* pEntry );
     ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >
-                getBrowseNode( SvLBoxEntry* pEntry );
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getModel( SvLBoxEntry* pEntry );
+                getBrowseNode( SvTreeListEntry* pEntry );
+    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getModel( SvTreeListEntry* pEntry );
     String      getListOfChildren( ::com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node, int depth );
     void        StoreCurrentSelection();
     void        RestorePreviousSelection();
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();
 
diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx
index c6b43a646e35..c27cf178b691 100644
--- a/cui/source/inc/thesdlg.hxx
+++ b/cui/source/inc/thesdlg.hxx
@@ -79,7 +79,7 @@ class ThesaurusAlternativesCtrl
 {
     SvxThesaurusDialog*     m_pDialog;
 
-    typedef std::map< const SvLBoxEntry *, AlternativesExtraData >  UserDataMap_t;
+    typedef std::map< const SvTreeListEntry *, AlternativesExtraData >  UserDataMap_t;
     UserDataMap_t           m_aUserData;
 
     /// disable copy ctor and assignment operator
@@ -93,11 +93,11 @@ public:
     virtual ~ThesaurusAlternativesCtrl();
 
 
-    SvLBoxEntry *   AddEntry( sal_Int32 nVal, const String &rText, bool bIsHeader );
+    SvTreeListEntry *   AddEntry( sal_Int32 nVal, const String &rText, bool bIsHeader );
 
     void            ClearExtraData();
-    void            SetExtraData( const SvLBoxEntry *pEntry, const AlternativesExtraData &rData );
-    AlternativesExtraData * GetExtraData( const SvLBoxEntry *pEntry );
+    void            SetExtraData( const SvTreeListEntry *pEntry, const AlternativesExtraData &rData );
+    AlternativesExtraData * GetExtraData( const SvTreeListEntry *pEntry );
 
     virtual void    KeyInput( const KeyEvent& rKEvt );
     virtual void    Paint( const Rectangle& rRect );
diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index 0b37efdb2561..05321b2d47f9 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -153,7 +153,7 @@ private:
     String          sTitle;
     String          sNotLoadedError;
 
-    SvLBoxEntry*    pCurrentPageEntry;
+    SvTreeListEntry*    pCurrentPageEntry;
 
     // for the ColorTabPage
     SfxItemSet*     pColorPageItemSet;