include/svx/SvxPresetListBox.hxx | 6 +++--- svx/source/tbxctrls/SvxPresetListBox.cxx | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit ef67a7f264310baf1cc08d8a13a4358b05080325 Author: Miklos Vajna <vmik...@collabora.com> AuthorDate: Mon Jun 16 08:32:41 2025 +0200 Commit: Miklos Vajna <vmik...@collabora.com> CommitDate: Mon Jun 16 09:43:25 2025 +0200 svx: prefix members of SvxPresetListBox See tdf#94879 for motivation. Change-Id: Ic5df0feeaa57bd4ac34fa6b6bc3e13c5e6145e11 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186535 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmik...@collabora.com> diff --git a/include/svx/SvxPresetListBox.hxx b/include/svx/SvxPresetListBox.hxx index 790578f42b3d..4767c4f3ea14 100644 --- a/include/svx/SvxPresetListBox.hxx +++ b/include/svx/SvxPresetListBox.hxx @@ -26,8 +26,8 @@ class SVXCORE_DLLPUBLIC SvxPresetListBox : public ValueSet { private: - static constexpr sal_uInt32 nColCount = 3; - Size aIconSize; + static constexpr sal_uInt32 s_nColCount = 3; + Size m_aIconSize; sal_uInt16 mnContextMenuItemId; Link<SvxPresetListBox*,void> maRenameHdl; Link<SvxPresetListBox*,void> maDeleteHdl; @@ -43,7 +43,7 @@ public: virtual void Resize() override; virtual bool Command(const CommandEvent& rEvent) override; virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override; - Size const & GetIconSize() const { return aIconSize; } + Size const & GetIconSize() const { return m_aIconSize; } sal_uInt16 GetContextMenuItemId() const { return mnContextMenuItemId; } void SetRenameHdl( const Link<SvxPresetListBox*,void>& rLink ) diff --git a/svx/source/tbxctrls/SvxPresetListBox.cxx b/svx/source/tbxctrls/SvxPresetListBox.cxx index 39b34e9ae476..45137b68b048 100644 --- a/svx/source/tbxctrls/SvxPresetListBox.cxx +++ b/svx/source/tbxctrls/SvxPresetListBox.cxx @@ -25,7 +25,7 @@ SvxPresetListBox::SvxPresetListBox(std::unique_ptr<weld::ScrolledWindow> pWindow) : ValueSet(std::move(pWindow)) - , aIconSize(60, 64) + , m_aIconSize(60, 64) , mnContextMenuItemId(0) { SetEdgeBlending(true); @@ -67,7 +67,7 @@ bool SvxPresetListBox::Command(const CommandEvent& rEvent) void SvxPresetListBox::DrawLayout() { - SetColCount(nColCount); + SetColCount(s_nColCount); SetLineCount(5); }