summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>2022-06-15 14:25:36 +0200
committerSamuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>2022-06-15 20:53:45 +0200
commit539374caa5deac788f394a54a75b6e167ab04864 (patch)
tree0cccaf5885eead613b83d3f2e4b38444f3d0ce8a /framework
parent2f30596347b12a7d0b9b78a1e4e2bc50eca9223a (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>
Diffstat (limited to 'framework')
-rw-r--r--framework/source/dispatch/closedispatcher.cxx13
1 files changed, 9 insertions, 4 deletions
diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx
index 19fe9ffaa69d..a6ff39d459c3 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -353,12 +353,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;
}