Use cppu::BaseMutex instead of plain osl::Mutex as base

Change-Id: I6c3baa4fffaeab01833d49530c27a094429e9b5f
This commit is contained in:
Stephan Bergmann
2014-03-18 13:11:40 +01:00
parent 075fbcee09
commit 03bee712e7

View File

@@ -35,6 +35,7 @@
#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <comphelper/sequenceashashmap.hxx> #include <comphelper/sequenceashashmap.hxx>
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase2.hxx> #include <cppuhelper/compbase2.hxx>
#include <cppuhelper/supportsservice.hxx> #include <cppuhelper/supportsservice.hxx>
#include <svtools/colorcfg.hxx> #include <svtools/colorcfg.hxx>
@@ -50,7 +51,7 @@ typedef ::cppu::WeakComponentImplHelper2<
css::lang::XServiceInfo, css::lang::XServiceInfo,
css::lang::XSingleServiceFactory> TaskCreatorService_BASE; css::lang::XSingleServiceFactory> TaskCreatorService_BASE;
class TaskCreatorService : private osl::Mutex, class TaskCreatorService : private cppu::BaseMutex,
public TaskCreatorService_BASE public TaskCreatorService_BASE
{ {
private: private:
@@ -117,7 +118,7 @@ private:
TaskCreatorService::TaskCreatorService(const css::uno::Reference< css::uno::XComponentContext >& xContext) TaskCreatorService::TaskCreatorService(const css::uno::Reference< css::uno::XComponentContext >& xContext)
: TaskCreatorService_BASE(*static_cast<osl::Mutex *>(this)) : TaskCreatorService_BASE(m_aMutex)
, m_xContext (xContext ) , m_xContext (xContext )
{ {
} }