diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-11-17 10:29:24 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2022-01-21 12:42:20 +0100 |
| commit | a9bb94e28a6757719a2e833c9d3ca17b3205283b (patch) | |
| tree | 23e68d198a5fc609bfbb5567b0be90f2f4638935 /vcl/inc/salinst.hxx | |
| parent | 3eb6d764b3023500f2299d36bf1860bc8e67db9f (diff) | |
VCL fix shutdown when run via system loop
Adds DoQuit and SAL_USE_SYSTEM_LOOP to complement DoExecute.
Makes it easier to switch between a LO with and without nested
event processing. Unfortunatly the recovery dialogs run outside
of Application::Execute(), so this currently also disables
recovery handling.
Follow-up (and no more Emscripten-specific) change to commit
93133585b5b52e38defc3162eeb1e7704dceafcb ("WASM optionally run
any app via system loop").
Change-Id: I1b622065d7fa0c5ad03a7c7daaf8241dcc3f09a3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128717
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'vcl/inc/salinst.hxx')
| -rw-r--r-- | vcl/inc/salinst.hxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx index 90367c06bcc9..084ab2e51c58 100644 --- a/vcl/inc/salinst.hxx +++ b/vcl/inc/salinst.hxx @@ -215,7 +215,9 @@ public: // Note: we cannot make this a global variable, because it might be initialised BEFORE the putenv() call in cppunittester. static bool IsRunningUnitTest() { return getenv("LO_TESTNAME") != nullptr; } - virtual bool DoExecute(int & /* nExitCode */) { return false; } + // both must to be implemented, if the VCL plugin needs to run via system event loop + virtual bool DoExecute(int &nExitCode); + virtual void DoQuit(); }; // called from SVMain |