diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-25 15:48:53 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-25 15:51:21 +0100 |
| commit | 199705b37b129c7e215ea9a5288f9cefbb55a81a (patch) | |
| tree | 49b7403800c65dc1c30aacc65b982d52eebc6c37 /include | |
| parent | a59e5ecd611ddd41cec6d9c78773f55887df67e6 (diff) | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/svtools/treelist.hxx | 18 | ||||
| -rw-r--r-- | include/svtools/treelistbox.hxx | 3 |
2 files changed, 9 insertions, 12 deletions
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); |