diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-18 13:15:17 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-18 13:29:17 +0100 |
| commit | 9aca34a69fdc75e81456f19ef457fd205e3471a4 (patch) | |
| tree | 41188e2af9ebcb735ba836487c3ba03a630ae1e2 /framework/source/uifactory | |
| parent | cf8dfcbe60c60597dd9a224a25114c3f382acc59 (diff) | |
Use cppu::BaseMutex instead of plain osl::Mutex as base
Change-Id: Iae8f91d93d4169c68cab6601c1c28042f20f3a48
Diffstat (limited to 'framework/source/uifactory')
| -rw-r--r-- | framework/source/uifactory/windowcontentfactorymanager.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
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 <com/sun/star/lang/XSingleComponentFactory.hpp> #include <com/sun/star/uno/XComponentContext.hpp> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase2.hxx> #include <cppuhelper/supportsservice.hxx> #include <tools/diagnose_ex.h> @@ -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<osl::Mutex *>(this)), + WindowContentFactoryManager_BASE(m_aMutex), m_xContext( rxContext ), m_bConfigRead( sal_False ) { |