diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-18 12:56:05 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-18 13:29:13 +0100 |
| commit | 93d6ce502ea2407f69dbbc0495c5ecb27c70a82a (patch) | |
| tree | f0c5763e2e32e5c02daa258a6976b1cd78b6606b /configmgr | |
| parent | af181dc1fca626a5b7f9afb3cb69c76ed5d46aa0 (diff) | |
Use cppu::BaseMutex instead of plain osl::Mutex as base
Change-Id: Ie87cc749556d0a9b135b285143d33dc80d49a2ad
Diffstat (limited to 'configmgr')
| -rw-r--r-- | configmgr/source/configurationprovider.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx index 40d580b5d5ca..fe74a111439c 100644 --- a/configmgr/source/configurationprovider.cxx +++ b/configmgr/source/configurationprovider.cxx @@ -44,6 +44,7 @@ #include "com/sun/star/util/XRefreshListener.hpp" #include "com/sun/star/util/XRefreshable.hpp" #include "cppu/unotype.hxx" +#include "cppuhelper/basemutex.hxx" #include "cppuhelper/compbase5.hxx" #include "cppuhelper/factory.hxx" #include "cppuhelper/implbase2.hxx" @@ -87,13 +88,12 @@ typedef ServiceBase; class Service: - private osl::Mutex, public ServiceBase, private boost::noncopyable + private cppu::BaseMutex, public ServiceBase, private boost::noncopyable { public: Service( css::uno::Reference< css::uno::XComponentContext > const context): - ServiceBase(*static_cast< osl::Mutex * >(this)), context_(context), - default_(true) + ServiceBase(m_aMutex), context_(context), default_(true) { lock_ = lock(); assert(context.is()); @@ -102,8 +102,8 @@ public: Service( css::uno::Reference< css::uno::XComponentContext > const context, OUString const & locale): - ServiceBase(*static_cast< osl::Mutex * >(this)), context_(context), - locale_(locale), default_(false) + ServiceBase(m_aMutex), context_(context), locale_(locale), + default_(false) { lock_ = lock(); assert(context.is()); |