include/svx/colorwindow.hxx | 2 +-
svx/source/tbxctrls/tbcontrl.cxx | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit c8cb7fe1bb82eba0aad36e7b5f041ff350bb715f
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Jun 23 08:48:05 2025 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Jun 23 10:49:49 2025 +0200
svx: prefix members of ColorWindow
See tdf#94879 for motivation.
Change-Id: I1edae4c6bfd1337433b522f50e90d9caedaf5925
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186809
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/include/svx/colorwindow.hxx b/include/svx/colorwindow.hxx
index 5ec8004cd8f3..a08381711593 100644
--- a/include/svx/colorwindow.hxx
+++ b/include/svx/colorwindow.hxx
@@ -78,7 +78,7 @@ public:
class SVXCORE_DLLPUBLIC ColorWindow final : public WeldToolbarPopup
{
private:
- const sal_uInt16 theSlotId;
+ const sal_uInt16 mnSlotId;
OUString maCommand;
MenuOrToolMenuButton maMenuButton;
std::shared_ptr<PaletteManager> mxPaletteManager;
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 731b928ba53e..2de84acbd3a2 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2062,7 +2062,7 @@ ColorWindow::ColorWindow(OUString rCommand,
TopLevelParentFunction aTopLevelParentFunction,
ColorSelectFunction aColorSelectFunction)
: WeldToolbarPopup(rFrame, rMenuButton.get_widget(),
u"svx/ui/colorwindow.ui"_ustr, u"palette_popup_window"_ustr)
- , theSlotId(nSlotId)
+ , mnSlotId(nSlotId)
, maCommand(std::move(rCommand))
, maMenuButton(rMenuButton)
, mxPaletteManager(std::move(xPaletteManager))
@@ -2083,7 +2083,7 @@ ColorWindow::ColorWindow(OUString rCommand,
mxColorSet->SetStyle( WinBits(WB_FLATVALUESET | WB_ITEMBORDER | WB_3DLOOK
| WB_NO_DIRECTSELECT | WB_TABSTOP) );
mxRecentColorSet->SetStyle( WinBits(WB_FLATVALUESET | WB_ITEMBORDER |
WB_3DLOOK | WB_NO_DIRECTSELECT | WB_TABSTOP) );
- switch ( theSlotId )
+ switch ( mnSlotId )
{
case SID_ATTR_CHAR_COLOR_BACKGROUND:
case SID_BACKGROUND_COLOR:
@@ -2299,7 +2299,7 @@ IMPL_LINK_NOARG(ColorWindow, SelectPaletteHdl,
weld::ComboBox&, void)
NamedColor ColorWindow::GetAutoColor() const
{
- return ::GetAutoColor(theSlotId);
+ return ::GetAutoColor(mnSlotId);
}
IMPL_LINK(ColorWindow, AutoColorClickHdl, weld::Button&, rButton, void)
