Kaydet (Commit) 58eca806 authored tarafından Armin Le Grand's avatar Armin Le Grand

i118671 take emergency exit when local slideshow is disposed from executing macros

üst 4ddd844c
...@@ -2051,6 +2051,18 @@ sal_Bool SlideShowImpl::update( double & nNextTimeout ) ...@@ -2051,6 +2051,18 @@ sal_Bool SlideShowImpl::update( double & nNextTimeout )
// process queues // process queues
maEventQueue.process(); maEventQueue.process();
// #118671# 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(); maActivitiesQueue.process();
// commit frame to screen // 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