ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

svx: Pass SvxBmpMask's SfxBindings param by ref

Browse Source 
That makes clear it's non-null and therefore
the unconditional dereferencing done previously
was unproblematic.

Change-Id: I85e5f1a226396865cc6a835bc63170ccfc479162
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/208379
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
This commit is contained in:
Michael Weghorn
2026-07-23 15:39:42 +02:00
parent 3298e3beec
commit a9ff204b12
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/svx/bmpmask.hxx
+1 -2
View File
@@ -148,8 +148,7 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxBmpMask final : public SfxDockingWindow
const Color& rColor );
public:
SvxBmpMask(SfxBindings *pBindinx, SfxChildWindow *pCW, vcl::Window* pParent);
SvxBmpMask(SfxBindings& rBindings, SfxChildWindow* pCW, vcl::Window* pParent);
virtual ~SvxBmpMask() override;
virtual void dispose() override;
svx/source/dialog/_bmpmask.cxx
+5 -5
View File
@@ -343,15 +343,15 @@ SvxBmpMaskChildWindow::SvxBmpMaskChildWindow(vcl::Window* pParent_, sal_uInt16 n
SfxBindings& rBindings, SfxChildWinInfo& rInfo)
: SfxChildWindow(pParent_, nId)
{
VclPtr<SvxBmpMask> pDlg = VclPtr<SvxBmpMask>::Create(&rBindings, this, pParent_);
VclPtr<SvxBmpMask> pDlg = VclPtr<SvxBmpMask>::Create(rBindings, this, pParent_);
SetWindow( pDlg );
pDlg->Initialize(rInfo);
}
SvxBmpMask::SvxBmpMask(SfxBindings *pBindinx, SfxChildWindow *pCW, vcl::Window* pParent)
: SfxDockingWindow(pBindinx, pCW, pParent, u"DockingColorReplace"_ustr,
SvxBmpMask::SvxBmpMask(SfxBindings& rBindings, SfxChildWindow* pCW, vcl::Window* pParent)
: SfxDockingWindow(&rBindings, pCW, pParent, u"DockingColorReplace"_ustr,
u"svx/ui/dockingcolorreplace.ui"_ustr)
, m_xTbxPipette(m_xBuilder->weld_toolbar(u"toolbar"_ustr))
, m_xCtlPipette(new BmpColorWindow)
@@ -379,9 +379,9 @@ SvxBmpMask::SvxBmpMask(SfxBindings *pBindinx, SfxChildWindow *pCW, vcl::Window*
, m_xLbColor4(new ColorListBox(m_xBuilder->weld_menu_button(u"color4"_ustr), [this]{ return GetFrameWeld(); }))
, 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))
, m_xData(new MaskData(this, rBindings))
, m_aPipetteColor(COL_WHITE)
, m_aSelItem(*this, *pBindinx)
, m_aSelItem(*this, rBindings)
{
SetText(SvxResId(RID_SVXDLG_BMPMASK_STR_TITLE));