From 9aca34a69fdc75e81456f19ef457fd205e3471a4 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 18 Mar 2014 13:15:17 +0100 Subject: Use cppu::BaseMutex instead of plain osl::Mutex as base Change-Id: Iae8f91d93d4169c68cab6601c1c28042f20f3a48 --- framework/source/uifactory/windowcontentfactorymanager.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'framework/source/uifactory') diff --git a/framework/source/uifactory/windowcontentfactorymanager.cxx b/framework/source/uifactory/windowcontentfactorymanager.cxx index 272b791b699e..7f96c591d00f 100644 --- a/framework/source/uifactory/windowcontentfactorymanager.cxx +++ b/framework/source/uifactory/windowcontentfactorymanager.cxx @@ -30,6 +30,7 @@ #include #include +#include #include #include #include @@ -43,7 +44,7 @@ typedef ::cppu::WeakComponentImplHelper2< com::sun::star::lang::XServiceInfo, com::sun::star::lang::XSingleComponentFactory > WindowContentFactoryManager_BASE; -class WindowContentFactoryManager : private osl::Mutex, +class WindowContentFactoryManager : private cppu::BaseMutex, public WindowContentFactoryManager_BASE { public: @@ -83,7 +84,7 @@ private: }; WindowContentFactoryManager::WindowContentFactoryManager( const uno::Reference< uno::XComponentContext >& rxContext ) : - WindowContentFactoryManager_BASE(*static_cast(this)), + WindowContentFactoryManager_BASE(m_aMutex), m_xContext( rxContext ), m_bConfigRead( sal_False ) { -- cgit