ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

svx: Pass SvxColorDockingWindow's SfxBindings param by ref

Browse Source 
This allows to drop two null checks in the ctor.

Change-Id: If5f33523eb8693de9c4bc4b4f481cc798a65766e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/208386
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
This commit is contained in:
Michael Weghorn
2026-07-23 23:21:26 +02:00
parent a7403afe1b
commit b8cee3464f
3 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
svx/inc/colrctrl.hxx
+1 -3
View File
@@ -89,9 +89,7 @@ private:
virtual bool Close() override;
public:
SvxColorDockingWindow(SfxBindings* pBindings,
SfxChildWindow *pCW,
vcl::Window* pParent);
SvxColorDockingWindow(SfxBindings& rBindings, SfxChildWindow* pCW, vcl::Window* pParent);
virtual ~SvxColorDockingWindow() override;
virtual void dispose() override;
svx/source/tbxctrls/SvxColorChildWindow.cxx
+1 -1
View File
@@ -30,7 +30,7 @@ SvxColorChildWindow::SvxColorChildWindow(vcl::Window* _pParent, sal_uInt16 nId,
: SfxChildWindow(_pParent, nId)
{
VclPtr<SvxColorDockingWindow> pWin
= VclPtr<SvxColorDockingWindow>::Create(&rBindings, this, _pParent);
= VclPtr<SvxColorDockingWindow>::Create(rBindings, this, _pParent);
SetWindow(pWin);
svx/source/tbxctrls/colrctrl.cxx
+12 -15
View File
@@ -178,9 +178,10 @@ bool SvxColorValueSet_docking::StartDrag()
constexpr sal_uInt16 gnLeftSlot = SID_ATTR_FILL_COLOR;
constexpr sal_uInt16 gnRightSlot = SID_ATTR_LINE_COLOR;
SvxColorDockingWindow::SvxColorDockingWindow(SfxBindings* _pBindings, SfxChildWindow* pCW, vcl::Window* _pParent)
: SfxDockingWindow(_pBindings, pCW, _pParent,
u"DockingColorWindow"_ustr, u"svx/ui/dockingcolorwindow.ui"_ustr)
SvxColorDockingWindow::SvxColorDockingWindow(SfxBindings& rBindings, SfxChildWindow* pCW,
vcl::Window* _pParent)
: SfxDockingWindow(&rBindings, pCW, _pParent, u"DockingColorWindow"_ustr,
u"svx/ui/dockingcolorwindow.ui"_ustr)
, m_pColorSet(
new SvxColorValueSet_docking(m_xBuilder->weld_scrolled_window(u"valuesetwin"_ustr, true)))
, m_pColorSetWin(new weld::CustomWeld(*m_xBuilder, u"valueset"_ustr, *m_pColorSet))
@@ -197,18 +198,15 @@ SvxColorDockingWindow::SvxColorDockingWindow(SfxBindings* _pBindings, SfxChildWi
// Get the model from the view shell. Using SfxObjectShell::Current()
// is unreliable when called at the wrong times.
SfxObjectShell* pDocSh = nullptr;
if (_pBindings != nullptr)
SfxDispatcher* pDispatcher = rBindings.GetDispatcher();
if (pDispatcher != nullptr)
{
SfxDispatcher* pDispatcher = _pBindings->GetDispatcher();
if (pDispatcher != nullptr)
SfxViewFrame* pFrame = pDispatcher->GetFrame();
if (pFrame != nullptr)
{
SfxViewFrame* pFrame = pDispatcher->GetFrame();
if (pFrame != nullptr)
{
SfxViewShell* pViewShell = pFrame->GetViewShell();
if (pViewShell != nullptr)
pDocSh = pViewShell->GetObjectShell();
}
SfxViewShell* pViewShell = pFrame->GetViewShell();
if (pViewShell != nullptr)
pDocSh = pViewShell->GetObjectShell();
}
}
@@ -228,8 +226,7 @@ SvxColorDockingWindow::SvxColorDockingWindow(SfxBindings* _pBindings, SfxChildWi
aItemSize.setHeight( aItemSize.Height() + SvxColorValueSet::getEntryEdgeLength() );
aItemSize.setHeight( aItemSize.Height() / 2 );
if (_pBindings != nullptr)
StartListening(*_pBindings, DuplicateHandling::Prevent);
StartListening(rBindings, DuplicateHandling::Prevent);
}
SvxColorDockingWindow::~SvxColorDockingWindow()