From 2631f65a9b64c86456f9083e282f7f05af82fca1 Mon Sep 17 00:00:00 2001 From: Serge Krot Date: Fri, 22 May 2020 13:20:23 +0200 Subject: tdf#133270 MAILMERGE progress is not updated during export of many files See also https://gerrit.libreoffice.org/c/core/+/90686 for a similar change. Change-Id: I063394f7ef0a68c79366f09c9d2cf5775a57e640 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94663 Tested-by: Thorsten Behrens Reviewed-by: Thorsten Behrens (cherry picked from commit 80cea3682b2cf07f1685852cd8809d9db58a1cb5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95481 Reviewed-by: Michael Stahl Tested-by: Jenkins --- sw/source/ui/dbui/mmresultdialogs.cxx | 4 +++- sw/source/uibase/dbui/dbmgr.cxx | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'sw') diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx index 53a76b8eb2bb..9d507f204ce9 100644 --- a/sw/source/ui/dbui/mmresultdialogs.cxx +++ b/sw/source/ui/dbui/mmresultdialogs.cxx @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -664,7 +665,8 @@ IMPL_LINK_NOARG(SwMMResultSaveDialog, SaveOutputHdl_Impl, weld::Button&, void) while(true) { //time for other slots is needed - Application::Reschedule( true ); + Scheduler::ProcessEventsToIdle(); + bool bFailed = false; try { diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 0b28c048bffb..2daa67893592 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -1436,7 +1437,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, //TODO xProgressDlg->queue_draw(); } - Application::Reschedule( true ); + Scheduler::ProcessEventsToIdle(); // Create a copy of the source document and work with that one instead of the source. // If we're not in the single file mode (which requires modifying the document for the merging), -- cgit