diff options
| author | Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> | 2022-06-15 14:25:36 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2022-06-24 13:42:28 +0200 |
| commit | 57137a8e80a769a79b5f9974ddc7d39324b6102e (patch) | |
| tree | 2afbea49b747ebde4a7e3db302a00aac9739d14e /framework/source | |
| parent | 8125a684a5412b59831eb916d495f340d2e496ae (diff) | |
Show start center when closing last document
also when there are active UNO connections.
(Behavior was different when there were active UNO connections)
Change-Id: Ief37b0f362b7e2a47eccbec985ee3017c475046c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135905
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>
(cherry picked from commit 539374caa5deac788f394a54a75b6e167ab04864)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135940
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Diffstat (limited to 'framework/source')
| -rw-r--r-- | framework/source/dispatch/closedispatcher.cxx | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx index 6b2a13cb4eb7..d9ad8f080e38 100644 --- a/framework/source/dispatch/closedispatcher.cxx +++ b/framework/source/dispatch/closedispatcher.cxx @@ -351,12 +351,17 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback, LinkParamNone*, void) // application or establish the backing mode now. // And that depends from the dispatched URL ... { - if (bHasActiveConnections) - bCloseFrame = true; - else if (eOperation == E_CLOSE_FRAME) - bTerminateApp = true; + if (eOperation == E_CLOSE_FRAME) + { + if (bHasActiveConnections) + bCloseFrame = true; + else + bTerminateApp = true; + } else if( SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::EModule::STARTMODULE) ) bEstablishBackingMode = true; + else if (bHasActiveConnections) + bCloseFrame = true; else bTerminateApp = true; } |