sw: Pass SwAbstractDialogFactory::CreateAuthMarkFloatDlg param by ref
The SfxChildWinInfo* param is always non-null. Pass by ref instead. Change-Id: I4a14046bee6dbf6def328803d89a9db64af24bfe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/208308 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Tested-by: Jenkins
This commit is contained in:
@@ -597,11 +597,10 @@ public:
|
||||
CreateIndexMarkFloatDlg(SfxBindings* pBindings, SfxChildWindow* pChild, weld::Window* pParent,
|
||||
SfxChildWinInfo& rInfo)
|
||||
= 0;
|
||||
virtual VclPtr<AbstractMarkFloatDlg> CreateAuthMarkFloatDlg(
|
||||
SfxBindings* pBindings,
|
||||
SfxChildWindow* pChild,
|
||||
weld::Window *pParent,
|
||||
SfxChildWinInfo* pInfo) = 0;
|
||||
virtual VclPtr<AbstractMarkFloatDlg>
|
||||
CreateAuthMarkFloatDlg(SfxBindings* pBindings, SfxChildWindow* pChild, weld::Window* pParent,
|
||||
SfxChildWinInfo& rInfo)
|
||||
= 0;
|
||||
virtual VclPtr<VclAbstractDialog> CreateIndexMarkModalDlg(
|
||||
weld::Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark) = 0;
|
||||
|
||||
|
||||
@@ -1098,13 +1098,12 @@ public:
|
||||
};
|
||||
}
|
||||
|
||||
VclPtr<AbstractMarkFloatDlg> SwAbstractDialogFactory_Impl::CreateAuthMarkFloatDlg(
|
||||
SfxBindings* pBindings,
|
||||
SfxChildWindow* pChild,
|
||||
weld::Window *pParent,
|
||||
SfxChildWinInfo* pInfo)
|
||||
VclPtr<AbstractMarkFloatDlg>
|
||||
SwAbstractDialogFactory_Impl::CreateAuthMarkFloatDlg(SfxBindings* pBindings, SfxChildWindow* pChild,
|
||||
weld::Window* pParent, SfxChildWinInfo& rInfo)
|
||||
{
|
||||
return VclPtr<AbstractAuthMarkFloatDlg_Impl>::Create(pBindings, pChild, pParent, pInfo, true/*bNew*/);
|
||||
return VclPtr<AbstractAuthMarkFloatDlg_Impl>::Create(pBindings, pChild, pParent, &rInfo,
|
||||
true /*bNew*/);
|
||||
}
|
||||
|
||||
namespace
|
||||
|
||||
@@ -182,11 +182,10 @@ public:
|
||||
SfxChildWindow* pChild,
|
||||
weld::Window* pParent,
|
||||
SfxChildWinInfo& rInfo) override;
|
||||
virtual VclPtr<AbstractMarkFloatDlg> CreateAuthMarkFloatDlg(
|
||||
SfxBindings* pBindings,
|
||||
SfxChildWindow* pChild,
|
||||
weld::Window *pParent,
|
||||
SfxChildWinInfo* pInfo) override;
|
||||
virtual VclPtr<AbstractMarkFloatDlg> CreateAuthMarkFloatDlg(SfxBindings* pBindings,
|
||||
SfxChildWindow* pChild,
|
||||
weld::Window* pParent,
|
||||
SfxChildWinInfo& rInfo) override;
|
||||
virtual VclPtr<VclAbstractDialog> CreateIndexMarkModalDlg(
|
||||
weld::Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark ) override;
|
||||
|
||||
|
||||
@@ -53,7 +53,7 @@ SwInsertAuthMarkWrapper::SwInsertAuthMarkWrapper(vcl::Window* pParentWindow, sal
|
||||
{
|
||||
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
|
||||
m_xAbstDlg
|
||||
= pFact->CreateAuthMarkFloatDlg(pBindings, this, pParentWindow->GetFrameWeld(), &rInfo);
|
||||
= pFact->CreateAuthMarkFloatDlg(pBindings, this, pParentWindow->GetFrameWeld(), rInfo);
|
||||
SetController(m_xAbstDlg->GetController());
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user