[Libreoffice-commits] core.git: Branch 'feature/mailmerge-toolbar' - sw/source

[Miklos Vajna]

 sw/source/ui/dbui/mmresultdialogs.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 00c6ffefc8fee79f47accb33f1027d0ff6c08249
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Mar 17 13:33:42 2016 +0100

    SwMMResultEmailDialog: disable from/to numeric fields by default
    
    In the old code these were hidden by default, and when the user clicked
    on "Send merged document as E-Mail", the click event handler disabled
    them.
    
    Now that there is a separate dialog for email sending, disabling has to
    happen in the dialog constructor.
    
    Change-Id: Ie0024a470e042e120ee424bf6a74dffa6f7a43a6

diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx
index ed2dcec..a60576a 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -323,8 +323,11 @@ SwMMResultEmailDialog::SwMMResultEmailDialog(vcl::Window* pParent)
     m_pSendAsPB->SetClickHdl(LINK(this, SwMMResultEmailDialog, SendAsHdl_Impl));
     m_pSendAsLB->SetSelectHdl(LINK(this, SwMMResultEmailDialog, SendTypeHdl_Impl));
 
-    m_pSendAllRB->SetClickHdl(LINK(this, SwMMResultEmailDialog, DocumentSelectionHdl_Impl));
-    m_pFromRB->SetClickHdl(LINK(this, SwMMResultEmailDialog, DocumentSelectionHdl_Impl));
+    Link<Button*,void> aLink = LINK(this, SwMMResultEmailDialog, DocumentSelectionHdl_Impl);
+    m_pSendAllRB->SetClickHdl(aLink);
+    m_pFromRB->SetClickHdl(aLink);
+    // m_pSendAllRB is the default, so disable m_pFromNF and m_pToNF initially.
+    aLink.Call(m_pSendAllRB);
 
     m_pOKButton->SetClickHdl(LINK(this, SwMMResultEmailDialog, SendDocumentsHdl_Impl));