diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-01-21 09:10:08 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-01-21 13:44:57 +0100 |
| commit | 4304947164bbcd3fea758df491a730b01d578be2 (patch) | |
| tree | 996401cf2095022d79e2459fdc0cfc9168c674dd /sfx2 | |
| parent | 47f21d290087638b1986c291c969bf2997574ddd (diff) | |
fix opengl slide transition
regression from
commit 62efb188668a3296591dcfa3658185e2f982e356
use comphelper::WeakComponentImplHelper in SlideShowVie
Switch notifyEach to leave the mutex locked after being called,
because that seems to compose better - because after a call
it is in the same state that was when we entered the call.
Change-Id: I42e80cc7be1b65ed8cab24ab7c11210e056d916d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128723
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/notify/globalevents.cxx | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sfx2/source/notify/globalevents.cxx b/sfx2/source/notify/globalevents.cxx index 17719f992341..75ae422747b1 100644 --- a/sfx2/source/notify/globalevents.cxx +++ b/sfx2/source/notify/globalevents.cxx @@ -257,7 +257,6 @@ void SfxGlobalEvents_Impl::dispose() { tmpModels.clear(); g.lock(); m_aLegacyListeners.disposeAndClear(g, {static_cast<OWeakObject *>(this)}); - g.lock(); // because disposeAndClear is going to want to unlock() m_aDocumentListeners.disposeAndClear(g, {static_cast<OWeakObject *>(this)}); } for (auto const & i: listeners) { @@ -487,7 +486,6 @@ void SfxGlobalEvents_Impl::implts_notifyListener(const document::DocumentEvent& xListener->notifyEvent(aLegacyEvent); } ); - g.lock(); m_aDocumentListeners.forEach(g, [&aEvent](const css::uno::Reference<document::XDocumentEventListener>& xListener) { |