diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2017-07-27 11:42:31 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2017-08-04 13:38:20 +0200 |
| commit | d55aabfd44563027aceffd0020f55b166184a0ca (patch) | |
| tree | 9073855842a11796e8ea8434896eedd7b7b10747 /sfx2 | |
| parent | 3dd30f7ec568852ffd95932b486d0a09a2021d71 (diff) | |
Implement VCL Scheduler locking
Replces the SolarMutex scheduler locking by using a distinct mutex
included in the scheduler context.
It should also get rid of the spurious assert( !bAniIdle ) failures,
as the test now holds the Scheduler lock for the whole time.
This includes reverting the additional scheduler de-init from commit
2e29a518b04250b5f9cc9d0d77da3df076834d60, as I couldn't reproduce
the bug running the unit test in valgrind.
Change-Id: If33f815fe86c8f82175e96adceb1084b925319dd
Reviewed-on: https://gerrit.libreoffice.org/40497
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/appinit.cxx | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index 6551c4d3e39b..5afa8c736e13 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -47,7 +47,6 @@ #include <cppuhelper/supportsservice.hxx> #include <vcl/edit.hxx> -#include <vcl/scheduler.hxx> #include <sfx2/unoctitm.hxx> #include "sfx2/strings.hrc" @@ -106,10 +105,6 @@ void SAL_CALL SfxTerminateListener_Impl::notifyTermination( const EventObject& a SolarMutexGuard aGuard; utl::ConfigManager::storeConfigItems(); - // Timers may access the SfxApplication and are only deleted in - // Application::Quit(), which is asynchronous (PostUserEvent) - disable! - Scheduler::ImplDeInitScheduler(); - SfxApplication* pApp = SfxGetpApp(); pApp->Broadcast( SfxHint( SfxHintId::Deinitializing ) ); pApp->Get_Impl()->mxAppDispatch->ReleaseAll(); |