diff options
| author | Serge Krot <Serge.Krot@cib.de> | 2020-05-22 13:20:23 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2020-05-23 16:45:16 +0200 |
| commit | 80cea3682b2cf07f1685852cd8809d9db58a1cb5 (patch) | |
| tree | ef132cd6e0149b48379b204ea4aa6394f1f742de /sw/source | |
| parent | c42550f520e896abc59d91d588eb3ae9f0e0609d (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>
Diffstat (limited to 'sw/source')
| -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 e9dcc0b93a1b..2702afde2b17 100644 --- a/sw/source/ui/dbui/mmresultdialogs.cxx +++ b/sw/source/ui/dbui/mmresultdialogs.cxx @@ -41,6 +41,7 @@ #include <vcl/stdtext.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> +#include <vcl/scheduler.hxx> #include <sfx2/printer.hxx> #include <sfx2/fcontnr.hxx> #include <sfx2/viewfrm.hxx> @@ -668,7 +669,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 282f726996aa..01da353a78a3 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -43,6 +43,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <vcl/errinf.hxx> #include <vcl/print.hxx> +#include <vcl/scheduler.hxx> #include <sfx2/fcontnr.hxx> #include <sfx2/filedlghelper.hxx> #include <sfx2/viewfrm.hxx> @@ -1380,7 +1381,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), |