diff options
| author | Andre Fischer <af@openoffice.org> | 2009-10-16 13:24:22 +0000 |
|---|---|---|
| committer | Andre Fischer <af@openoffice.org> | 2009-10-16 13:24:22 +0000 |
| commit | b64c794d871e0e303622be4e49c0cdf020ebcd21 (patch) | |
| tree | 5650d2a12e758397cd9d595f88e34cf10110458d /slideshow/source/engine | |
| parent | 598fb36a2846b6af4e7cf4f58776a7789a39e277 (diff) | |
#i48179# Resolved merge problems.
Diffstat (limited to 'slideshow/source/engine')
| -rw-r--r-- | slideshow/source/engine/activities/activitiesfactory.cxx | 2 | ||||
| -rw-r--r-- | slideshow/source/engine/slideshowimpl.cxx | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/slideshow/source/engine/activities/activitiesfactory.cxx b/slideshow/source/engine/activities/activitiesfactory.cxx index bb6ee05dc..97ff422d1 100644 --- a/slideshow/source/engine/activities/activitiesfactory.cxx +++ b/slideshow/source/engine/activities/activitiesfactory.cxx @@ -289,6 +289,8 @@ public: BaseType::getNumberOfKeyTimes() ) ) ) ); } + using BaseType::isAutoReverse; + virtual void performEnd() { // xxx todo: good guess diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index abc306893..bf336012d 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -1954,11 +1954,7 @@ 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 + boost::bind<void>( boost::mem_fn(&SlideShowImpl::notifySlideEnded), this, false ), maEventMultiplexer.getAutomaticTimeout() ); } else |