diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-18 13:13:42 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-18 13:29:16 +0100 |
| commit | 28b880d4074fc105ed4bc01e4bbe3866cad047cb (patch) | |
| tree | c0c0330199c8a6ffdcf501aebd0629df60e48e7e | |
| parent | 5fe8aa2d485104609a63237e2ef6676b36e046e9 (diff) | |
Use cppu::BaseMutex instead of plain osl::Mutex as base
Change-Id: I5b6e30ce0e0b908cfcc4feb00cbf7b78425496c6
| -rw-r--r-- | framework/source/uifactory/uicontrollerfactory.cxx | 5 |
1 files 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 <com/sun/star/frame/XUIControllerFactory.hpp> #include <rtl/ustrbuf.hxx> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase2.hxx> #include <cppuhelper/supportsservice.hxx> @@ -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<osl::Mutex *>(this)) + : UIControllerFactory_BASE(m_aMutex) , m_bConfigRead( sal_False ) , m_xContext( xContext ) , m_pConfigAccess() |