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: Ica3cccc21ea051c8eb653bb3160a0011c9680f38
This commit is contained in:
Stephan Bergmann
2014-03-18 13:05:00 +01:00
parent dc02e9ef55
commit 295f7bcdc1
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/inc/services/desktop.hxx
View File

@@ -97,7 +97,7 @@ typedef cppu::WeakComponentImplHelper6<
css::task::XInteractionHandler , css::task::XInteractionHandler ,
css::frame::XUntitledNumbers > Desktop_BASE; css::frame::XUntitledNumbers > Desktop_BASE;
class Desktop : private osl::Mutex, class Desktop : private cppu::BaseMutex,
private ThreadHelpBase, private ThreadHelpBase,
private TransactionBase, private TransactionBase,
public Desktop_BASE, public Desktop_BASE,

2
framework/source/services/desktop.cxx
View File

@@ -156,7 +156,7 @@ void Desktop::constructorInit()
Desktop::Desktop( const css::uno::Reference< css::uno::XComponentContext >& xContext ) Desktop::Desktop( const css::uno::Reference< css::uno::XComponentContext >& xContext )
: ThreadHelpBase ( &Application::GetSolarMutex() ) : ThreadHelpBase ( &Application::GetSolarMutex() )
, TransactionBase ( ) , TransactionBase ( )
, Desktop_BASE ( *static_cast<osl::Mutex *>(this) ) , Desktop_BASE ( m_aMutex )
, cppu::OPropertySetHelper( cppu::WeakComponentImplHelperBase::rBHelper ) , cppu::OPropertySetHelper( cppu::WeakComponentImplHelperBase::rBHelper )
// Init member // Init member
, m_bIsTerminated ( sal_False ) // see dispose() for further information! , m_bIsTerminated ( sal_False ) // see dispose() for further information!