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

Miklos Vajna vmiklos at collabora.co.uk
Thu Mar 17 16:30:47 UTC 2016


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

New commits:
commit c9071cc471762c34a056736263f5eae825654510
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Mar 17 17:30:12 2016 +0100

    SwMMResultPrintDialog: disable from/to numeric fields by default
    
    Again, same situation as in SwMMResultEmailDialog.
    
    Change-Id: Id26aa0601db712133147856dfe179415d579e75a

diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx
index b136909..d12a229 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -274,8 +274,11 @@ SwMMResultPrintDialog::SwMMResultPrintDialog(vcl::Window* pParent)
     m_pPrinterLB->SetSelectHdl(LINK(this, SwMMResultPrintDialog, PrinterChangeHdl_Impl));
     m_pPrinterSettingsPB->SetClickHdl(LINK(this, SwMMResultPrintDialog, PrinterSetupHdl_Impl));
 
-    m_pPrintAllRB->SetClickHdl(LINK(this, SwMMResultPrintDialog, DocumentSelectionHdl_Impl));
-    m_pFromRB->SetClickHdl(LINK(this, SwMMResultPrintDialog, DocumentSelectionHdl_Impl));
+    Link<Button*,void> aLink = LINK(this, SwMMResultPrintDialog, DocumentSelectionHdl_Impl);
+    m_pPrintAllRB->SetClickHdl(aLink);
+    m_pFromRB->SetClickHdl(aLink);
+    // m_pPrintAllRB is the default, so disable m_pFromNF and m_pToNF initially.
+    aLink.Call(m_pPrintAllRB);
 
     m_pOKButton->SetClickHdl(LINK(this, SwMMResultPrintDialog, PrintHdl_Impl));
 


More information about the Libreoffice-commits mailing list