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

[Miklos Vajna]

 sw/source/ui/dbui/mmresultdialogs.cxx |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 3fda8322c9eb16fe5f9855bfbcc7f1a1c639e437
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Mar 17 17:26:26 2016 +0100

    SwMMResultSaveDialog: disable from/to numeric fields by default
    
    Same situation as in SwMMResultEmailDialog.
    
    Change-Id: I9205f8d62125b66012cd35e2bc25cf60834b11a5

diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx
index a60576a..b136909 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -228,9 +228,12 @@ SwMMResultSaveDialog::SwMMResultSaveDialog(vcl::Window* pParent)
     get(m_pToNF, "to-nospin");
     get(m_pOKButton, "ok");
 
-    m_pSaveAsOneRB->SetClickHdl(LINK(this, SwMMResultSaveDialog, DocumentSelectionHdl_Impl));
-    m_pSaveIndividualRB->SetClickHdl(LINK(this, SwMMResultSaveDialog, DocumentSelectionHdl_Impl));
-    m_pFromRB->SetClickHdl(LINK(this, SwMMResultSaveDialog, DocumentSelectionHdl_Impl));
+    Link<Button*,void> aLink = LINK(this, SwMMResultSaveDialog, DocumentSelectionHdl_Impl);
+    m_pSaveAsOneRB->SetClickHdl(aLink);
+    m_pSaveIndividualRB->SetClickHdl(aLink);
+    m_pFromRB->SetClickHdl(aLink);
+    // m_pSaveAsOneRB is the default, so disable m_pFromNF and m_pToNF initially.
+    aLink.Call(m_pSaveAsOneRB);
 
     m_pOKButton->SetClickHdl(LINK(this, SwMMResultSaveDialog, SaveOutputHdl_Impl));
 }