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

Use an osl::Mutex directly

Browse Source 
Change-Id: I2ec909c81faabd896310b29b0d7149b0f7744b35
This commit is contained in:
Stephan Bergmann
2014-03-20 11:42:02 +01:00
parent dd7b477e9d
commit f9c73e458f
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/inc/uielement/rootitemcontainer.hxx
View File

@@ -20,7 +20,6 @@
#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_ROOTITEMCONTAINER_HXX #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_ROOTITEMCONTAINER_HXX
#define INCLUDED_FRAMEWORK_INC_UIELEMENT_ROOTITEMCONTAINER_HXX #define INCLUDED_FRAMEWORK_INC_UIELEMENT_ROOTITEMCONTAINER_HXX
#include <threadhelp/threadhelpbase.hxx>
#include <macros/generic.hxx> #include <macros/generic.hxx>
#include <macros/xinterface.hxx> #include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx> #include <macros/xtypeprovider.hxx>
@@ -34,6 +33,7 @@
#include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/implbase3.hxx> #include <cppuhelper/implbase3.hxx>
#include <cppuhelper/propshlp.hxx> #include <cppuhelper/propshlp.hxx>
@@ -49,7 +49,7 @@ typedef ::cppu::WeakImplHelper3<
css::lang::XSingleComponentFactory, css::lang::XSingleComponentFactory,
css::lang::XUnoTunnel > RootItemContainer_BASE; css::lang::XUnoTunnel > RootItemContainer_BASE;
class RootItemContainer : protected ThreadHelpBase , class RootItemContainer : private cppu::BaseMutex,
public ::cppu::OBroadcastHelper , public ::cppu::OBroadcastHelper ,
public ::cppu::OPropertySetHelper , public ::cppu::OPropertySetHelper ,
public RootItemContainer_BASE public RootItemContainer_BASE

6
framework/source/fwi/uielement/rootitemcontainer.cxx
View File

@@ -45,15 +45,13 @@ namespace framework
{ {
RootItemContainer::RootItemContainer() RootItemContainer::RootItemContainer()
: ThreadHelpBase ( ) : ::cppu::OBroadcastHelperVar< ::cppu::OMultiTypeInterfaceContainerHelper, ::cppu::OMultiTypeInterfaceContainerHelper::keyType >( m_aMutex )
, ::cppu::OBroadcastHelperVar< ::cppu::OMultiTypeInterfaceContainerHelper, ::cppu::OMultiTypeInterfaceContainerHelper::keyType >( m_aLock.getShareableOslMutex() )
, ::cppu::OPropertySetHelper ( *(static_cast< ::cppu::OBroadcastHelper* >(this)) ) , ::cppu::OPropertySetHelper ( *(static_cast< ::cppu::OBroadcastHelper* >(this)) )
{ {
} }
RootItemContainer::RootItemContainer( const Reference< XIndexAccess >& rSourceContainer ) RootItemContainer::RootItemContainer( const Reference< XIndexAccess >& rSourceContainer )
: ThreadHelpBase ( ) : ::cppu::OBroadcastHelperVar< ::cppu::OMultiTypeInterfaceContainerHelper, ::cppu::OMultiTypeInterfaceContainerHelper::keyType >( m_aMutex )
, ::cppu::OBroadcastHelperVar< ::cppu::OMultiTypeInterfaceContainerHelper, ::cppu::OMultiTypeInterfaceContainerHelper::keyType >( m_aLock.getShareableOslMutex() )
, ::cppu::OPropertySetHelper ( *(static_cast< ::cppu::OBroadcastHelper* >(this)) ) , ::cppu::OPropertySetHelper ( *(static_cast< ::cppu::OBroadcastHelper* >(this)) )
{ {
// We also have to copy the UIName property // We also have to copy the UIName property