diff options
| author | Serge Krot <Serge.Krot@cib.de> | 2020-05-22 13:20:23 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2020-06-06 09:33:00 +0100 |
| commit | 2631f65a9b64c86456f9083e282f7f05af82fca1 (patch) | |
| tree | 3bf942ba7928a002d6cdbfc8c90e2275b4cccbd1 | |
| parent | a3bba79435537982445d7ce0a8fa9f4c3450b49f (diff) | |
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 <Thorsten.Behrens@CIB.de>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 80cea3682b2cf07f1685852cd8809d9db58a1cb5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95481
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Tested-by: Jenkins
| -rw-r--r-- | sw/source/ui/dbui/mmresultdialogs.cxx | 4 | ||||
| -rw-r--r-- | sw/source/uibase/dbui/dbmgr.cxx | 3 |
2 files changed, 5 insertions, 2 deletions
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 <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <sfx2/dinfdlg.hxx> +#include <vcl/scheduler.hxx> #include <sfx2/printer.hxx> #include <sfx2/fcontnr.hxx> #include <sfx2/viewfrm.hxx> @@ -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 <com/sun/star/ui/dialogs/XFilterManager.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <vcl/errinf.hxx> +#include <vcl/scheduler.hxx> #include <sfx2/fcontnr.hxx> #include <sfx2/filedlghelper.hxx> #include <sfx2/viewfrm.hxx> @@ -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), |