diff options
| author | Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> | 2022-06-15 14:25:36 +0200 |
|---|---|---|
| committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2022-06-20 08:57:31 +0200 |
| commit | 41ff8b83e04366020785bcfb3d2af3f165d007e1 (patch) | |
| tree | 4b0451eacb24d5da210f78f0b6e400324a46daf0 | |
| parent | tdf#135976 sw: preserve flys on backspace/delete with redlining enabled (diff) | |
| download | core-41ff8b83e04366020785bcfb3d2af3f165d007e1.tar.gz core-41ff8b83e04366020785bcfb3d2af3f165d007e1.zip | |
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>
| -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; } |