mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Id2c7e434cc972ac8a789c60ceaf54dc76246be12
This commit is contained in:
Stephan Bergmann
2014-02-25 15:48:53 +01:00
parent a59e5ecd61
commit 199705b37b
6 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cui/source/inc/cfgutil.hxx
View File

@@ -161,7 +161,6 @@ class SfxConfigGroupListBox : public SvTreeListBox
protected: protected:
virtual void RequestingChildren( SvTreeListEntry *pEntry); virtual void RequestingChildren( SvTreeListEntry *pEntry);
using SvListView::Expand;
virtual sal_Bool Expand( SvTreeListEntry* pParent ); virtual sal_Bool Expand( SvTreeListEntry* pParent );
public: public:

1
cui/source/inc/selector.hxx
View File

@@ -158,7 +158,6 @@ private:
protected: protected:
virtual void RequestingChildren( SvTreeListEntry *pEntry); virtual void RequestingChildren( SvTreeListEntry *pEntry);
virtual sal_Bool Expand( SvTreeListEntry* pParent ); virtual sal_Bool Expand( SvTreeListEntry* pParent );
using SvListView::Expand;
public: public:
SvxConfigGroupListBox(Window* pParent, WinBits nStyle); SvxConfigGroupListBox(Window* pParent, WinBits nStyle);

18
include/svtools/treelist.hxx
View File

@@ -254,6 +254,15 @@ class SVT_DLLPUBLIC SvListView
protected: protected:
SvTreeList* pModel; 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: public:
SvListView(); // Sets the Model to 0 SvListView(); // Sets the Model to 0
virtual ~SvListView(); virtual ~SvListView();
@@ -319,15 +328,6 @@ public:
sal_uLong GetChildSelectionCount( SvTreeListEntry* pParent ) const sal_uLong GetChildSelectionCount( SvTreeListEntry* pParent ) const
{ return pModel->GetChildSelectionCount((SvListView*)this,pParent); } { 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 // Does not call the Select Handler
virtual void SelectAll( sal_Bool bSelect, sal_Bool ) virtual void SelectAll( sal_Bool bSelect, sal_Bool )
{ pModel->SelectAll((SvListView*)this, bSelect); } { pModel->SelectAll((SvListView*)this, bSelect); }

3
include/svtools/treelistbox.hxx
View File

@@ -524,9 +524,6 @@ public:
virtual bool set_property(const OString &rKey, const OString &rValue); virtual bool set_property(const OString &rKey, const OString &rValue);
protected: protected:
using SvListView::Expand;
using SvListView::Collapse;
using SvListView::Select;
using SvListView::SelectAll; using SvListView::SelectAll;
SVT_DLLPRIVATE short GetHeightOffset( const Image& rBmp, Size& rLogicSize); SVT_DLLPRIVATE short GetHeightOffset( const Image& rBmp, Size& rLogicSize);

10
svtools/source/contnr/treelistbox.cxx
View File

@@ -2499,7 +2499,7 @@ sal_Bool SvTreeListBox::Expand( SvTreeListEntry* pParent )
if( ExpandingHdl() ) if( ExpandingHdl() )
{ {
bExpanded = sal_True; bExpanded = sal_True;
SvListView::Expand( pParent ); ExpandListEntry( pParent );
pImp->EntryExpanded( pParent ); pImp->EntryExpanded( pParent );
pHdlEntry = pParent; pHdlEntry = pParent;
ExpandedHdl(); ExpandedHdl();
@@ -2537,7 +2537,7 @@ sal_Bool SvTreeListBox::Collapse( SvTreeListEntry* pParent )
{ {
bCollapsed = sal_True; bCollapsed = sal_True;
pImp->CollapsingEntry( pParent ); pImp->CollapsingEntry( pParent );
SvListView::Collapse( pParent ); CollapseListEntry( pParent );
pImp->EntryCollapsed( pParent ); pImp->EntryCollapsed( pParent );
pHdlEntry = pParent; pHdlEntry = pParent;
ExpandedHdl(); ExpandedHdl();
@@ -2556,7 +2556,7 @@ sal_Bool SvTreeListBox::Select( SvTreeListEntry* pEntry, sal_Bool bSelect )
{ {
DBG_CHKTHIS(SvTreeListBox,0); DBG_CHKTHIS(SvTreeListBox,0);
DBG_ASSERT(pEntry,"Select: Null-Ptr"); 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"); DBG_ASSERT(IsSelected(pEntry)==bSelect,"Select failed");
if( bRetVal ) if( bRetVal )
{ {
@@ -2819,9 +2819,9 @@ void SvTreeListBox::EditItemText( SvTreeListEntry* pEntry, SvLBoxString* pItem,
if( IsSelected( pEntry )) if( IsSelected( pEntry ))
{ {
pImp->ShowCursor( false ); pImp->ShowCursor( false );
SvListView::Select( pEntry, sal_False ); SelectListEntry( pEntry, sal_False );
PaintEntry( pEntry ); PaintEntry( pEntry );
SvListView::Select( pEntry, sal_True ); SelectListEntry( pEntry, sal_True );
pImp->ShowCursor( true ); pImp->ShowCursor( true );
} }
pEdEntry = pEntry; pEdEntry = pEntry;

3
sw/source/ui/inc/conttree.hxx
View File

@@ -98,9 +98,6 @@ class SwContentTree : public SvTreeListBox
using SvTreeListBox::ExecuteDrop; using SvTreeListBox::ExecuteDrop;
using SvTreeListBox::EditEntry; using SvTreeListBox::EditEntry;
using SvListView::Expand;
using SvListView::Collapse;
using SvListView::Select;
protected: protected:
virtual void RequestHelp( const HelpEvent& rHEvt ); virtual void RequestHelp( const HelpEvent& rHEvt );