[Libreoffice-commits] core.git: sw/source

[Julien Nabet (via logerrit)]

 sw/source/ui/dbui/mmoutputtypepage.cxx |    6 +++---
 sw/source/ui/inc/mmresultdialogs.hxx   |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 25c5894885f1382a3fb2c7bcc08e3bdd69368865
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Thu Jan 14 18:10:31 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jan 14 21:13:59 2021 +0100

    Rename m_xClose->mxCancel + CloseHdl_Impl->CancelHdl_Impl (sw/mailmerge)
    
    In sw/uiconfig/swriter/ui/mmsendmails.ui
    we got:
    id="cancel"
    gtk-cancel
    <action-widget response="-6">cancel</action-widget>
    +
    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 <caolanm at redhat.com>

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<int> 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();
 
diff --git a/sw/source/ui/inc/mmresultdialogs.hxx b/sw/source/ui/inc/mmresultdialogs.hxx
index 1e78fc80203f..18151a810f99 100644
--- a/sw/source/ui/inc/mmresultdialogs.hxx
+++ b/sw/source/ui/inc/mmresultdialogs.hxx
@@ -160,11 +160,11 @@ class SwSendMailDialog : public weld::GenericDialogController
     std::unique_ptr<weld::Label> m_xErrorStatus;
     std::unique_ptr<weld::TreeView> m_xStatus;
     std::unique_ptr<weld::Button> m_xStop;
-    std::unique_ptr<weld::Button> m_xClose;
+    std::unique_ptr<weld::Button> m_xCancel;
     std::unique_ptr<weld::Expander> m_xExpander;
 
     DECL_LINK( StopHdl_Impl, weld::Button&, void );
-    DECL_LINK( CloseHdl_Impl, weld::Button& , void);
+    DECL_LINK( CancelHdl_Impl, weld::Button& , void);
     DECL_STATIC_LINK( SwSendMailDialog, StartSendMails, void*, void );
     DECL_STATIC_LINK( SwSendMailDialog, StopSendMails, void*, void );
     DECL_LINK( RemoveThis, Timer*, void );