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

Use cppu::BaseMutex instead of plain osl::Mutex as base

Browse Source 
Change-Id: I2880172edbabcd41f8847359b1b308658a9e07c8
This commit is contained in:
Stephan Bergmann
2014-03-18 13:12:45 +01:00
parent 2d604c48aa
commit 5fe8aa2d48
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
framework/source/uiconfiguration/windowstateconfiguration.cxx
View File

@@ -36,6 +36,7 @@
#include <com/sun/star/util/XChangesBatch.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase2.hxx>
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/supportsservice.hxx>
@@ -1282,7 +1283,7 @@ sal_Bool ConfigurationAccess_WindowState::impl_initializeConfigAccess()
typedef ::cppu::WeakComponentImplHelper2< css::container::XNameAccess,
css::lang::XServiceInfo> WindowStateConfiguration_BASE;
class WindowStateConfiguration : private osl::Mutex,
class WindowStateConfiguration : private cppu::BaseMutex,
public WindowStateConfiguration_BASE
{
public:
@@ -1342,7 +1343,7 @@ private:
};
WindowStateConfiguration::WindowStateConfiguration( const Reference< XComponentContext >& rxContext ) :
WindowStateConfiguration_BASE(*static_cast<osl::Mutex *>(this)),
WindowStateConfiguration_BASE(m_aMutex),
m_xContext( rxContext )
{
css::uno::Reference< css::frame::XModuleManager2 > xModuleManager =