diff options
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/dispatch/closedispatcher.cxx | 9 | ||||
| -rw-r--r-- | framework/source/loadenv/loadenv.cxx | 4 |
2 files changed, 0 insertions, 13 deletions
diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx index 2055cdc5d517..70d40f58f1cc 100644 --- a/framework/source/dispatch/closedispatcher.cxx +++ b/framework/source/dispatch/closedispatcher.cxx @@ -38,7 +38,6 @@ #include <vcl/window.hxx> #include <vcl/svapp.hxx> #include <vcl/syswin.hxx> -#include <vcl/dialog.hxx> #include <unotools/moduleoptions.hxx> #include <comphelper/processfactory.hxx> @@ -367,14 +366,6 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback, LinkParamNone*, void) } } - // if we still have dialogs open, temporary suppress termination - if (bTerminateApp && Dialog::AreDialogsOpen()) - { - Application::SetShutdownDelayed(); - bCloseFrame = true; - bTerminateApp = false; - } - // Do it now ... bool bSuccess = false; if (bCloseFrame) 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) |