diff options
| -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; } //----------------------------------------------- |