summaryrefslogtreecommitdiff
path: root/framework/source/loadenv
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-11-02 17:23:00 +0000
committerCaolán McNamara <caolanm@redhat.com>2017-11-03 22:05:57 +0100
commitfdcd11ff68fcd9e46aad6efc20779a063f4f6182 (patch)
treee0a28c7599e66334debb6f57fb4713e3ed4fd541 /framework/source/loadenv
parent7cca1dc560aeceb430ef6a0db2f7823e717ee585 (diff)
Resolves: tdf#113160 changing all warning dialogs to non-modal is unsafe
existing code doesn't expect that so stuff crashes partial revert of... commit db6b703d391838c481fd090065f6d329edcd4efa Date: Thu Aug 24 18:32:38 2017 +0200 Allow non-modal Dialogs during FileImport/Load Change-Id: I152feb849186cf035664a700d3f94ee049cdf6d3 Reviewed-on: https://gerrit.libreoffice.org/44227 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'framework/source/loadenv')
-rw-r--r--framework/source/loadenv/loadenv.cxx4
1 files changed, 0 insertions, 4 deletions
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index 3d6da4e3e003..3bfd87e3244c 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -371,10 +371,6 @@ void LoadEnv::startLoading()
if (!bStarted)
bStarted = impl_loadContent();
- // This may have triggered Dialogs (error cases) that may have
- // delayed the shutdown, so give delayed shutdown a chance
- Application::TriggerShutdownDelayed();
-
// not started => general error
// We can't say - what was the reason for.
if (!bStarted)