use own mutex

2 files changed, 16 insertions, 11 deletions

diff --git a/sw/source/ui/inc/unodispatch.hxx b/sw/source/ui/inc/unodispatch.hxx
index e525b0d0c8d9..27bf9b34b03b 100644
--- a/sw/source/ui/inc/unodispatch.hxx
+++ b/sw/source/ui/inc/unodispatch.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unodispatch.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: os $ $Date: 2001-03-09 15:00:15 $
+ *  last change: $Author: os $ $Date: 2001-03-13 10:45:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -77,6 +77,9 @@
 #include <cppuhelper/implbase2.hxx>
 #endif
 #include <list>
+#ifndef _OSL_MUTEX_HXX_
+#include <osl/mutex.hxx>
+#endif
 
 class SwView;
 //---------------------------------------------------------------------------------------------------------------------
@@ -86,6 +89,8 @@ class SwXDispatchProviderInterceptor : public cppu::WeakImplHelper2
     ::com::sun::star::lang::XEventListener
 >
 {
+    ::osl::Mutex                     m_aMutex;
+
     // the component which's dispatches we're intercepting
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterception>   m_xIntercepted;
 
diff --git a/sw/source/ui/uno/unodispatch.cxx b/sw/source/ui/uno/unodispatch.cxx
index 07c8d5ce4cfb..6f73380efc85 100644
--- a/sw/source/ui/uno/unodispatch.cxx
+++ b/sw/source/ui/uno/unodispatch.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unodispatch.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: os $ $Date: 2001-03-09 14:58:17 $
+ *  last change: $Author: os $ $Date: 2001-03-13 10:45:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -136,7 +136,7 @@ Reference< XDispatch > SwXDispatchProviderInterceptor::queryDispatch(
     const URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags )
         throw(RuntimeException)
 {
-    OGuard aGuard(Application::GetSolarMutex());
+    OGuard aGuard(m_aMutex);
     Reference< XDispatch> xResult;
     // create some dispatch ...
     if(!aURL.Complete.compareToAscii(cURLStart, 23))
@@ -163,7 +163,7 @@ Reference< XDispatch > SwXDispatchProviderInterceptor::queryDispatch(
 Sequence< Reference< XDispatch > > SwXDispatchProviderInterceptor::queryDispatches(
     const Sequence< DispatchDescriptor >& aDescripts ) throw(RuntimeException)
 {
-    OGuard aGuard(Application::GetSolarMutex());
+    OGuard aGuard(m_aMutex);
     Sequence< Reference< XDispatch> > aReturn(aDescripts.getLength());
     Reference< XDispatch>* pReturn = aReturn.getArray();
     const DispatchDescriptor* pDescripts = aDescripts.getConstArray();
@@ -180,7 +180,7 @@ Sequence< Reference< XDispatch > > SwXDispatchProviderInterceptor::queryDispatch
 Reference< XDispatchProvider > SwXDispatchProviderInterceptor::getSlaveDispatchProvider(  )
         throw(RuntimeException)
 {
-    OGuard aGuard(Application::GetSolarMutex());
+    OGuard aGuard(m_aMutex);
     return m_xSlaveDispatcher;
 }
 /*-- 07.11.00 13:25:52---------------------------------------------------
@@ -189,7 +189,7 @@ Reference< XDispatchProvider > SwXDispatchProviderInterceptor::getSlaveDispatchP
 void SwXDispatchProviderInterceptor::setSlaveDispatchProvider(
     const Reference< XDispatchProvider >& xNewDispatchProvider ) throw(RuntimeException)
 {
-    OGuard aGuard(Application::GetSolarMutex());
+    OGuard aGuard(m_aMutex);
     m_xSlaveDispatcher = xNewDispatchProvider;
 }
 /*-- 07.11.00 13:25:52---------------------------------------------------
@@ -198,7 +198,7 @@ void SwXDispatchProviderInterceptor::setSlaveDispatchProvider(
 Reference< XDispatchProvider > SwXDispatchProviderInterceptor::getMasterDispatchProvider(  )
         throw(RuntimeException)
 {
-    OGuard aGuard(Application::GetSolarMutex());
+    OGuard aGuard(m_aMutex);
     return m_xMasterDispatcher;
 }
 /*-- 07.11.00 13:25:52---------------------------------------------------
@@ -207,7 +207,7 @@ Reference< XDispatchProvider > SwXDispatchProviderInterceptor::getMasterDispatch
 void SwXDispatchProviderInterceptor::setMasterDispatchProvider(
     const Reference< XDispatchProvider >& xNewSupplier ) throw(RuntimeException)
 {
-    OGuard aGuard(Application::GetSolarMutex());
+    OGuard aGuard(m_aMutex);
     m_xMasterDispatcher = xNewSupplier;
 }
 /*-- 07.11.00 13:25:53---------------------------------------------------
@@ -216,7 +216,7 @@ void SwXDispatchProviderInterceptor::setMasterDispatchProvider(
 void SwXDispatchProviderInterceptor::disposing( const EventObject& Source )
     throw(RuntimeException)
 {
-    OGuard aGuard(Application::GetSolarMutex());
+    OGuard aGuard(m_aMutex);
     if (m_xIntercepted.is())
     {
         m_xIntercepted->releaseDispatchProviderInterceptor((XDispatchProviderInterceptor*)this);