Merge SvListEntry and SvLBoxEntry into SvTreeListEntry.

Change-Id: I89cfc8c1288c00674fe64e791c149743d377d5ee

4 files changed, 22 insertions, 22 deletions

diff --git a/formula/inc/formula/IFunctionDescription.hxx b/formula/inc/formula/IFunctionDescription.hxx
index 0682f68d2075..c876ccad7f56 100644
--- a/formula/inc/formula/IFunctionDescription.hxx
+++ b/formula/inc/formula/IFunctionDescription.hxx
@@ -28,7 +28,7 @@
 #include <com/sun/star/sheet/XFormulaParser.hpp>
 #include <com/sun/star/sheet/XFormulaOpCodeMapper.hpp>
 
-class SvLBoxEntry;
+class SvTreeListEntry;
 
 namespace formula
 {
@@ -115,11 +115,11 @@ namespace formula
     {
     public:
         IStructHelper(){}
-        virtual SvLBoxEntry*    InsertEntry(const XubString& rText, SvLBoxEntry* pParent,
+        virtual SvTreeListEntry*    InsertEntry(const XubString& rText, SvTreeListEntry* pParent,
                                 sal_uInt16 nFlag,sal_uLong nPos=0,IFormulaToken* pScToken=NULL) = 0;
 
-        virtual String          GetEntryText(SvLBoxEntry* pEntry) const = 0;
-        virtual SvLBoxEntry*    GetParent(SvLBoxEntry* pEntry) const = 0;
+        virtual String          GetEntryText(SvTreeListEntry* pEntry) const = 0;
+        virtual SvTreeListEntry*    GetParent(SvTreeListEntry* pEntry) const = 0;
 
     protected:
         ~IStructHelper() {}
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 03f41dc6b914..409059335c30 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -98,7 +98,7 @@ namespace formula
         xub_StrLen      GetFunctionPos(xub_StrLen nPos);
         void            ClearAllParas();
 
-        void            MakeTree(IStructHelper* _pTree,SvLBoxEntry* pParent,FormulaToken* _pToken,long Count);
+        void            MakeTree(IStructHelper* _pTree,SvTreeListEntry* pParent,FormulaToken* _pToken,long Count);
         void            fillTree(IStructHelper* _pTree);
         void            UpdateTokenArray( const String& rStrExp);
         String          RepairFormula(const String& aFormula);
@@ -648,7 +648,7 @@ sal_Bool FormulaDlg_Impl::CalcStruct( const String& rStrExp)
 }
 
 // -----------------------------------------------------------------------------
-void FormulaDlg_Impl::MakeTree(IStructHelper* _pTree,SvLBoxEntry* pParent,FormulaToken* _pToken,long Count)
+void FormulaDlg_Impl::MakeTree(IStructHelper* _pTree,SvTreeListEntry* pParent,FormulaToken* _pToken,long Count)
 {
     if( _pToken != NULL && Count > 0 )
     {
@@ -670,7 +670,7 @@ void FormulaDlg_Impl::MakeTree(IStructHelper* _pTree,SvLBoxEntry* pParent,Formul
 
             if ( nParas > 0 )
             {
-                SvLBoxEntry* pEntry;
+                SvTreeListEntry* pEntry;
 
                 String aTest=_pTree->GetEntryText(pParent);
 
diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx
index 280a7b8c8d7d..dfdaa5f1e108 100644
--- a/formula/source/ui/dlg/structpg.cxx
+++ b/formula/source/ui/dlg/structpg.cxx
@@ -43,12 +43,12 @@ StructListBox::StructListBox(Window* pParent, const ResId& rResId ):
     SetFont( aFont );
 }
 
-SvLBoxEntry* StructListBox::InsertStaticEntry(
+SvTreeListEntry* StructListBox::InsertStaticEntry(
         const XubString& rText,
         const Image& rEntryImg,
-        SvLBoxEntry* pParent, sal_uLong nPos, IFormulaToken* pToken )
+        SvTreeListEntry* pParent, sal_uLong nPos, IFormulaToken* pToken )
 {
-    SvLBoxEntry* pEntry = InsertEntry( rText, rEntryImg, rEntryImg, pParent, sal_False, nPos, pToken );
+    SvTreeListEntry* pEntry = InsertEntry( rText, rEntryImg, rEntryImg, pParent, sal_False, nPos, pToken );
     return pEntry;
 }
 
@@ -108,12 +108,12 @@ void StructPage::ClearStruct()
     aTlbStruct.Clear();
 }
 
-SvLBoxEntry* StructPage::InsertEntry( const XubString& rText, SvLBoxEntry* pParent,
+SvTreeListEntry* StructPage::InsertEntry( const XubString& rText, SvTreeListEntry* pParent,
                                        sal_uInt16 nFlag,sal_uLong nPos,IFormulaToken* pIFormulaToken)
 {
     aTlbStruct.SetActiveFlag( sal_False );
 
-    SvLBoxEntry* pEntry = NULL;
+    SvTreeListEntry* pEntry = NULL;
     switch( nFlag )
     {
         case STRUCT_FOLDER:
@@ -132,7 +132,7 @@ SvLBoxEntry* StructPage::InsertEntry( const XubString& rText, SvLBoxEntry* pPare
     return pEntry;
 }
 
-String StructPage::GetEntryText(SvLBoxEntry* pEntry) const
+String StructPage::GetEntryText(SvTreeListEntry* pEntry) const
 {
     String aString;
     if(pEntry!=NULL)
@@ -140,11 +140,11 @@ String StructPage::GetEntryText(SvLBoxEntry* pEntry) const
     return  aString;
 }
 
-SvLBoxEntry* StructPage::GetParent(SvLBoxEntry* pEntry) const
+SvTreeListEntry* StructPage::GetParent(SvTreeListEntry* pEntry) const
 {
     return aTlbStruct.GetParent(pEntry);
 }
-IFormulaToken* StructPage::GetFunctionEntry(SvLBoxEntry* pEntry)
+IFormulaToken* StructPage::GetFunctionEntry(SvTreeListEntry* pEntry)
 {
     if(pEntry!=NULL)
     {
@@ -170,7 +170,7 @@ IMPL_LINK( StructPage, SelectHdl, SvTreeListBox*, pTlb )
     {
         if(pTlb==&aTlbStruct)
         {
-            SvLBoxEntry*    pCurEntry=aTlbStruct.GetCurEntry();
+            SvTreeListEntry*    pCurEntry=aTlbStruct.GetCurEntry();
             if(pCurEntry!=NULL)
             {
                 pSelectedToken=(IFormulaToken *)pCurEntry->GetUserData();
diff --git a/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx
index 151c57e1c088..ec48d27a3510 100644
--- a/formula/source/ui/dlg/structpg.hxx
+++ b/formula/source/ui/dlg/structpg.hxx
@@ -51,10 +51,10 @@ public:
                     StructListBox(Window* pParent, const ResId& rResId );
 
     /** Inserts an entry with static image (no difference between collapsed/expanded). */
-    SvLBoxEntry*    InsertStaticEntry(
+    SvTreeListEntry*    InsertStaticEntry(
                         const XubString& rText,
                         const Image& rEntryImg,
-                        SvLBoxEntry* pParent = NULL,
+                        SvTreeListEntry* pParent = NULL,
                         sal_uLong nPos = LIST_APPEND,
                         IFormulaToken* pToken = NULL );
 
@@ -86,18 +86,18 @@ private:
 
 protected:
 
-    IFormulaToken*      GetFunctionEntry(SvLBoxEntry* pEntry);
+    IFormulaToken*      GetFunctionEntry(SvTreeListEntry* pEntry);
 
 public:
 
                     StructPage( Window* pParent);
 
     void            ClearStruct();
-    virtual SvLBoxEntry*    InsertEntry(const XubString& rText, SvLBoxEntry* pParent,
+    virtual SvTreeListEntry*    InsertEntry(const XubString& rText, SvTreeListEntry* pParent,
                                 sal_uInt16 nFlag,sal_uLong nPos=0,IFormulaToken* pScToken=NULL);
 
-    virtual String          GetEntryText(SvLBoxEntry* pEntry) const;
-    virtual SvLBoxEntry*    GetParent(SvLBoxEntry* pEntry) const;
+    virtual String          GetEntryText(SvTreeListEntry* pEntry) const;
+    virtual SvTreeListEntry*    GetParent(SvTreeListEntry* pEntry) const;
 
     void            SetSelectionHdl( const Link& rLink ) { aSelLink = rLink; }
     const Link&     GetSelectionHdl() const { return aSelLink; }