Kaydet (Commit) a1d493fa authored tarafından Michael Stahl's avatar Michael Stahl

Revert "attempt fix of hang on base close, due to solarmutex deadlock on join"

This reverts commit 5b2cb23c.

That did not fix the bug (fdo#47021), but apparently it does cause
problems, such as the failure of the sfx2 DocumentEvents test (that
doesn't crash any more since 228a3f8b);
without the SolarMutexReleaser the test doesn't fail for me.
üst 54e59292
...@@ -210,7 +210,6 @@ class CloseDispatcher : public css::lang::XTypeProvider ...@@ -210,7 +210,6 @@ class CloseDispatcher : public css::lang::XTypeProvider
during they call us ... during they call us ...
*/ */
DECL_LINK( impl_asyncCallback, void* ); DECL_LINK( impl_asyncCallback, void* );
void doClose();
//--------------------------------------- //---------------------------------------
/** @short prepare m_xCloseFrame so it should be closeable without problems. /** @short prepare m_xCloseFrame so it should be closeable without problems.
......
...@@ -282,13 +282,6 @@ void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL& ...@@ -282,13 +282,6 @@ void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL&
or shutdown the whole application. or shutdown the whole application.
*/ */
IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback) IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback)
{
SolarMutexReleaser aReleaser;
doClose();
return 0;
}
void CloseDispatcher::doClose()
{ {
try try
{ {
...@@ -318,7 +311,7 @@ void CloseDispatcher::doClose() ...@@ -318,7 +311,7 @@ void CloseDispatcher::doClose()
// frame already dead ?! // frame already dead ?!
// Nothing to do ! // Nothing to do !
if (! xCloseFrame.is()) if (! xCloseFrame.is())
return; return 0;
sal_Bool bCloseFrame = sal_False; sal_Bool bCloseFrame = sal_False;
sal_Bool bEstablishBackingMode = sal_False; sal_Bool bEstablishBackingMode = sal_False;
...@@ -474,7 +467,7 @@ void CloseDispatcher::doClose() ...@@ -474,7 +467,7 @@ void CloseDispatcher::doClose()
{ {
} }
return; return 0;
} }
//----------------------------------------------- //-----------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment