summaryrefslogtreecommitdiffstats
path: root/include/vcl/svapp.hxx
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 /include/vcl/svapp.hxx
parenttdf#100387 tdf#100389 OOXML animation export fixes (diff)
downloadcore-db6b703d391838c481fd090065f6d329edcd4efa.tar.gz
core-db6b703d391838c481fd090065f6d329edcd4efa.zip
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 'include/vcl/svapp.hxx')
-rw-r--r--include/vcl/svapp.hxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index d5b81b2a20a4..7bdb4daccfb6 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -1387,6 +1387,12 @@ public:
// For vclbootstrapprotector:
static void setDeInitHook(Link<LinkParamNone*,void> const & hook);
+ // for delayed shutdown: set using SetShutdownDelayed, then
+ // trigger using TriggerShutdownDelayed which may actually shutdown
+ // when SetShutdownDelayed is set
+ static void SetShutdownDelayed();
+ static void TriggerShutdownDelayed();
+
private:
DECL_STATIC_LINK( Application, PostEventHandler, void*, void );
};