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

This reverts commit 5b2cb23c42.

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 228a3f8b9f);
without the SolarMutexReleaser the test doesn't fail for me.
This commit is contained in:
Michael Stahl
2012-07-09 16:55:34 +02:00
parent 54e592926b
commit a1d493fad2
2 changed files with 2 additions and 10 deletions

View File

@@ -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.

View File

@@ -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()
// 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()
{ {
} }
return; return 0;
} }
//----------------------------------------------- //-----------------------------------------------