sw/source/ui/dbui/mmresultdialogs.cxx | 4 +++-
sw/source/uibase/dbui/dbmgr.cxx | 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 1f251925eda69fc925a4020af015f4bfa1141eb3
Author: Serge Krot <serge.k...@cib.de>
AuthorDate: Fri May 22 13:20:23 2020 +0200
Commit: Thorsten Behrens <thorsten.behr...@cib.de>
CommitDate: Wed Jun 24 21:08:19 2020 +0200
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.behr...@cib.de>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
(cherry picked from commit 80cea3682b2cf07f1685852cd8809d9db58a1cb5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95481
Reviewed-by: Michael Stahl <michael.st...@cib.de>
Tested-by: Jenkins
(cherry picked from commit ef61c49236c2bc11175fb26e55870a06b3e92f0c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97042
diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx
b/sw/source/ui/dbui/mmresultdialogs.cxx
index 0c4952f68d76..a70385c14fa1 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -43,6 +43,7 @@
#include <vcl/layout.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>
@@ -675,7 +676,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 23304b977c54..3dd0da2c98fd 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>
@@ -1485,7 +1486,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),
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
