From 28b880d4074fc105ed4bc01e4bbe3866cad047cb Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 18 Mar 2014 13:13:42 +0100 Subject: Use cppu::BaseMutex instead of plain osl::Mutex as base Change-Id: I5b6e30ce0e0b908cfcc4feb00cbf7b78425496c6 --- framework/source/uifactory/uicontrollerfactory.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/framework/source/uifactory/uicontrollerfactory.cxx b/framework/source/uifactory/uicontrollerfactory.cxx index 5fa49a03ebd0..d197d93d25f0 100644 --- a/framework/source/uifactory/uicontrollerfactory.cxx +++ b/framework/source/uifactory/uicontrollerfactory.cxx @@ -25,6 +25,7 @@ #include #include +#include #include #include @@ -41,7 +42,7 @@ typedef ::cppu::WeakComponentImplHelper2< css::lang::XServiceInfo, css::frame::XUIControllerFactory > UIControllerFactory_BASE; -class UIControllerFactory : private osl::Mutex, +class UIControllerFactory : private cppu::BaseMutex, public UIControllerFactory_BASE { public: @@ -75,7 +76,7 @@ private: UIControllerFactory::UIControllerFactory( const Reference< XComponentContext >& xContext, const rtl::OUString &rConfigurationNode ) - : UIControllerFactory_BASE(*static_cast(this)) + : UIControllerFactory_BASE(m_aMutex) , m_bConfigRead( sal_False ) , m_xContext( xContext ) , m_pConfigAccess() -- cgit