[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sw/source

[Mike Kaganski]

 sw/source/uibase/app/apphdl.cxx |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

New commits:
commit d64da241e8ebd0c212548982dcf61cc658939e8a
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Sat May 26 14:23:13 2018 +0300

    tdf#117817: Update Mail Merge controls after wizard completes
    
    Otherwise they may stay disabled until cursor position changes.
    
    Change-Id: If734bbd4793b3b01c64601d68126d5752f5aba0c
    Reviewed-on: https://gerrit.libreoffice.org/54841
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    Tested-by: Mike Kaganski <mike.kaganski at collabora.com>
    (cherry picked from commit f304ae0ca4738fa3605587146224ee8972a894f3)
    Reviewed-on: https://gerrit.libreoffice.org/54964

diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index 467112e58956..27dbf41be1ce 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -487,6 +487,20 @@ void SwMailMergeWizardExecutor::ExecutionFinished()
             pDbManager->CommitLastRegistrations();
     }
 
+    // Update Mail Merge controls
+    const sal_uInt16 slotIds[] = { FN_MAILMERGE_FIRST_ENTRY,
+                                   FN_MAILMERGE_PREV_ENTRY,
+                                   FN_MAILMERGE_NEXT_ENTRY,
+                                   FN_MAILMERGE_LAST_ENTRY,
+                                   FN_MAILMERGE_CURRENT_ENTRY,
+                                   FN_MAILMERGE_EXCLUDE_ENTRY,
+                                   FN_MAILMERGE_CREATE_DOCUMENTS,
+                                   FN_MAILMERGE_SAVE_DOCUMENTS,
+                                   FN_MAILMERGE_PRINT_DOCUMENTS,
+                                   FN_MAILMERGE_EMAIL_DOCUMENTS,
+                                   0 };
+    m_pView->GetViewFrame()->GetBindings().Invalidate(slotIds);
+
     // release/destroy asynchronously
     Application::PostUserEvent( LINK( this, SwMailMergeWizardExecutor, DestroyDialogHdl ) );
 }