From d8910d12b897e622f4b5f8a47d8a10fe77efbef8 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 20 Mar 2014 11:49:39 +0100 Subject: Use an osl::Mutex directly Change-Id: I4adad36de95c022a7945b61a44bb6166ad87a8a7 --- framework/inc/dispatch/oxt_handler.hxx | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'framework/inc/dispatch') diff --git a/framework/inc/dispatch/oxt_handler.hxx b/framework/inc/dispatch/oxt_handler.hxx index 7ce5f92e8655..c3676c033ced 100644 --- a/framework/inc/dispatch/oxt_handler.hxx +++ b/framework/inc/dispatch/oxt_handler.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_DISPATCH_OXT_HANDLER_HXX #define INCLUDED_FRAMEWORK_INC_DISPATCH_OXT_HANDLER_HXX -#include #include #include #include @@ -53,11 +52,7 @@ namespace framework{ @devstatus ready @threadsafe yes *//*-*************************************************************************************************************/ -class Oxt_Handler : // baseclasses - // Order is necessary for right initialization! - private ThreadHelpBase - // interfaces - , public ::cppu::WeakImplHelper3< +class Oxt_Handler : public ::cppu::WeakImplHelper3< css::lang::XServiceInfo, css::frame::XNotifyingDispatch, // => XDispatch css::document::XExtendedFilterDetection > @@ -114,6 +109,7 @@ class Oxt_Handler : // baseclasses // (should be private everyway!) private: + osl::Mutex m_mutex; css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory ; /// global uno service factory to create new services css::uno::Reference< css::uno::XInterface > m_xSelfHold ; /// we must protect us against dieing during async(!) dispatch() call! -- cgit