core.git: Branch 'distro/collabora/co-24.04' - desktop/source

[Michael Meeks (via logerrit)]

 desktop/source/lib/init.cxx |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit 84ede4db0482a5bdcdb3398483ec1a63f7167012
Author:     Michael Meeks <michael.me...@collabora.com>
AuthorDate: Mon May 20 14:03:51 2024 +0100
Commit:     Michael Meeks <michael.me...@collabora.com>
CommitDate: Mon May 20 15:39:12 2024 +0200

    lok: joinThreads - take down configmgr's write-thread.
    
    Change-Id: I1f9b6b88ef7e97da02fecf2035f953584cd28c16
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167868
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Reviewed-by: Michael Meeks <michael.me...@collabora.com>
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index cb487d641ac8..f00edb9ec9c9 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -112,6 +112,8 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/util/URLTransformer.hpp>
+#include <com/sun/star/util/XFlushable.hpp>
+#include <com/sun/star/configuration/theDefaultProvider.hpp>
 #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
 #include <com/sun/star/datatransfer/UnsupportedFlavorException.hpp>
 #include <com/sun/star/datatransfer/XTransferable2.hpp>
@@ -3397,6 +3399,12 @@ static int lo_joinThreads(LibreOfficeKit* /* pThis */)
     if (joinable && !joinable->joinThreads())
         return 0;
 
+    // Ensure configmgr's write thread is down
+    css::uno::Reference< css::util::XFlushable >(
+        css::configuration::theDefaultProvider::get(
+            comphelper::getProcessComponentContext()),
+        css::uno::UNO_QUERY_THROW)->flush();
+
     return 1;
 }