diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-01-02 08:05:01 +0100 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-01-02 19:07:20 +0100 |
commit | cb109d6518cc36155f9d0665932de0a54fdb6f4a (patch) | |
tree | 7ea0a4d7f2ea197495f49f03529e0f9fce5acc13 /configmgr/source/readonlyaccess.cxx | |
parent | c7043c0f2aab380648c8e35b8724107a881978b3 (diff) |
Revert "no need to use shared_ptr here"
This reverts commit 122598af564082786f01b4eafdb9f09f0cffdf5f.
Reason for revert: shared_ptr was introduced for fdo#31494, to avoid issues during shutdown
Change-Id: I1c3ef4a966b9244da1e504806e917d1918b83803
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86095
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'configmgr/source/readonlyaccess.cxx')
-rw-r--r-- | configmgr/source/readonlyaccess.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configmgr/source/readonlyaccess.cxx b/configmgr/source/readonlyaccess.cxx index f8ee113eadf2..079459dc747f 100644 --- a/configmgr/source/readonlyaccess.cxx +++ b/configmgr/source/readonlyaccess.cxx @@ -93,7 +93,7 @@ void Service::initialize(css::uno::Sequence< css::uno::Any > const & aArguments) throw css::uno::RuntimeException( "already initialized", static_cast< cppu::OWeakObject * >(this)); } - osl::MutexGuard g2(theConfigLock()); + osl::MutexGuard g2(*lock()); Components & components = Components::getSingleton(context_); root_ = new RootAccess(components, "/", locale, false); components.addRootAccess(root_); |