Kaydet (Commit) cc7a301d authored tarafından Armin Le Grand's avatar Armin Le Grand Kaydeden (comit) Caolán McNamara

Resolves: #i118671# take emergency exit when local slideshow...

is disposed from executing macros

(cherry picked from commit 58eca806)

Change-Id: Ifd07faa0a4bb051dea7b57b775eaf8818a7ce6d3
üst c7e7160f
......@@ -2010,6 +2010,18 @@ sal_Bool SlideShowImpl::update( double & nNextTimeout )
// process queues
maEventQueue.process();
// #i118671# the call above may execute a macro bound to an object. In
// that case this macro may have destroyed this local sliseshow so that it
// is disposed (see bugdoc at task). In that case, detect this and exit
// gently from this slideshow. Do not forget to disable the scoped
// call to mpPresTimer, this will be deleted if we are disposed.
if (isDisposed())
{
scopeGuard.dismiss();
return false;
}
maActivitiesQueue.process();
// commit frame to screen
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment