include/vcl/toolkit/treelist.hxx | 7 +------ vcl/source/treelist/treelist.cxx | 13 ++++--------- vcl/source/treelist/treelistbox.cxx | 4 ++-- 3 files changed, 7 insertions(+), 17 deletions(-)
New commits: commit bd68bb6f6a7b8ae8a4e3a6b4435c35080273b57a Author: Michael Weghorn <[email protected]> AuthorDate: Mon Mar 16 15:26:53 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Tue Mar 17 10:11:34 2026 +0100 vcl: No need to fully qualify base class method SvListView::GetViewData is a non-virtual base class method, so need to fully qualify the name when calling it in the subclass. Change-Id: I20011fe23954f41bb8741ee81f4e83cdeb7ce7d6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201857 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/source/treelist/treelistbox.cxx b/vcl/source/treelist/treelistbox.cxx index 4d82681bcb20..260672efd358 100644 --- a/vcl/source/treelist/treelistbox.cxx +++ b/vcl/source/treelist/treelistbox.cxx @@ -827,7 +827,7 @@ sal_uInt32 SvTreeListBox::GetLevelChildCount( const SvTreeListEntry* _pParent ) SvViewDataEntry* SvTreeListBox::GetViewDataEntry( SvTreeListEntry const * pEntry ) const { - return const_cast<SvViewDataEntry*>(SvListView::GetViewData(pEntry)); + return const_cast<SvViewDataEntry*>(GetViewData(pEntry)); } SvViewDataItem* SvTreeListBox::GetViewDataItem(SvTreeListEntry const * pEntry, SvLBoxItem const * pItem) @@ -837,7 +837,7 @@ SvViewDataItem* SvTreeListBox::GetViewDataItem(SvTreeListEntry const * pEntry, S const SvViewDataItem* SvTreeListBox::GetViewDataItem(const SvTreeListEntry* pEntry, const SvLBoxItem* pItem) const { - const SvViewDataEntry* pEntryData = SvListView::GetViewData(pEntry); + const SvViewDataEntry* pEntryData = GetViewData(pEntry); assert(pEntryData && "Entry not in View"); sal_uInt16 nItemPos = pEntry->GetPos(pItem); return &pEntryData->GetItem(nItemPos); commit db9a9e21e3aa029fef48a820fed9df2a3c201566 Author: Michael Weghorn <[email protected]> AuthorDate: Mon Mar 16 14:58:36 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Tue Mar 17 10:11:20 2026 +0100 vcl: Drop unused SvTreeList::Broadcast params Following Change-Id: Iebcd20b08102b12059bf8f4a1a6493a8a2175346 Author: Michael Weghorn <[email protected]> Date: Mon Mar 16 14:52:25 2026 +0100 vcl: Drop unused SvListView::ModelNotification params , drop the now unused params also for SvTreeList::Broadcast. Change-Id: I088612405870e38bdbde29d4964995907b50342c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201856 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/include/vcl/toolkit/treelist.hxx b/include/vcl/toolkit/treelist.hxx index 0224e54b93a3..947f4adba3f0 100644 --- a/include/vcl/toolkit/treelist.hxx +++ b/include/vcl/toolkit/treelist.hxx @@ -127,12 +127,7 @@ public: SvTreeList(SvListView&); ~SvTreeList(); - void Broadcast( - SvListAction nActionId, - SvTreeListEntry* pEntry1=nullptr, - SvTreeListEntry* pEntry2=nullptr, - sal_uInt32 nPos=0 - ); + void Broadcast(SvListAction nActionId, SvTreeListEntry* pEntry = nullptr); void EnableInvalidate( bool bEnable ); bool IsEnableInvalidate() const { return mbEnableInvalidate; } diff --git a/vcl/source/treelist/treelist.cxx b/vcl/source/treelist/treelist.cxx index 64329252d95c..e2012e4e1aad 100644 --- a/vcl/source/treelist/treelist.cxx +++ b/vcl/source/treelist/treelist.cxx @@ -41,14 +41,9 @@ SvTreeList::~SvTreeList() { } -void SvTreeList::Broadcast( - SvListAction nActionId, - SvTreeListEntry* pEntry1, - SvTreeListEntry* /* pEntry2 */, - sal_uInt32 /* nPos */ -) +void SvTreeList::Broadcast(SvListAction nActionId, SvTreeListEntry* pEntry) { - mrOwnerListView.ModelNotification(nActionId, pEntry1); + mrOwnerListView.ModelNotification(nActionId, pEntry); } // an entry is visible if all parents are expanded @@ -149,7 +144,7 @@ sal_uInt32 SvTreeList::Move(SvTreeListEntry* pSrcEntry,SvTreeListEntry* pTargetP pTargetParent = pRootItem.get(); DBG_ASSERT(pSrcEntry!=pTargetParent,"Move:Source=Target"); - Broadcast( SvListAction::MOVING, pSrcEntry, pTargetParent, nListPos ); + Broadcast(SvListAction::MOVING, pSrcEntry); if ( pSrcEntry == pTargetParent ) // You can't move an entry onto itself as the parent. Just return its @@ -232,7 +227,7 @@ sal_uInt32 SvTreeList::Move(SvTreeListEntry* pSrcEntry,SvTreeListEntry* pTargetP sal_uInt32 nRetVal = findEntryPosition(rDst, pSrcEntry); OSL_ENSURE(nRetVal == pSrcEntry->GetChildListPos(), "ListPos not valid"); - Broadcast( SvListAction::MOVED,pSrcEntry,pTargetParent,nRetVal); + Broadcast(SvListAction::MOVED, pSrcEntry); return nRetVal; }
