summaryrefslogtreecommitdiff
path: root/vcl/source/app/svapp.cxx
diff options
context:
space:
mode:
authorArmin Le Grand <Armin.Le.Grand@cib.de>2017-08-24 18:32:38 +0200
committerArmin Le Grand <Armin.Le.Grand@cib.de>2017-08-25 11:31:42 +0200
commitdb6b703d391838c481fd090065f6d329edcd4efa (patch)
treec17b58ca1f9e0f0beaa3b1b5c89d0e85bdaedaf7 /vcl/source/app/svapp.cxx
parent69cfafef7a28aad7a013bb440e15e23e59ea628c (diff)
Allow non-modal Dialogs during FileImport/Load
When opening a file that triggers Dialogs (e.g. cannot read/repair/FileType) the Frame from which it was initialized gets blocked. This irritates quite some people. Changed this to a non-modal Dialog so that the user can continue to work with all opened docs, open new ones, close and print/PDF/export these. Change-Id: I048d3de3369527cec20d26396b87439254764b8a Reviewed-on: https://gerrit.libreoffice.org/41534 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
Diffstat (limited to 'vcl/source/app/svapp.cxx')
-rw-r--r--vcl/source/app/svapp.cxx16
1 files changed, 16 insertions, 0 deletions
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index c4b900754f6f..5a5be865906f 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1677,4 +1677,20 @@ void Application::setDeInitHook(Link<LinkParamNone*,void> const & hook) {
pSVData->maAppData.mbInAppMain = true;
}
+void Application::SetShutdownDelayed()
+{
+ ImplSVData * pSVData = ImplGetSVData();
+ pSVData->maAppData.mbShutdownDelayed = true;
+}
+
+void Application::TriggerShutdownDelayed()
+{
+ ImplSVData * pSVData = ImplGetSVData();
+
+ if (pSVData->maAppData.mbShutdownDelayed && !Dialog::AreDialogsOpen())
+ {
+ Application::PostUserEvent(LINK(nullptr, ImplSVAppData, ImplPrepareExitMsg));
+ }
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */