From 25c5894885f1382a3fb2c7bcc08e3bdd69368865 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Thu, 14 Jan 2021 18:10:31 +0100 Subject: Rename m_xClose->mxCancel + CloseHdl_Impl->CancelHdl_Impl (sw/mailmerge) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In sw/uiconfig/swriter/ui/mmsendmails.ui we got: id="cancel" gtk-cancel cancel + in sw/source/ui/dbui/mmoutputtypepage.cxx IMPL_LINK_NOARG(SwSendMailDialog, CancelHdl_Impl, weld::Button&, void) we got: if (m_bDestructionEnabled) m_xDialog->response(RET_CANCEL); we want to cancel the process to send (of course what's already be sent can't be undone) Change-Id: If221ecc20366f0634079ab515613757cc019c8ed Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109300 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- sw/source/ui/dbui/mmoutputtypepage.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sw/source/ui/dbui') diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index d56e369eb85b..7a8730acfe34 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -217,7 +217,7 @@ SwSendMailDialog::SwSendMailDialog(weld::Window *pParent, SwMailMergeConfigItem& , m_xErrorStatus(m_xBuilder->weld_label("errorstatus")) , m_xStatus(m_xBuilder->weld_tree_view("container")) , m_xStop(m_xBuilder->weld_button("stop")) - , m_xClose(m_xBuilder->weld_button("cancel")) + , m_xCancel(m_xBuilder->weld_button("cancel")) , m_xExpander(m_xBuilder->weld_expander("details")) { m_sStop = m_xStop->get_label(); @@ -229,7 +229,7 @@ SwSendMailDialog::SwSendMailDialog(weld::Window *pParent, SwMailMergeConfigItem& m_xStatus->set_size_request(aSize.Width(), aSize.Height()); m_xStop->connect_clicked(LINK( this, SwSendMailDialog, StopHdl_Impl)); - m_xClose->connect_clicked(LINK( this, SwSendMailDialog, CloseHdl_Impl)); + m_xCancel->connect_clicked(LINK( this, SwSendMailDialog, CancelHdl_Impl)); std::vector aWidths; aWidths.push_back(m_xStatus->get_checkbox_column_width()); @@ -296,7 +296,7 @@ IMPL_LINK( SwSendMailDialog, StopHdl_Impl, weld::Button&, rButton, void ) } } -IMPL_LINK_NOARG(SwSendMailDialog, CloseHdl_Impl, weld::Button&, void) +IMPL_LINK_NOARG(SwSendMailDialog, CancelHdl_Impl, weld::Button&, void) { m_xDialog->hide(); -- cgit