ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

formula: Switch ParaWin::m_pMyParent to reference

Browse Source 
Switch the member (and corresponding ctor param) from pointer
to reference and rename accordingly.

Change-Id: I48a419282684628482b24b097e3e385ea81e383f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/209398
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Tested-by: Jenkins
This commit is contained in:
Michael Weghorn
2026-08-20 22:30:18 +02:00
parent b429497ea6
commit b9ecf11693
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
formula/source/ui/dlg/formula.cxx
+1 -1
View File
@@ -272,7 +272,7 @@ FormulaDlg_Impl::FormulaDlg_Impl(weld::Dialog& rDialog,
m_xEdRef->SetReferences(&rDlg, m_xFtEditName.get());
m_xRefBtn->SetReferences(&rDlg, m_xEdRef.get());
m_xParaWin.reset(new ParaWin(m_xParaWinBox.get(), &rDlg));
m_xParaWin.reset(new ParaWin(m_xParaWinBox.get(), rDlg));
m_xParaWin->Show();
m_xParaWinBox->hide();
m_xFtEditName->hide();
formula/source/ui/dlg/parawin.cxx
+4 -4
View File
@@ -37,9 +37,9 @@ namespace formula
constexpr sal_uInt16 kMaxArgCount = 255;
constexpr sal_uInt16 kMaxArgOffset = kMaxArgCount - 1;
ParaWin::ParaWin(weld::Container* pParent, IControlReferenceHandler* _pDlg)
ParaWin::ParaWin(weld::Container* pParent, IControlReferenceHandler& rDlg)
: m_pFuncDesc(nullptr)
, m_pMyParent(_pDlg)
, m_rMyParent(rDlg)
, m_sOptional(ForResId(STR_OPTIONAL))
, m_sRequired(ForResId(STR_REQUIRED))
, m_xBuilder(Application::CreateBuilder(pParent, u"formula/ui/parameter.ui"_ustr))
@@ -395,8 +395,8 @@ void ParaWin::SetEdFocus()
void ParaWin::InitArgInput(sal_uInt16 nPos, weld::Label& rFtArg, weld::Button& rBtnFx,
ArgEdit& rEdArg, RefButton& rRefBtn)
{
rRefBtn.SetReferences(m_pMyParent, &rEdArg);
rEdArg.SetReferences(m_pMyParent, &rFtArg);
rRefBtn.SetReferences(&m_rMyParent, &rEdArg);
rEdArg.SetReferences(&m_rMyParent, &rFtArg);
m_aArgInput[nPos].InitArgInput(rFtArg, rBtnFx, rEdArg, rRefBtn);
formula/source/ui/dlg/parawin.hxx
+2 -2
View File
@@ -45,7 +45,7 @@ private:
::std::vector<sal_uInt16> m_aVisibleArgMapping;
const IFunctionDescription* m_pFuncDesc;
IControlReferenceHandler* m_pMyParent;
IControlReferenceHandler& m_rMyParent;
// unsuppressed arguments, may be >= VAR_ARGS to indicate repeating parameters
sal_uInt16 m_nArgs;
// max arguments, limited to supported number of arguments
@@ -115,7 +115,7 @@ private:
void UpdateArgInput(sal_uInt16 nOffset, sal_uInt16 i);
public:
ParaWin(weld::Container* pParent, IControlReferenceHandler* _pDlg);
ParaWin(weld::Container* pParent, IControlReferenceHandler& rDlg);
~ParaWin();
void SetFunctionDesc(const IFunctionDescription* pFDesc);