Clean up confusing name clashes of non-virtual SvListView member functions

...Expand/Collapse/Select with virtual functions of the same names in derived
classes.

Change-Id: Id2c7e434cc972ac8a789c60ceaf54dc76246be12

6 files changed, 14 insertions, 22 deletions

diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index 2325aaaf6d45..7dd355e30f4e 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -161,7 +161,6 @@ class SfxConfigGroupListBox : public SvTreeListBox
 
 protected:
     virtual void        RequestingChildren( SvTreeListEntry *pEntry);
-    using SvListView::Expand;
     virtual sal_Bool        Expand( SvTreeListEntry* pParent );
 
 public:
diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx
index fc10f5434ee6..5c1c604056b8 100644
--- a/cui/source/inc/selector.hxx
+++ b/cui/source/inc/selector.hxx
@@ -158,7 +158,6 @@ private:
 protected:
     virtual void    RequestingChildren( SvTreeListEntry *pEntry);
     virtual sal_Bool    Expand( SvTreeListEntry* pParent );
-    using SvListView::Expand;
 
 public:
     SvxConfigGroupListBox(Window* pParent, WinBits nStyle);
diff --git a/include/svtools/treelist.hxx b/include/svtools/treelist.hxx
index 4d0264f1ba9c..049224d83839 100644
--- a/include/svtools/treelist.hxx
+++ b/include/svtools/treelist.hxx
@@ -254,6 +254,15 @@ class SVT_DLLPUBLIC SvListView
 protected:
     SvTreeList* pModel;
 
+    void                ExpandListEntry( SvTreeListEntry* pParent )
+    { pModel->Expand((SvListView*)this,pParent); }
+
+    void                CollapseListEntry( SvTreeListEntry* pParent )
+    { pModel->Collapse((SvListView*)this,pParent); }
+
+    sal_Bool            SelectListEntry( SvTreeListEntry* pEntry, sal_Bool bSelect )
+    { return pModel->Select((SvListView*)this,pEntry,bSelect); }
+
 public:
                         SvListView();   // Sets the Model to 0
     virtual             ~SvListView();
@@ -319,15 +328,6 @@ public:
     sal_uLong           GetChildSelectionCount( SvTreeListEntry* pParent ) const
     { return pModel->GetChildSelectionCount((SvListView*)this,pParent); }
 
-    void                Expand( SvTreeListEntry* pParent )
-    { pModel->Expand((SvListView*)this,pParent); }
-
-    void                Collapse( SvTreeListEntry* pParent )
-    { pModel->Collapse((SvListView*)this,pParent); }
-
-    sal_Bool            Select( SvTreeListEntry* pEntry, sal_Bool bSelect=sal_True )
-    { return pModel->Select((SvListView*)this,pEntry,bSelect); }
-
     // Does not call the Select Handler
     virtual void        SelectAll( sal_Bool bSelect, sal_Bool )
     { pModel->SelectAll((SvListView*)this, bSelect); }
diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx
index cc0d827ad425..a5877d0cca60 100644
--- a/include/svtools/treelistbox.hxx
+++ b/include/svtools/treelistbox.hxx
@@ -524,9 +524,6 @@ public:
     virtual bool set_property(const OString &rKey, const OString &rValue);
 
 protected:
-    using SvListView::Expand;
-    using SvListView::Collapse;
-    using SvListView::Select;
     using SvListView::SelectAll;
 
     SVT_DLLPRIVATE short        GetHeightOffset( const Image& rBmp, Size& rLogicSize);
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 9408012b9ee6..d194ebe04921 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -2499,7 +2499,7 @@ sal_Bool SvTreeListBox::Expand( SvTreeListEntry* pParent )
         if( ExpandingHdl() )
         {
             bExpanded = sal_True;
-            SvListView::Expand( pParent );
+            ExpandListEntry( pParent );
             pImp->EntryExpanded( pParent );
             pHdlEntry = pParent;
             ExpandedHdl();
@@ -2537,7 +2537,7 @@ sal_Bool SvTreeListBox::Collapse( SvTreeListEntry* pParent )
     {
         bCollapsed = sal_True;
         pImp->CollapsingEntry( pParent );
-        SvListView::Collapse( pParent );
+        CollapseListEntry( pParent );
         pImp->EntryCollapsed( pParent );
         pHdlEntry = pParent;
         ExpandedHdl();
@@ -2556,7 +2556,7 @@ sal_Bool SvTreeListBox::Select( SvTreeListEntry* pEntry, sal_Bool bSelect )
 {
     DBG_CHKTHIS(SvTreeListBox,0);
     DBG_ASSERT(pEntry,"Select: Null-Ptr");
-    sal_Bool bRetVal = SvListView::Select( pEntry, bSelect );
+    sal_Bool bRetVal = SelectListEntry( pEntry, bSelect );
     DBG_ASSERT(IsSelected(pEntry)==bSelect,"Select failed");
     if( bRetVal )
     {
@@ -2819,9 +2819,9 @@ void SvTreeListBox::EditItemText( SvTreeListEntry* pEntry, SvLBoxString* pItem,
     if( IsSelected( pEntry ))
     {
         pImp->ShowCursor( false );
-        SvListView::Select( pEntry, sal_False );
+        SelectListEntry( pEntry, sal_False );
         PaintEntry( pEntry );
-        SvListView::Select( pEntry, sal_True );
+        SelectListEntry( pEntry, sal_True );
         pImp->ShowCursor( true );
     }
     pEdEntry = pEntry;
diff --git a/sw/source/ui/inc/conttree.hxx b/sw/source/ui/inc/conttree.hxx
index 3029f69444dd..254f13c61413 100644
--- a/sw/source/ui/inc/conttree.hxx
+++ b/sw/source/ui/inc/conttree.hxx
@@ -98,9 +98,6 @@ class SwContentTree : public SvTreeListBox
 
     using SvTreeListBox::ExecuteDrop;
     using SvTreeListBox::EditEntry;
-    using SvListView::Expand;
-    using SvListView::Collapse;
-    using SvListView::Select;
 
 protected:
     virtual void    RequestHelp( const HelpEvent& rHEvt );