diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-12 18:57:32 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-12 18:57:32 -0600 |
| commit | 9cd038e5b89c978ea24ba7efa7c3152801190455 (patch) | |
| tree | 7d938fd9373eb827095787955e2feffca942b8fd /configmgr | |
| parent | e65c0fe553a9d1b85dcacfff7af9df8231427876 (diff) | |
fix mis-merge all-around.
Diffstat (limited to 'configmgr')
| -rwxr-xr-x | configmgr/source/defaultprovider.cxx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/configmgr/source/defaultprovider.cxx b/configmgr/source/defaultprovider.cxx index 6e65301e8c82..c938e2b31951 100755 --- a/configmgr/source/defaultprovider.cxx +++ b/configmgr/source/defaultprovider.cxx @@ -43,14 +43,12 @@ namespace configmgr { namespace default_provider { -namespace { - namespace css = com::sun::star; css::uno::Reference< css::uno::XInterface > create( css::uno::Reference< css::uno::XComponentContext > const & context) { - osl::MutexGuard guard(*lock_); + osl::MutexGuard guard(*lock()); static css::uno::Reference< css::uno::XInterface > singleton( configuration_provider::createDefault(context)); return singleton; |