diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-07-09 16:55:34 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-07-11 20:09:53 +0200 |
| commit | 07451b6746659af966b52f5556a8db6960e2ab35 (patch) | |
| tree | 49b06b28909e3761aa54ba6bc699983cd2ceb7e7 /framework | |
| parent | fdo#51793: FormatNumber can handle sal_uInt32 values after all... (diff) | |
| download | core-07451b6746659af966b52f5556a8db6960e2ab35.tar.gz core-07451b6746659af966b52f5556a8db6960e2ab35.zip | |
Revert "attempt fix of hang on base close, due to solarmutex deadlock on join"
This reverts commit 5b2cb23c429e1be1099008473770c634ce96c969.
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 228a3f8b9f279e80917968d9780e822a1d684ada);
without the SolarMutexReleaser the test doesn't fail for me.
(cherry picked from commit a1d493fad210fdae74b7bbc9dba3b2aa62c10963)
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/dispatch/closedispatcher.hxx | 1 | ||||
| -rw-r--r-- | framework/source/dispatch/closedispatcher.cxx | 11 |
2 files changed, 2 insertions, 10 deletions
diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx index 9ec937c6ab91..c273274fd0aa 100644 --- a/framework/inc/dispatch/closedispatcher.hxx +++ b/framework/inc/dispatch/closedispatcher.hxx @@ -210,7 +210,6 @@ class CloseDispatcher : public css::lang::XTypeProvider during they call us ... */ DECL_LINK( impl_asyncCallback, void* ); - void doClose(); //--------------------------------------- /** @short prepare m_xCloseFrame so it should be closeable without problems. diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx index 4a5413158443..1a332676b172 100644 --- a/framework/source/dispatch/closedispatcher.cxx +++ b/framework/source/dispatch/closedispatcher.cxx @@ -283,13 +283,6 @@ void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL& */ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback) { - SolarMutexReleaser aReleaser; - doClose(); - return 0; -} - -void CloseDispatcher::doClose() -{ try { @@ -318,7 +311,7 @@ void CloseDispatcher::doClose() // frame already dead ?! // Nothing to do ! if (! xCloseFrame.is()) - return; + return 0; sal_Bool bCloseFrame = sal_False; sal_Bool bEstablishBackingMode = sal_False; @@ -474,7 +467,7 @@ void CloseDispatcher::doClose() { } - return; + return 0; } //----------------------------------------------- |