[Libreoffice-commits] core.git: configmgr/source

[Stephan Bergmann (via logerrit)]

 configmgr/source/configmgr.component |    3 ++-
 configmgr/source/defaultprovider.cxx |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit b4ddb579eeafbcf0fd7edd346401b31d00c0aa7b
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Oct 2 08:10:46 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Oct 2 09:09:00 2020 +0200

    Use the new single-instance="true" attribute in configmgr
    
    Change-Id: Ib5873aedd5c49dd2f8c099190e78de9b85fcd53a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103787
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/configmgr/source/configmgr.component b/configmgr/source/configmgr.component
index c8b0c4f01260..ff46b6070393 100644
--- a/configmgr/source/configmgr.component
+++ b/configmgr/source/configmgr.component
@@ -28,7 +28,8 @@
     <service name="com.sun.star.configuration.ConfigurationRegistry"/>
   </implementation>
   <implementation name="com.sun.star.comp.configuration.DefaultProvider"
-    constructor="com_sun_star_comp_configuration_DefaultProvider_get_implementation">
+    constructor="com_sun_star_comp_configuration_DefaultProvider_get_implementation"
+    single-instance="true">
     <service name="com.sun.star.configuration.DefaultProvider"/>
     <singleton name="com.sun.star.configuration.theDefaultProvider"/>
   </implementation>
diff --git a/configmgr/source/defaultprovider.cxx b/configmgr/source/defaultprovider.cxx
index 4cc7a24d0c93..131f548a039e 100644
--- a/configmgr/source/defaultprovider.cxx
+++ b/configmgr/source/defaultprovider.cxx
@@ -34,7 +34,7 @@ com_sun_star_comp_configuration_DefaultProvider_get_implementation(
     css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const&)
 {
     osl::MutexGuard guard(*configmgr::lock());
-    static css::uno::Reference< css::uno::XInterface > singleton(
+    css::uno::Reference< css::uno::XInterface > singleton(
         configmgr::configuration_provider::createDefault(context));
     singleton->acquire();
     return singleton.get();