tdf#127205 split Desktop::terminate process

Trying to somehow keep stuff correctly alive, truned out to be
rather futile. Originally I tried the same way Caolan did in the
attached patch to tdf#88985, when he finally settled on adding a
special terminate listener.

But this is not enough to handle in-process scripted extensions,
like Java, Python or even Basic macros themself.

So this separates the module shutdown and SfxApplication cleanup
from the rest of the terminate call.

Change-Id: Ice59816080c922a17511b68afe59348a662600c9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88835
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>

1 files changed, 8 insertions, 1 deletions

diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index b6b5917b3eac..1f9a0e1da9d1 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -186,6 +186,10 @@ bool Application::QueryExit()
         return true;
 }
 
+void Application::Shutdown()
+{
+}
+
 void Application::Init()
 {
 }
@@ -429,6 +433,8 @@ void Application::Execute()
         Application::Yield();
 
     pSVData->maAppData.mbInAppExecute = false;
+
+    GetpApp()->Shutdown();
 }
 
 static bool ImplYield(bool i_bWait, bool i_bAllEvents)
@@ -514,11 +520,12 @@ void Application::Yield()
 
 IMPL_STATIC_LINK_NOARG( ImplSVAppData, ImplQuitMsg, void*, void )
 {
-    ImplGetSVData()->maAppData.mbAppQuit = true;
+    assert(ImplGetSVData()->maAppData.mbAppQuit);
 }
 
 void Application::Quit()
 {
+    ImplGetSVData()->maAppData.mbAppQuit = true;
     Application::PostUserEvent( LINK( nullptr, ImplSVAppData, ImplQuitMsg ) );
 }