diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-20 11:42:02 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-20 15:04:13 +0100 |
| commit | f9c73e458f0be91f0034f98b3876cfbd4233371b (patch) | |
| tree | d7dc0e63f58fecc4e0deb3c7ba700ffe5ff72ff3 /framework | |
| parent | dd7b477e9dea0af0e23b5ac51f41421ad9af43cc (diff) | |
Use an osl::Mutex directly
Change-Id: I2ec909c81faabd896310b29b0d7149b0f7744b35
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/uielement/rootitemcontainer.hxx | 4 | ||||
| -rw-r--r-- | framework/source/fwi/uielement/rootitemcontainer.cxx | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/framework/inc/uielement/rootitemcontainer.hxx b/framework/inc/uielement/rootitemcontainer.hxx index 3403975d36e1..5bd06a5ba8a5 100644 --- a/framework/inc/uielement/rootitemcontainer.hxx +++ b/framework/inc/uielement/rootitemcontainer.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_ROOTITEMCONTAINER_HXX #define INCLUDED_FRAMEWORK_INC_UIELEMENT_ROOTITEMCONTAINER_HXX -#include <threadhelp/threadhelpbase.hxx> #include <macros/generic.hxx> #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> @@ -34,6 +33,7 @@ #include <com/sun/star/lang/XUnoTunnel.hpp> #include <rtl/ustring.hxx> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/implbase3.hxx> #include <cppuhelper/propshlp.hxx> @@ -49,7 +49,7 @@ typedef ::cppu::WeakImplHelper3< css::lang::XSingleComponentFactory, css::lang::XUnoTunnel > RootItemContainer_BASE; -class RootItemContainer : protected ThreadHelpBase , +class RootItemContainer : private cppu::BaseMutex, public ::cppu::OBroadcastHelper , public ::cppu::OPropertySetHelper , public RootItemContainer_BASE diff --git a/framework/source/fwi/uielement/rootitemcontainer.cxx b/framework/source/fwi/uielement/rootitemcontainer.cxx index 712cb2cdf83b..0d209caa9fd3 100644 --- a/framework/source/fwi/uielement/rootitemcontainer.cxx +++ b/framework/source/fwi/uielement/rootitemcontainer.cxx @@ -45,15 +45,13 @@ namespace framework { RootItemContainer::RootItemContainer() - : ThreadHelpBase ( ) - , ::cppu::OBroadcastHelperVar< ::cppu::OMultiTypeInterfaceContainerHelper, ::cppu::OMultiTypeInterfaceContainerHelper::keyType >( m_aLock.getShareableOslMutex() ) + : ::cppu::OBroadcastHelperVar< ::cppu::OMultiTypeInterfaceContainerHelper, ::cppu::OMultiTypeInterfaceContainerHelper::keyType >( m_aMutex ) , ::cppu::OPropertySetHelper ( *(static_cast< ::cppu::OBroadcastHelper* >(this)) ) { } RootItemContainer::RootItemContainer( const Reference< XIndexAccess >& rSourceContainer ) - : ThreadHelpBase ( ) - , ::cppu::OBroadcastHelperVar< ::cppu::OMultiTypeInterfaceContainerHelper, ::cppu::OMultiTypeInterfaceContainerHelper::keyType >( m_aLock.getShareableOslMutex() ) + : ::cppu::OBroadcastHelperVar< ::cppu::OMultiTypeInterfaceContainerHelper, ::cppu::OMultiTypeInterfaceContainerHelper::keyType >( m_aMutex ) , ::cppu::OPropertySetHelper ( *(static_cast< ::cppu::OBroadcastHelper* >(this)) ) { // We also have to copy the UIName property |