framework/inc/dispatch/closedispatcher.hxx | 1 - framework/source/dispatch/closedispatcher.cxx | 11 ++--------- sfx2/JunitTest_sfx2_complex.mk | 1 + sfx2/qa/complex/sfx2/UndoManager.java | 2 +- 4 files changed, 4 insertions(+), 11 deletions(-)
New commits: commit 54fbcc39a794025fb419addcd86080c7db308235 Author: Michael Stahl <[email protected]> Date: Mon Jul 9 17:34:00 2012 +0200 fdo#35663: enable UndoManager test, but disable failing Calc test Change-Id: I7f399b6e8be0b04102ccbce168a468c1e49b67da diff --git a/sfx2/JunitTest_sfx2_complex.mk b/sfx2/JunitTest_sfx2_complex.mk index c1c7cfd..c0cdd4f 100644 --- a/sfx2/JunitTest_sfx2_complex.mk +++ b/sfx2/JunitTest_sfx2_complex.mk @@ -63,6 +63,7 @@ $(eval $(call gb_JunitTest_add_classes,sfx2_complex,\ complex.sfx2.DocumentProperties \ complex.sfx2.DocumentMetadataAccess \ complex.sfx2.DocumentEvents \ + complex.sfx2.UndoManager \ )) # fd#35663 fails currently: # complex.sfx2.UndoManager \ diff --git a/sfx2/qa/complex/sfx2/UndoManager.java b/sfx2/qa/complex/sfx2/UndoManager.java index 34bc115..5b5e39e 100644 --- a/sfx2/qa/complex/sfx2/UndoManager.java +++ b/sfx2/qa/complex/sfx2/UndoManager.java @@ -118,7 +118,7 @@ public class UndoManager } // ----------------------------------------------------------------------------------------------------------------- - @Test +//FIXME fails fdo#35663 @Test public void checkCalcUndo() throws Exception { m_currentTestCase = new CalcDocumentTest( getORB() ); commit a1d493fad210fdae74b7bbc9dba3b2aa62c10963 Author: Michael Stahl <[email protected]> Date: Mon Jul 9 16:55:34 2012 +0200 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. diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx index 9ec937c..c273274 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 4a54131..1a33267 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; } //----------------------------------------------- _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
