summaryrefslogtreecommitdiffstats
path: root/configmgr
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2020-10-02 08:10:46 +0200
committerStephan Bergmann <sbergman@redhat.com>2020-10-02 09:09:00 +0200
commitb4ddb579eeafbcf0fd7edd346401b31d00c0aa7b (patch)
treeb9e8c53c7c049e31e30ae94a5ab96fb4ce5d7a51 /configmgr
parentvcl: add more PDFiumTextPage and PDFiumPage wrappers (diff)
downloadcore-b4ddb579eeafbcf0fd7edd346401b31d00c0aa7b.tar.gz
core-b4ddb579eeafbcf0fd7edd346401b31d00c0aa7b.zip
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@redhat.com>
Diffstat (limited to 'configmgr')
-rw-r--r--configmgr/source/configmgr.component3
-rw-r--r--configmgr/source/defaultprovider.cxx2
2 files changed, 3 insertions, 2 deletions
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();