diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-18 12:35:15 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-18 13:29:13 +0100 |
| commit | bff533248df87249db93b60f9829b290900d4ae6 (patch) | |
| tree | 44e51174bc4d5f59aa07a154a53957fd996f6e43 | |
| parent | 1ae379f6bd85f7d6f7ebf58b15d7108a2982d74d (diff) | |
Use cppu::BaseMutex instead of framework::ThreadHelpBase
Change-Id: I3e210cee3b6e0956175083ff0b55ff52c060d9c2
| -rw-r--r-- | framework/inc/classes/actiontriggerpropertyset.hxx | 4 | ||||
| -rw-r--r-- | framework/source/fwe/classes/actiontriggerpropertyset.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/framework/inc/classes/actiontriggerpropertyset.hxx b/framework/inc/classes/actiontriggerpropertyset.hxx index c3219698afd3..88679fec7f96 100644 --- a/framework/inc/classes/actiontriggerpropertyset.hxx +++ b/framework/inc/classes/actiontriggerpropertyset.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_FRAMEWORK_INC_CLASSES_ACTIONTRIGGERPROPERTYSET_HXX #define INCLUDED_FRAMEWORK_INC_CLASSES_ACTIONTRIGGERPROPERTYSET_HXX -#include <threadhelp/threadhelpbase.hxx> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/propshlp.hxx> #include <cppuhelper/weak.hxx> #include <osl/mutex.hxx> @@ -38,7 +38,7 @@ namespace framework { -class ActionTriggerPropertySet : public ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. +class ActionTriggerPropertySet : private cppu::BaseMutex, public ::com::sun::star::lang::XServiceInfo , public ::com::sun::star::lang::XTypeProvider, public ::cppu::OBroadcastHelper , diff --git a/framework/source/fwe/classes/actiontriggerpropertyset.cxx b/framework/source/fwe/classes/actiontriggerpropertyset.cxx index 4e6e85d44066..6617aeb82c69 100644 --- a/framework/source/fwe/classes/actiontriggerpropertyset.cxx +++ b/framework/source/fwe/classes/actiontriggerpropertyset.cxx @@ -19,6 +19,7 @@ #include <classes/actiontriggerpropertyset.hxx> +#include <threadhelp/lockhelper.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <cppuhelper/proptypehlp.hxx> #include <cppuhelper/supportsservice.hxx> @@ -53,8 +54,7 @@ namespace framework { ActionTriggerPropertySet::ActionTriggerPropertySet() - : ThreadHelpBase ( &Application::GetSolarMutex() ) - , OBroadcastHelper ( m_aLock.getShareableOslMutex() ) + : OBroadcastHelper ( m_aMutex ) , OPropertySetHelper ( *(static_cast< OBroadcastHelper * >(this))) , OWeakObject () , m_xBitmap ( 0 ) |