diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx index 863788a79b51..f2a1c10ccdcd 100644 --- a/framework/inc/services/desktop.hxx +++ b/framework/inc/services/desktop.hxx @@ -97,7 +97,7 @@ typedef cppu::WeakComponentImplHelper6< css::task::XInteractionHandler , css::frame::XUntitledNumbers > Desktop_BASE; -class Desktop : private osl::Mutex, +class Desktop : private cppu::BaseMutex, private ThreadHelpBase, private TransactionBase, public Desktop_BASE, diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index fadbdf074dd8..b2be9b805736 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -156,7 +156,7 @@ void Desktop::constructorInit() Desktop::Desktop( const css::uno::Reference< css::uno::XComponentContext >& xContext ) : ThreadHelpBase ( &Application::GetSolarMutex() ) , TransactionBase ( ) - , Desktop_BASE ( *static_cast(this) ) + , Desktop_BASE ( m_aMutex ) , cppu::OPropertySetHelper( cppu::WeakComponentImplHelperBase::rBHelper ) // Init member , m_bIsTerminated ( sal_False ) // see dispose() for further information!