summaryrefslogtreecommitdiffstats
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 14:50:50 +0200
commitc1ca0de5cc03044f5d292aa5b9276e378c2511e3 (patch)
tree0af6946d07f1747e6f01911725038332c9fd7509
parentRevert "binaryurp: create instances with uno constructors" (diff)
downloadcore-c1ca0de5cc03044f5d292aa5b9276e378c2511e3.tar.gz
core-c1ca0de5cc03044f5d292aa5b9276e378c2511e3.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
-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 c5da1bb44d15..da40936c4ad6 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -355,12 +355,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;
}