From 295f7bcdc11d27af85b8b8ace8cefee7bed8cc3a Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 18 Mar 2014 13:05:00 +0100
Subject: [PATCH] Use cppu::BaseMutex instead of plain osl::Mutex as base

Change-Id: Ica3cccc21ea051c8eb653bb3160a0011c9680f38
---
 framework/inc/services/desktop.hxx    | 2 +-
 framework/source/services/desktop.cxx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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<osl::Mutex *>(this)              )
+        ,   Desktop_BASE            ( m_aMutex )
         ,   cppu::OPropertySetHelper( cppu::WeakComponentImplHelperBase::rBHelper   )
         // Init member
         ,   m_bIsTerminated         ( sal_False                                     )   // see dispose() for further information!