[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sw/uiconfig

[Michael Weghorn (via logerrit)]

 sw/uiconfig/swriter/ui/mmcreatingdialog.ui |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4c75fe312fd15dfe0556c6342586edae4ca5015d
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Wed May 27 10:15:23 2020 +0200
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Mon Jun 1 17:46:34 2020 +0200

    tdf#133426 Make mail merge progress dialog modal
    
    This prevents doing things like trying to start another mail
    merge for the same doc in parallel, thus crashing LibreOffice.
    
    Change-Id: I5df2e804d97e82cccca4f0e297cb6d3396652882
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94933
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
    (cherry picked from commit 77140de3fe925f75620e94dbd848b1c925935fb5)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95247
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/sw/uiconfig/swriter/ui/mmcreatingdialog.ui b/sw/uiconfig/swriter/ui/mmcreatingdialog.ui
index c7c787c37c13..3af13d32de04 100644
--- a/sw/uiconfig/swriter/ui/mmcreatingdialog.ui
+++ b/sw/uiconfig/swriter/ui/mmcreatingdialog.ui
@@ -5,6 +5,7 @@
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
     <property name="title" translatable="yes" context="mmcreatingdialog|MMCreatingDialog">Mail Merge</property>
+    <property name="modal">True</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">