mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use cppu::BaseMutex instead of framework::ThreadHelpBase

Browse Source 
Change-Id: I3e210cee3b6e0956175083ff0b55ff52c060d9c2
This commit is contained in:
Stephan Bergmann
2014-03-18 12:35:15 +01:00
parent 1ae379f6bd
commit bff533248d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/inc/classes/actiontriggerpropertyset.hxx
View File

@@ -20,7 +20,7 @@
#ifndef INCLUDED_FRAMEWORK_INC_CLASSES_ACTIONTRIGGERPROPERTYSET_HXX #ifndef INCLUDED_FRAMEWORK_INC_CLASSES_ACTIONTRIGGERPROPERTYSET_HXX
#define 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/propshlp.hxx>
#include <cppuhelper/weak.hxx> #include <cppuhelper/weak.hxx>
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
@@ -38,7 +38,7 @@
namespace framework 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::XServiceInfo ,
public ::com::sun::star::lang::XTypeProvider, public ::com::sun::star::lang::XTypeProvider,
public ::cppu::OBroadcastHelper , public ::cppu::OBroadcastHelper ,

4
framework/source/fwe/classes/actiontriggerpropertyset.cxx
View File

@@ -19,6 +19,7 @@
#include <classes/actiontriggerpropertyset.hxx> #include <classes/actiontriggerpropertyset.hxx>
#include <threadhelp/lockhelper.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp>
#include <cppuhelper/proptypehlp.hxx> #include <cppuhelper/proptypehlp.hxx>
#include <cppuhelper/supportsservice.hxx> #include <cppuhelper/supportsservice.hxx>
@@ -53,8 +54,7 @@ namespace framework
{ {
ActionTriggerPropertySet::ActionTriggerPropertySet() ActionTriggerPropertySet::ActionTriggerPropertySet()
: ThreadHelpBase ( &Application::GetSolarMutex() ) : OBroadcastHelper ( m_aMutex )
, OBroadcastHelper ( m_aLock.getShareableOslMutex() )
, OPropertySetHelper ( *(static_cast< OBroadcastHelper * >(this))) , OPropertySetHelper ( *(static_cast< OBroadcastHelper * >(this)))
, OWeakObject () , OWeakObject ()
, m_xBitmap ( 0 ) , m_xBitmap ( 0 )