From 7412d2de85344efac4de77bb9df08f5854ba1f17 Mon Sep 17 00:00:00 2001 From: Michael Weghorn Date: Sat, 21 Mar 2026 23:41:07 +0100 Subject: [PATCH] vcl: Pass SvLBoxItem::CalcWidth param by ref ... instead of by pointer. Change-Id: I2b6ee78b6c2102cdbeb5154171b4d2efed7142a7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/202345 Reviewed-by: Michael Weghorn Tested-by: Jenkins --- include/vcl/toolkit/svlbitm.hxx | 2 +- include/vcl/toolkit/treelistbox.hxx | 2 +- vcl/source/treelist/svlbitm.cxx | 4 ++-- vcl/source/treelist/treelistbox.cxx | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/vcl/toolkit/svlbitm.hxx b/include/vcl/toolkit/svlbitm.hxx index fc33709d3544..37f7f34ab2c3 100644 --- a/include/vcl/toolkit/svlbitm.hxx +++ b/include/vcl/toolkit/svlbitm.hxx @@ -118,7 +118,7 @@ public: SvTreeListEntry* pEntry, SvViewDataItem* pViewData = nullptr) override; - virtual int CalcWidth(const SvTreeListBox* pView) const override; + virtual int CalcWidth(const SvTreeListBox& rView) const override; void Align(TxtAlign eAlign) { meAlign = eAlign; } diff --git a/include/vcl/toolkit/treelistbox.hxx b/include/vcl/toolkit/treelistbox.hxx index 68f9af86340d..7c0ca374ba6b 100644 --- a/include/vcl/toolkit/treelistbox.hxx +++ b/include/vcl/toolkit/treelistbox.hxx @@ -125,7 +125,7 @@ public: SvLBoxItem(); virtual ~SvLBoxItem(); virtual SvLBoxItemType GetType() const = 0; - virtual int CalcWidth(const SvTreeListBox* pView) const; + virtual int CalcWidth(const SvTreeListBox& rView) const; int GetWidth(const SvTreeListBox& rView, const SvTreeListEntry* pEntry) const; int GetWidth(const SvTreeListBox& rView, const SvViewDataEntry* pData, sal_uInt16 nItemPos) const; diff --git a/vcl/source/treelist/svlbitm.cxx b/vcl/source/treelist/svlbitm.cxx index c228aae066d7..bbb65d37b8b7 100644 --- a/vcl/source/treelist/svlbitm.cxx +++ b/vcl/source/treelist/svlbitm.cxx @@ -301,9 +301,9 @@ void SvLBoxString::InitViewData( pView->GetOutDev()->Pop(); } -int SvLBoxString::CalcWidth(const SvTreeListBox* pView) const +int SvLBoxString::CalcWidth(const SvTreeListBox& rView) const { - return pView->GetTextWidth(maText); + return rView.GetTextWidth(maText); } // *************************************************************** diff --git a/vcl/source/treelist/treelistbox.cxx b/vcl/source/treelist/treelistbox.cxx index 69b385d93d7e..73d3ebc42f09 100644 --- a/vcl/source/treelist/treelistbox.cxx +++ b/vcl/source/treelist/treelistbox.cxx @@ -354,7 +354,7 @@ int SvLBoxItem::GetWidth(const SvTreeListBox& rView, const SvTreeListEntry* pEnt int nWidth = pViewData->mnWidth; if (nWidth == -1) { - nWidth = CalcWidth(&rView); + nWidth = CalcWidth(rView); const_cast(pViewData)->mnWidth = nWidth; } return nWidth; @@ -373,7 +373,7 @@ int SvLBoxItem::GetWidth(const SvTreeListBox& rView, const SvViewDataEntry* pDat int nWidth = rIData.mnWidth; if (nWidth == -1) { - nWidth = CalcWidth(&rView); + nWidth = CalcWidth(rView); const_cast(rIData).mnWidth = nWidth; } return nWidth; @@ -385,7 +385,7 @@ int SvLBoxItem::GetHeight(const SvViewDataEntry* pData, sal_uInt16 nItemPos) return rIData.mnHeight; } -int SvLBoxItem::CalcWidth(const SvTreeListBox* /*pView*/) const +int SvLBoxItem::CalcWidth(const SvTreeListBox& /*rView*/) const { return 0; }