Merge SvListEntry and SvLBoxEntry into SvTreeListEntry.

Change-Id: I89cfc8c1288c00674fe64e791c149743d377d5ee

6 files changed, 23 insertions, 23 deletions

diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 3aed96675c01..fa90a38a58bf 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -596,7 +596,7 @@ DBChangeDialog_Impl::DBChangeDialog_Impl(Window* pParent, BibDataManager* pMan )
         const ::rtl::OUString* pSourceNames = rSources.getConstArray();
         for(int i = 0; i < rSources.getLength(); i++)
         {
-            SvLBoxEntry* pEntry = aSelectionLB.InsertEntry(pSourceNames[i]);
+            SvTreeListEntry* pEntry = aSelectionLB.InsertEntry(pSourceNames[i]);
             if(pSourceNames[i] == sActiveSource)
             {
                 aSelectionLB.Select(pEntry);
@@ -623,7 +623,7 @@ DBChangeDialog_Impl::~DBChangeDialog_Impl()
 String  DBChangeDialog_Impl::GetCurrentURL()const
 {
     String sRet;
-    SvLBoxEntry* pEntry = aSelectionLB.FirstSelected();
+    SvTreeListEntry* pEntry = aSelectionLB.FirstSelected();
     if(pEntry)
     {
         sRet = aSelectionLB.GetEntryText(pEntry, 0);
diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx
index e559ca678b56..4356533f4890 100644
--- a/extensions/source/propctrlr/selectlabeldialog.cxx
+++ b/extensions/source/propctrlr/selectlabeldialog.cxx
@@ -124,7 +124,7 @@ namespace pcr
 
             // insert the root
             Image aRootImage = m_aModelImages.GetImage(RID_SVXIMG_FORMS);
-            SvLBoxEntry* pRoot = m_aControlTree.InsertEntry(PcrRes(RID_STR_FORMS), aRootImage, aRootImage);
+            SvTreeListEntry* pRoot = m_aControlTree.InsertEntry(PcrRes(RID_STR_FORMS), aRootImage, aRootImage);
 
             // build the tree
             m_pInitialSelection = NULL;
@@ -162,7 +162,7 @@ namespace pcr
     OSelectLabelDialog::~OSelectLabelDialog()
     {
         // delete the entry datas of the listbox entries
-        SvLBoxEntry* pLoop = m_aControlTree.First();
+        SvTreeListEntry* pLoop = m_aControlTree.First();
         while (pLoop)
         {
             void* pData = pLoop->GetUserData();
@@ -175,7 +175,7 @@ namespace pcr
     }
 
     //------------------------------------------------------------------------
-    sal_Int32 OSelectLabelDialog::InsertEntries(const Reference< XInterface > & _xContainer, SvLBoxEntry* pContainerEntry)
+    sal_Int32 OSelectLabelDialog::InsertEntries(const Reference< XInterface > & _xContainer, SvTreeListEntry* pContainerEntry)
     {
         Reference< XIndexAccess >  xContainer(_xContainer, UNO_QUERY);
         if (!xContainer.is())
@@ -209,7 +209,7 @@ namespace pcr
                 if (xCont.is() && xCont->getCount())
                 {   // yes -> step down
                     Image aFormImage = m_aModelImages.GetImage( RID_SVXIMG_FORM );
-                    SvLBoxEntry* pCont = m_aControlTree.InsertEntry(sName, aFormImage, aFormImage, pContainerEntry);
+                    SvTreeListEntry* pCont = m_aControlTree.InsertEntry(sName, aFormImage, aFormImage, pContainerEntry);
                     sal_Int32 nContChildren = InsertEntries(xCont, pCont);
                     if (nContChildren)
                     {
@@ -236,7 +236,7 @@ namespace pcr
                 makeStringAndClear();
 
             // all requirements met -> insert
-            SvLBoxEntry* pCurrent = m_aControlTree.InsertEntry(sDisplayName, m_aRequiredControlImage, m_aRequiredControlImage, pContainerEntry);
+            SvTreeListEntry* pCurrent = m_aControlTree.InsertEntry(sDisplayName, m_aRequiredControlImage, m_aRequiredControlImage, pContainerEntry);
             pCurrent->SetUserData(new Reference< XPropertySet > (xAsSet));
             ++nChildren;
 
@@ -254,7 +254,7 @@ namespace pcr
     {
         DBG_ASSERT(pLB == &m_aControlTree, "OSelectLabelDialog::OnEntrySelected : where did this come from ?");
         (void)pLB;
-        SvLBoxEntry* pSelected = m_aControlTree.FirstSelected();
+        SvTreeListEntry* pSelected = m_aControlTree.FirstSelected();
         void* pData = pSelected ? pSelected->GetUserData() : NULL;
 
         if (pData)
@@ -279,7 +279,7 @@ namespace pcr
         {
             DBG_ASSERT(m_bHaveAssignableControl, "OSelectLabelDialog::OnNoAssignmentClicked");
             // search the first assignable entry
-            SvLBoxEntry* pSearch = m_aControlTree.First();
+            SvTreeListEntry* pSearch = m_aControlTree.First();
             while (pSearch)
             {
                 if (pSearch->GetUserData())
diff --git a/extensions/source/propctrlr/selectlabeldialog.hxx b/extensions/source/propctrlr/selectlabeldialog.hxx
index 314b7c43daed..9b193d645178 100644
--- a/extensions/source/propctrlr/selectlabeldialog.hxx
+++ b/extensions/source/propctrlr/selectlabeldialog.hxx
@@ -51,11 +51,11 @@ namespace pcr
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >   m_xControlModel;
         ::rtl::OUString m_sRequiredService;
         Image           m_aRequiredControlImage;
-        SvLBoxEntry*    m_pInitialSelection;
+        SvTreeListEntry*    m_pInitialSelection;
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >   m_xInitialLabelControl;
 
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >   m_xSelectedControl;
-        SvLBoxEntry*    m_pLastSelected;
+        SvTreeListEntry*    m_pLastSelected;
         sal_Bool        m_bHaveAssignableControl;
 
     public:
@@ -65,7 +65,7 @@ namespace pcr
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >  GetSelected() const { return m_aNoAssignment.IsChecked() ? ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > () : m_xSelectedControl; }
 
     protected:
-        sal_Int32 InsertEntries(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xContainer, SvLBoxEntry* pContainerEntry);
+        sal_Int32 InsertEntries(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xContainer, SvTreeListEntry* pContainerEntry);
 
         DECL_LINK(OnEntrySelected, SvTreeListBox*);
         DECL_LINK(OnNoAssignmentClicked, Button*);
diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx
index 8049ec877411..2da9c576864e 100644
--- a/extensions/source/propctrlr/taborder.cxx
+++ b/extensions/source/propctrlr/taborder.cxx
@@ -225,7 +225,7 @@ namespace pcr
         }
 
         // select first entry
-        SvLBoxEntry* pFirstEntry = aLB_Controls.GetEntry( 0 );
+        SvTreeListEntry* pFirstEntry = aLB_Controls.GetEntry( 0 );
         if ( pFirstEntry )
             aLB_Controls.Select( pFirstEntry );
     }
@@ -284,7 +284,7 @@ namespace pcr
 
         for (sal_uLong i=0; i < nEntryCount; i++)
         {
-            SvLBoxEntry* pEntry = aLB_Controls.GetEntry(i);
+            SvTreeListEntry* pEntry = aLB_Controls.GetEntry(i);
 
             for( sal_Int32 j=0; j<aControlModels.getLength(); j++ )
             {
@@ -326,7 +326,7 @@ namespace pcr
     }
 
     //------------------------------------------------------------------------
-    void TabOrderListBox::ModelHasMoved( SvListEntry* _pSource )
+    void TabOrderListBox::ModelHasMoved( SvTreeListEntry* _pSource )
     {
         SvTreeListBox::ModelHasMoved( _pSource );
 
@@ -346,16 +346,16 @@ namespace pcr
             // move entries
             if( nRelPos < 0 )
             {
-                SvLBoxEntry* pFirstSelected = FirstSelected();
+                SvTreeListEntry* pFirstSelected = FirstSelected();
                 if( !pFirstSelected ) return;
                 sal_uLong nFirstSelPos = GetModel()->GetAbsPos( pFirstSelected );
                 if( nFirstSelPos == 0 ) return;
 
-                SvLBoxEntry* pSelEntry = pFirstSelected;
+                SvTreeListEntry* pSelEntry = pFirstSelected;
                 while( pSelEntry )
                 {
                     sal_uLong nSelEntryPos = GetModel()->GetAbsPos( pSelEntry );
-                    SvLBoxEntry* pSelEntryPrev = GetEntry( nSelEntryPos-1 );
+                    SvTreeListEntry* pSelEntryPrev = GetEntry( nSelEntryPos-1 );
                     aSelEntryPrevText = GetEntryText( pSelEntryPrev );
                     aImage = GetExpandedEntryBmp(pSelEntryPrev);
                     void*  pData = pSelEntryPrev->GetUserData();
@@ -369,7 +369,7 @@ namespace pcr
 
             else if( nRelPos > 0 )
             {
-                SvLBoxEntry* pLastSelected = LastSelected();
+                SvTreeListEntry* pLastSelected = LastSelected();
                 if( !pLastSelected ) return;
                 sal_uLong nLastSelPos = GetModel()->GetAbsPos( pLastSelected );
 
@@ -381,11 +381,11 @@ namespace pcr
 #endif
 
 
-                SvLBoxEntry* pSelEntry = pLastSelected;
+                SvTreeListEntry* pSelEntry = pLastSelected;
                 while( pSelEntry )
                 {
                     sal_uLong nSelEntryPos = GetModel()->GetAbsPos( pSelEntry );
-                    SvLBoxEntry* pSelEntryNext = GetEntry( nSelEntryPos+1 );
+                    SvTreeListEntry* pSelEntryNext = GetEntry( nSelEntryPos+1 );
                     void* pData = pSelEntryNext->GetUserData();
 
                     aSelEntryNextText = GetEntryText( pSelEntryNext );
diff --git a/extensions/source/propctrlr/taborder.hxx b/extensions/source/propctrlr/taborder.hxx
index 6e3d96925757..58e9b34db0ba 100644
--- a/extensions/source/propctrlr/taborder.hxx
+++ b/extensions/source/propctrlr/taborder.hxx
@@ -51,7 +51,7 @@ namespace pcr
         void            MoveSelection( long nRelPos );
 
     protected:
-        virtual void    ModelHasMoved(SvListEntry* pSource );
+        virtual void    ModelHasMoved(SvTreeListEntry* pSource );
 
     private:
         using SvTreeListBox::MoveSelection;
diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx
index ba446451ae11..9a8f703d5453 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -370,7 +370,7 @@ void SaneDlg::InitFields()
                                );
     // fill OptionBox
     maOptionBox.Clear();
-    SvLBoxEntry* pParentEntry = 0;
+    SvTreeListEntry* pParentEntry = 0;
     sal_Bool bGroupRejected = sal_False;
     for( i = 1; i < mrSane.CountOptions(); i++ )
     {