mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

slideshow1: merge with DEV300 m61

Browse Source
This commit is contained in:
Jens-Heiner Rechtien
2009-11-30 15:37:50 +00:00
parent 5caa432685 cdc081ea0e
commit 7168fa353e
150 changed files with 6440 additions and 907 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slideshow/source/engine/slideshowimpl.cxx
View File

@@ -1954,7 +1954,11 @@ void SlideShowImpl::notifySlideAnimationsEnded()
// schedule a slide end event, with automatic mode's
// delay
aNotificationEvents = makeInterruptableDelay(
<<<<<<< .working
boost::bind( &SlideShowImpl::notifySlideEnded, this, false ),
=======
boost::bind<void>( boost::mem_fn(&SlideShowImpl::notifySlideEnded), this ),
>>>>>>> .merge-right.r276697
maEventMultiplexer.getAutomaticTimeout() );
}
else
@@ -1979,7 +1983,7 @@ void SlideShowImpl::notifySlideAnimationsEnded()
bHasAutomaticNextSlide )
{
aNotificationEvents = makeInterruptableDelay(
boost::bind( &SlideShowImpl::notifySlideEnded, this, false ),
boost::bind<void>( boost::mem_fn(&SlideShowImpl::notifySlideEnded), this, false ),
nAutomaticNextSlideTimeout);
// TODO(F2): Provide a mechanism to let the user override
@@ -1995,8 +1999,8 @@ void SlideShowImpl::notifySlideAnimationsEnded()
// generate interruptable event here, there's no
// timeout involved.
aNotificationEvents.mpImmediateEvent =
makeEvent( boost::bind(
&SlideShowImpl::notifySlideEnded, this, false ),
makeEvent( boost::bind<void>(
boost::mem_fn(&SlideShowImpl::notifySlideEnded), this, false ),
"SlideShowImpl::notifySlideEnded");
}
}