diff options
author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-10-19 15:20:10 +0200 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-10-19 15:25:28 +0200 |
commit | 49e5e750b51ae8b6ff5f8f98beedea1b4737c2fc (patch) | |
tree | 2bbc90e9fad34636176c2b4bb6530f7f833d2de1 /svtools | |
parent | 4bc089dff22765614e0cb988a88ea71706ad3f00 (diff) |
Merge SvLBoxTreeList and SvTreeList.
Change-Id: I318ff6f1009b1aaa7d0bd3abb250f92fb51a21cd
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/inc/svtools/treelistbox.hxx | 24 | ||||
-rw-r--r-- | svtools/source/contnr/svimpbox.cxx | 2 | ||||
-rw-r--r-- | svtools/source/contnr/treelistbox.cxx | 75 | ||||
-rw-r--r-- | svtools/source/inc/svimpbox.hxx | 8 |
4 files changed, 13 insertions, 96 deletions
diff --git a/svtools/inc/svtools/treelistbox.hxx b/svtools/inc/svtools/treelistbox.hxx index ceb7497cac2c..75c933b2bd54 100644 --- a/svtools/inc/svtools/treelistbox.hxx +++ b/svtools/inc/svtools/treelistbox.hxx @@ -198,24 +198,6 @@ public: virtual void Clone( SvLBoxItem* pSource ) = 0; }; -class SVT_DLLPUBLIC SvLBoxTreeList : public SvTreeList -{ -public: - SvTreeListEntry* First() const; - SvTreeListEntry* Next( SvTreeListEntry* pEntry, sal_uInt16* pDepth=0 ) const; - SvTreeListEntry* Prev( SvTreeListEntry* pEntry, sal_uInt16* pDepth=0 ) const; - SvTreeListEntry* Last() const; - SvTreeListEntry* Clone( SvTreeListEntry* pEntry, sal_uLong& nCloneCount ) const; - SvTreeListEntry* GetEntry( SvTreeListEntry* pParent, sal_uLong nPos ) const; - SvTreeListEntry* GetEntry( sal_uLong nRootPos ) const; - SvTreeListEntry* GetParent( SvTreeListEntry* pEntry ) const; - SvTreeListEntry* FirstChild( SvTreeListEntry* pParent ) const; - SvTreeListEntry* NextSibling( SvTreeListEntry* pEntry ) const; - SvTreeListEntry* PrevSibling( SvTreeListEntry* pEntry ) const; - SvTreeListEntry* LastSibling( SvTreeListEntry* pEntry ) const; - SvTreeListEntry* GetEntryAtAbsPos( sal_uLong nAbsPos ) const; -}; - // ********************************************************************* // ****************************** SvTreeListBox ******************************* // ********************************************************************* @@ -303,7 +285,7 @@ protected: sal_uInt16 nCurEntrySelPos; private: - void SetBaseModel(SvLBoxTreeList* pNewModel); + void SetBaseModel(SvTreeList* pNewModel); DECL_DLLPRIVATE_LINK( CheckButtonClick, SvLBoxButtonData * ); DECL_DLLPRIVATE_LINK( TextEditEndedHdl_Impl, void * ); @@ -392,9 +374,9 @@ public: SvTreeListBox( Window* pParent, const ResId& rResId ); ~SvTreeListBox(); - SvLBoxTreeList* GetModel() const { return (SvLBoxTreeList*)pModel; } + SvTreeList* GetModel() const { return (SvTreeList*)pModel; } using SvListView::SetModel; - void SetModel(SvLBoxTreeList* pNewModel); + void SetModel(SvTreeList* pNewModel); sal_uInt16 IsA(); sal_uLong GetEntryCount() const {return pModel->GetEntryCount();} diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index 3c3abbc6c11a..83b344ec3788 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -51,7 +51,7 @@ Image* SvImpLBox::s_pDefCollapsed = NULL; Image* SvImpLBox::s_pDefExpanded = NULL; sal_Int32 SvImpLBox::s_nImageRefCount = 0; -SvImpLBox::SvImpLBox( SvTreeListBox* pLBView, SvLBoxTreeList* pLBTree, WinBits nWinStyle) : +SvImpLBox::SvImpLBox( SvTreeListBox* pLBView, SvTreeList* pLBTree, WinBits nWinStyle) : aVerSBar( pLBView, WB_DRAG | WB_VSCROLL ), aHorSBar( pLBView, WB_DRAG | WB_HSCROLL ), diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index 8bce6bb4918a..6442181c445a 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -385,71 +385,6 @@ SvViewDataItem::~SvViewDataItem() DBG_DTOR(SvViewDataItem,0); } -SvTreeListEntry* SvLBoxTreeList::First() const -{ - return (SvTreeListEntry*)SvTreeList::First(); -} - -SvTreeListEntry* SvLBoxTreeList::Next( SvTreeListEntry* pEntry, sal_uInt16* pDepth ) const -{ - return (SvTreeListEntry*)SvTreeList::Next(pEntry,pDepth); -} - -SvTreeListEntry* SvLBoxTreeList::Prev( SvTreeListEntry* pEntry, sal_uInt16* pDepth ) const -{ - return (SvTreeListEntry*)SvTreeList::Prev(pEntry,pDepth); -} - -SvTreeListEntry* SvLBoxTreeList::Last() const -{ - return (SvTreeListEntry*)SvTreeList::Last(); -} - -SvTreeListEntry* SvLBoxTreeList::Clone( SvTreeListEntry* pEntry, sal_uLong& nCloneCount ) const -{ - return (SvTreeListEntry*)SvTreeList::Clone(pEntry,nCloneCount); -} - -SvTreeListEntry* SvLBoxTreeList::GetEntry( SvTreeListEntry* pParent, sal_uLong nPos ) const -{ - return (SvTreeListEntry*)SvTreeList::GetEntry(pParent,nPos); -} - -SvTreeListEntry* SvLBoxTreeList::GetEntry( sal_uLong nRootPos ) const -{ - return (SvTreeListEntry*)SvTreeList::GetEntry(nRootPos); -} - -SvTreeListEntry* SvLBoxTreeList::GetParent( SvTreeListEntry* pEntry ) const -{ - return (SvTreeListEntry*)SvTreeList::GetParent(pEntry); -} - -SvTreeListEntry* SvLBoxTreeList::FirstChild( SvTreeListEntry* pParent ) const -{ - return (SvTreeListEntry*)SvTreeList::FirstChild(pParent); -} - -SvTreeListEntry* SvLBoxTreeList::NextSibling( SvTreeListEntry* pEntry ) const -{ - return (SvTreeListEntry*)SvTreeList::NextSibling(pEntry); -} - -SvTreeListEntry* SvLBoxTreeList::PrevSibling( SvTreeListEntry* pEntry ) const -{ - return (SvTreeListEntry*)SvTreeList::PrevSibling(pEntry); -} - -SvTreeListEntry* SvLBoxTreeList::LastSibling( SvTreeListEntry* pEntry ) const -{ - return (SvTreeListEntry*)SvTreeList::LastSibling(pEntry); -} - -SvTreeListEntry* SvLBoxTreeList::GetEntryAtAbsPos( sal_uLong nAbsPos ) const -{ - return (SvTreeListEntry*)SvTreeList::GetEntryAtAbsPos( nAbsPos); -} - // *************************************************************** // class SvLBoxViewData // *************************************************************** @@ -503,7 +438,7 @@ SvTreeListBox::SvTreeListBox(Window* pParent, WinBits nWinStyle) : nImpFlags = 0; pTargetEntry = 0; nDragDropMode = 0; - SvLBoxTreeList* pTempModel = new SvLBoxTreeList; + SvTreeList* pTempModel = new SvTreeList; pTempModel->SetRefCount( 0 ); SetBaseModel(pTempModel); pModel->SetCloneLink( LINK(this, SvTreeListBox, CloneHdl_Impl )); @@ -531,7 +466,7 @@ SvTreeListBox::SvTreeListBox(Window* pParent, const ResId& rResId) : nImpFlags = 0; nDragOptions = DND_ACTION_COPYMOVE | DND_ACTION_LINK; nDragDropMode = 0; - SvLBoxTreeList* pTempModel = new SvLBoxTreeList; + SvTreeList* pTempModel = new SvTreeList; pTempModel->SetRefCount( 0 ); SetBaseModel(pTempModel); pModel->InsertView( this ); @@ -1589,14 +1524,14 @@ void SvTreeListBox::SetExtendedWinBits( ExtendedWinBits _nBits ) pImp->SetExtendedWindowBits( _nBits ); } -void SvTreeListBox::SetModel( SvLBoxTreeList* pNewModel ) +void SvTreeListBox::SetModel( SvTreeList* pNewModel ) { DBG_CHKTHIS(SvTreeListBox,0); pImp->SetModel( pNewModel ); SetBaseModel(pNewModel); } -void SvTreeListBox::SetBaseModel( SvLBoxTreeList* pNewModel ) +void SvTreeListBox::SetBaseModel( SvTreeList* pNewModel ) { // does the CleanUp SvListView::SetModel( pNewModel ); @@ -1612,7 +1547,7 @@ void SvTreeListBox::SetBaseModel( SvLBoxTreeList* pNewModel ) void SvTreeListBox::DisconnectFromModel() { DBG_CHKTHIS(SvTreeListBox,0); - SvLBoxTreeList* pNewModel = new SvLBoxTreeList; + SvTreeList* pNewModel = new SvTreeList; pNewModel->SetRefCount( 0 ); // else this will never be deleted SvListView::SetModel( pNewModel ); diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx index 998b8da9bf55..673a5ccc54d3 100644 --- a/svtools/source/inc/svimpbox.hxx +++ b/svtools/source/inc/svimpbox.hxx @@ -40,7 +40,7 @@ class SvTreeListBox; class Point; -class SvLBoxTreeList; +class SvTreeList; class SvImpLBox; class SvTreeListEntry; class SvLBoxTab; @@ -96,7 +96,7 @@ friend class ImpLBSelEng; friend class SvTreeListBox; private: SvTreeListBox* pView; - SvLBoxTreeList* pTree; + SvTreeList* pTree; SvTreeListEntry* pCursor; SvTreeListEntry* pStartEntry; SvTreeListEntry* pAnchor; @@ -255,14 +255,14 @@ private: inline void SetChildrenNotTransient() { bAreChildrenTransient = sal_False; } public: - SvImpLBox( SvTreeListBox* pView, SvLBoxTreeList*, WinBits nWinStyle ); + SvImpLBox( SvTreeListBox* pView, SvTreeList*, WinBits nWinStyle ); ~SvImpLBox(); void Clear(); void SetStyle( WinBits i_nWinStyle ); void SetExtendedWindowBits( ExtendedWinBits _nBits ); ExtendedWinBits GetExtendedWindowBits() const { return nExtendedWinBits; } - void SetModel( SvLBoxTreeList* pModel ) { pTree = pModel;} + void SetModel( SvTreeList* pModel ) { pTree = pModel;} void EntryInserted( SvTreeListEntry*); void RemovingEntry( SvTreeListEntry* pEntry ); |