include/svx/bmpmask.hxx | 4 ++-- svx/source/dialog/_bmpmask.cxx | 26 +++++++++++++------------- 2 files changed, 15 insertions(+), 15 deletions(-)
New commits: commit c9ab6a2411b631cfafdc9b3b4391dd290a32d6c1 Author: Miklos Vajna <[email protected]> AuthorDate: Mon Sep 29 09:03:25 2025 +0200 Commit: Miklos Vajna <[email protected]> CommitDate: Mon Sep 29 10:06:51 2025 +0200 svx: prefix members of SvxBmpMask See tdf#94879 for motivation. Change-Id: Ie4832890d84db56ea8f49d164506d0bdc2f6dd3a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191589 Tested-by: Jenkins Reviewed-by: Miklos Vajna <[email protected]> diff --git a/include/svx/bmpmask.hxx b/include/svx/bmpmask.hxx index 001a4b1fd4e9..27dc520ea499 100644 --- a/include/svx/bmpmask.hxx +++ b/include/svx/bmpmask.hxx @@ -123,8 +123,8 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxBmpMask final : public SfxDockingWindow std::unique_ptr<MaskData> m_xData; - Color aPipetteColor; - SvxBmpMaskSelectItem aSelItem; + Color m_aPipetteColor; + SvxBmpMaskSelectItem m_aSelItem; virtual bool Close() override; diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index 3a4412fa871d..e15230ed5c9d 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -375,8 +375,8 @@ SvxBmpMask::SvxBmpMask(SfxBindings *pBindinx, SfxChildWindow *pCW, vcl::Window* , m_xCbxTrans(m_xBuilder->weld_check_button(u"cbx5"_ustr)) , m_xLbColorTrans(new ColorListBox(m_xBuilder->weld_menu_button(u"color5"_ustr), [this]{ return GetFrameWeld(); })) , m_xData(new MaskData(this, *pBindinx)) - , aPipetteColor(COL_WHITE) - , aSelItem(*this, *pBindinx) + , m_aPipetteColor(COL_WHITE) + , m_aSelItem(*this, *pBindinx) { SetText(SvxResId(RID_SVXDLG_BMPMASK_STR_TITLE)); @@ -415,28 +415,28 @@ SvxBmpMask::SvxBmpMask(SfxBindings *pBindinx, SfxChildWindow *pCW, vcl::Window* m_xQSet1->SetColCount(); m_xQSet1->SetLineCount( 1 ); sColorPaletteN = sColorPalette + " 1"; - m_xQSet1->InsertItem( 1, aPipetteColor, sColorPaletteN); + m_xQSet1->InsertItem( 1, m_aPipetteColor, sColorPaletteN); m_xQSet1->SelectItem( 1 ); m_xQSet2->SetStyle( m_xQSet2->GetStyle() | WB_DOUBLEBORDER | WB_ITEMBORDER ); m_xQSet2->SetColCount(); m_xQSet2->SetLineCount( 1 ); sColorPaletteN = sColorPalette + " 2"; - m_xQSet2->InsertItem( 1, aPipetteColor, sColorPaletteN); + m_xQSet2->InsertItem( 1, m_aPipetteColor, sColorPaletteN); m_xQSet2->SelectItem( 0 ); m_xQSet3->SetStyle( m_xQSet3->GetStyle() | WB_DOUBLEBORDER | WB_ITEMBORDER ); m_xQSet3->SetColCount(); m_xQSet3->SetLineCount( 1 ); sColorPaletteN = sColorPalette + " 3"; - m_xQSet3->InsertItem( 1, aPipetteColor, sColorPaletteN); + m_xQSet3->InsertItem( 1, m_aPipetteColor, sColorPaletteN); m_xQSet3->SelectItem( 0 ); m_xQSet4->SetStyle( m_xQSet4->GetStyle() | WB_DOUBLEBORDER | WB_ITEMBORDER ); m_xQSet4->SetColCount(); m_xQSet4->SetLineCount( 1 ); sColorPaletteN = sColorPalette + " 4"; - m_xQSet4->InsertItem( 1, aPipetteColor, sColorPaletteN); + m_xQSet4->InsertItem( 1, m_aPipetteColor, sColorPaletteN); m_xQSet4->SelectItem( 0 ); m_xQSet1->Show(); @@ -479,7 +479,7 @@ void SvxBmpMask::dispose() m_xLbColor4.reset(); m_xCbxTrans.reset(); m_xLbColorTrans.reset(); - aSelItem.dispose(); + m_aSelItem.dispose(); SfxDockingWindow::dispose(); } @@ -511,8 +511,8 @@ bool SvxBmpMask::Close() void SvxBmpMask::SetColor( const Color& rColor ) { - aPipetteColor = rColor; - m_xCtlPipette->SetColor( aPipetteColor ); + m_aPipetteColor = rColor; + m_xCtlPipette->SetColor( m_aPipetteColor ); } void SvxBmpMask::PipetteClicked() @@ -521,28 +521,28 @@ void SvxBmpMask::PipetteClicked() { m_xCbx1->set_active(true); m_xData->CbxHdl(*m_xCbx1); - m_xQSet1->SetItemColor( 1, aPipetteColor ); + m_xQSet1->SetItemColor( 1, m_aPipetteColor ); m_xQSet1->SetFormat(); } else if( m_xQSet2->GetSelectedItemId() == 1 ) { m_xCbx2->set_active(true); m_xData->CbxHdl(*m_xCbx2); - m_xQSet2->SetItemColor( 1, aPipetteColor ); + m_xQSet2->SetItemColor( 1, m_aPipetteColor ); m_xQSet2->SetFormat(); } else if( m_xQSet3->GetSelectedItemId() == 1 ) { m_xCbx3->set_active(true); m_xData->CbxHdl(*m_xCbx3); - m_xQSet3->SetItemColor( 1, aPipetteColor ); + m_xQSet3->SetItemColor( 1, m_aPipetteColor ); m_xQSet3->SetFormat(); } else if( m_xQSet4->GetSelectedItemId() == 1 ) { m_xCbx4->set_active(true); m_xData->CbxHdl(*m_xCbx4); - m_xQSet4->SetItemColor( 1, aPipetteColor ); + m_xQSet4->SetItemColor( 1, m_aPipetteColor ); m_xQSet4->SetFormat(); }
