framework/source/dispatch/interceptionhelper.cxx | 26 -----------------------
1 file changed, 26 deletions(-)
New commits:
commit b200445efb3eb722e75e653d03c51f2e4439345c
Author: Vasily Melenchuk <vasily.melenc...@cib.de>
AuthorDate: Mon Sep 10 15:22:35 2018 +0300
Commit: Vasily Melenchuk <vasily.melenc...@cib.de>
CommitDate: Mon Sep 10 15:25:41 2018 +0300
framework: remove solarmutex blocking since we are using own mutex
Change-Id: Ib1a8462c172792d41bc8af618287b3ef2b694b04
diff --git a/framework/source/dispatch/interceptionhelper.cxx
b/framework/source/dispatch/interceptionhelper.cxx
index 3e6a0fa68df4..9342cfab8f52 100644
--- a/framework/source/dispatch/interceptionhelper.cxx
+++ b/framework/source/dispatch/interceptionhelper.cxx
@@ -45,9 +45,6 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL
InterceptionHelper::queryD
{
osl::Guard<osl::Mutex> aGuard(m_Mutex);
- // SAFE {
- SolarMutexClearableGuard aReadLock;
-
// a) first search an interceptor, which match to this URL by its URL
pattern registration
// Note: if it return NULL - it does not mean an empty interceptor list
automatically!
css::uno::Reference< css::frame::XDispatchProvider > xInterceptor;
@@ -79,9 +76,6 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL
InterceptionHelper::queryD
if (!xInterceptor.is() && m_xSlave.is())
xInterceptor = m_xSlave;
- aReadLock.clear();
- // } SAFE
-
css::uno::Reference< css::frame::XDispatch > xReturn;
if (xInterceptor.is())
xReturn = xInterceptor->queryDispatch(aURL, sTargetFrameName,
nSearchFlags);
@@ -127,9 +121,6 @@ void SAL_CALL
InterceptionHelper::registerDispatchProviderInterceptor(const css:
aInfo.lURLPattern[0] = "*";
}
- // SAFE {
- SolarMutexClearableGuard aWriteLock;
-
// a) no interceptor at all - set this instance as master for given
interceptor
// and set our slave as its slave - and put this interceptor to the
list.
// Its place there doesn't matter. Because this list is currently empty.
@@ -174,9 +165,6 @@ void SAL_CALL
InterceptionHelper::registerDispatchProviderInterceptor(const css:
css::uno::Reference< css::frame::XFrame > xOwner(m_xOwnerWeak.get(),
css::uno::UNO_QUERY);
- aWriteLock.clear();
- // } SAFE
-
// Don't forget to send a frame action event "context changed".
// Any cached dispatch objects must be validated now!
if (xOwner.is())
@@ -192,9 +180,6 @@ void SAL_CALL
InterceptionHelper::releaseDispatchProviderInterceptor(const css::
if (!xInterceptor.is())
throw css::uno::RuntimeException("NULL references not allowed as in
parameter", xThis);
- // SAFE {
- SolarMutexClearableGuard aWriteLock;
-
// search this interceptor ...
// If it could be located inside cache -
// use its slave/master relations to update the interception list;
@@ -222,9 +207,6 @@ void SAL_CALL
InterceptionHelper::releaseDispatchProviderInterceptor(const css::
css::uno::Reference< css::frame::XFrame > xOwner(m_xOwnerWeak.get(),
css::uno::UNO_QUERY);
- aWriteLock.clear();
- // } SAFE
-
// Don't forget to send a frame action event "context changed".
// Any cached dispatch objects must be validated now!
if (xOwner.is())
@@ -237,8 +219,6 @@ void SAL_CALL InterceptionHelper::disposing(const
css::lang::EventObject& aEvent
{
osl::Guard<osl::Mutex> aGuard(m_Mutex);
#ifdef FORCE_DESTRUCTION_OF_INTERCEPTION_CHAIN
- // SAFE ->
- SolarMutexResettableGuard aReadLock;
// check call... we accept such disposing calls only from our owner frame.
css::uno::Reference< css::frame::XFrame > xOwner(m_xOwnerWeak.get(),
css::uno::UNO_QUERY);
@@ -254,9 +234,6 @@ void SAL_CALL InterceptionHelper::disposing(const
css::lang::EventObject& aEvent
// Because this vetor will be influenced by every deregistered interceptor.
InterceptionHelper::InterceptorList aCopy = m_lInterceptionRegs;
- aReadLock.clear();
- // <- SAFE
-
InterceptionHelper::InterceptorList::iterator pIt;
for ( pIt = aCopy.begin();
pIt != aCopy.end();
@@ -275,11 +252,8 @@ void SAL_CALL InterceptionHelper::disposing(const
css::lang::EventObject& aEvent
#if OSL_DEBUG_LEVEL > 0
// SAFE ->
- aReadLock.reset();
if (!m_lInterceptionRegs.empty() )
OSL_FAIL("There are some pending interceptor objects, which seems to
be registered during (!) the destruction of a frame.");
- aReadLock.clear();
- // <- SAFE
#endif // ODL_DEBUG_LEVEL>0
#endif // FORCE_DESTRUCTION_OF_INTERCEPTION_CHAIN
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
