sc/source/ui/inc/optsolver.hxx | 2 +-
sc/source/ui/miscdlgs/optsolver.cxx | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 27c5135744aa0654eec37f45e94024317e92a76a
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Wed Jan 13 20:37:52 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Jan 14 10:10:58 2021 +0100
Rename m_xBtnCancel->m_xBtnClose (sc/optsolver)
Since it corresponds to id="close" gtk-close, response close
in sc/uiconfig/scalc/ui/solverdlg.ui
Change-Id: I909f8f7a5d08784bda786eb86d92f88831749f23
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109246
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx
index e76bbcb465f8..892c68869b0e 100644
--- a/sc/source/ui/inc/optsolver.hxx
+++ b/sc/source/ui/inc/optsolver.hxx
@@ -177,7 +177,7 @@ private:
std::unique_ptr<weld::ScrolledWindow> m_xScrollBar;
std::unique_ptr<weld::Button> m_xBtnOpt;
- std::unique_ptr<weld::Button> m_xBtnCancel;
+ std::unique_ptr<weld::Button> m_xBtnClose;
std::unique_ptr<weld::Button> m_xBtnSolve;
std::unique_ptr<weld::Button> m_xBtnResetAll;
diff --git a/sc/source/ui/miscdlgs/optsolver.cxx
b/sc/source/ui/miscdlgs/optsolver.cxx
index c25cdd5c7dce..dec0442b5d2a 100644
--- a/sc/source/ui/miscdlgs/optsolver.cxx
+++ b/sc/source/ui/miscdlgs/optsolver.cxx
@@ -200,7 +200,7 @@ ScOptSolverDlg::ScOptSolverDlg(SfxBindings* pB,
SfxChildWindow* pCW, weld::Windo
, m_xBtnDel4(m_xBuilder->weld_button("del4"))
, m_xScrollBar(m_xBuilder->weld_scrolled_window("scrollbar", true))
, m_xBtnOpt(m_xBuilder->weld_button("options"))
- , m_xBtnCancel(m_xBuilder->weld_button("close"))
+ , m_xBtnClose(m_xBuilder->weld_button("close"))
, m_xBtnSolve(m_xBuilder->weld_button("ok"))
, m_xBtnResetAll(m_xBuilder->weld_button("resetall"))
, m_xResultFT(m_xBuilder->weld_label("result"))
@@ -272,7 +272,7 @@ void ScOptSolverDlg::Init(const ScAddress& rCursorPos)
pButton->set_image(xDelNm);
m_xBtnOpt->connect_clicked( LINK( this, ScOptSolverDlg, BtnHdl ) );
- m_xBtnCancel->connect_clicked( LINK( this, ScOptSolverDlg, BtnHdl ) );
+ m_xBtnClose->connect_clicked( LINK( this, ScOptSolverDlg, BtnHdl ) );
m_xBtnSolve->connect_clicked( LINK( this, ScOptSolverDlg, BtnHdl ) );
m_xBtnResetAll->connect_clicked( LINK( this, ScOptSolverDlg, BtnHdl ) );
@@ -507,7 +507,7 @@ bool ScOptSolverDlg::IsRefInputMode() const
IMPL_LINK(ScOptSolverDlg, BtnHdl, weld::Button&, rBtn, void)
{
- if (&rBtn == m_xBtnSolve.get() || &rBtn == m_xBtnCancel.get())
+ if (&rBtn == m_xBtnSolve.get() || &rBtn == m_xBtnClose.get())
{
bool bSolve = ( &rBtn == m_xBtnSolve.get() );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
