diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-18 13:14:30 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-18 13:29:16 +0100 |
| commit | cf8dfcbe60c60597dd9a224a25114c3f382acc59 (patch) | |
| tree | fb581e982eeafb5c008ef972fc90370096b3297c | |
| parent | 28b880d4074fc105ed4bc01e4bbe3866cad047cb (diff) | |
Use cppu::BaseMutex instead of plain osl::Mutex as base
Change-Id: Ie8b5c4ad21133528597ede8c4e5cf4dc35312ed8
| -rw-r--r-- | framework/source/uifactory/uielementfactorymanager.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx index 248d322db878..8738d35da6c7 100644 --- a/framework/source/uifactory/uielementfactorymanager.cxx +++ b/framework/source/uifactory/uielementfactorymanager.cxx @@ -35,6 +35,7 @@ #include <com/sun/star/ui/XUIElementFactoryManager.hpp> #include <rtl/ustrbuf.hxx> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase2.hxx> #include <cppuhelper/supportsservice.hxx> #include <vcl/svapp.hxx> @@ -352,7 +353,7 @@ typedef ::cppu::WeakComponentImplHelper2< css::lang::XServiceInfo, css::ui::XUIElementFactoryManager> UIElementFactoryManager_BASE; -class UIElementFactoryManager : private osl::Mutex, +class UIElementFactoryManager : private cppu::BaseMutex, public UIElementFactoryManager_BASE { virtual void SAL_CALL disposing() SAL_OVERRIDE; @@ -396,7 +397,7 @@ private: }; UIElementFactoryManager::UIElementFactoryManager( const Reference< XComponentContext >& rxContext ) : - UIElementFactoryManager_BASE(*static_cast<osl::Mutex *>(this)), + UIElementFactoryManager_BASE(m_aMutex), m_bConfigRead( sal_False ), m_xContext(rxContext) { |