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 | 83168b2ff90cf04ee9f5b5f6408d184f2709f26e (patch) | |
| tree | b64c54481ddab5be54a6e648c5f2b593c29663c3 /slideshow | |
| parent | 7168fa353e1e7aab66e5f232a1f7015e725a263c (diff) | |
#i48179# Resolved merge problems.
Diffstat (limited to 'slideshow')
| -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 745e956c19e0..398a813a62aa 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 9a4878f43d59..88637a431282 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 |