summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-03-24 10:49:28 +0200
committerNoel Grandin <noel@peralex.com>2015-03-24 10:51:22 +0200
commit858e455634ebfff8ef7b65a9c97d3bc8240cd094 (patch)
tree688dd5dbe73ee53ef4b84124632e045045b404d1 /slideshow
parenta6df3c0babf409d8fc0bf52efd9c2fa74a95998e (diff)
loplugin:constantfunction: various
Change-Id: I6eddda9f4b31c7ce413c328b6a857a81bd222eed
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx15
-rw-r--r--slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx1
-rw-r--r--slideshow/source/engine/eventmultiplexer.cxx5
-rw-r--r--slideshow/source/engine/slideshowimpl.cxx2
-rw-r--r--slideshow/source/inc/eventmultiplexer.hxx4
5 files changed, 0 insertions, 27 deletions
diff --git a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx
index c81fad3f1125..1972e31ce687 100644
--- a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx
+++ b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx
@@ -86,12 +86,6 @@ void SequentialTimeContainer::skipEffect(
OSL_FAIL( "unknown notifier!" );
}
-void SequentialTimeContainer::rewindEffect(
- AnimationNodeSharedPtr const& /*pChildNode*/ )
-{
- // xxx todo: ...
-}
-
bool SequentialTimeContainer::resolveChild(
AnimationNodeSharedPtr const& pChildNode )
{
@@ -109,20 +103,11 @@ bool SequentialTimeContainer::resolveChild(
boost::dynamic_pointer_cast<SequentialTimeContainer>( getSelf() ),
pChildNode ),
"SequentialTimeContainer::skipEffect, resolveChild");
- // event that will reresolve the resolved/activated child:
- mpCurrentRewindEvent = makeEvent(
- boost::bind( &SequentialTimeContainer::rewindEffect,
- boost::dynamic_pointer_cast<SequentialTimeContainer>( getSelf() ),
- pChildNode ),
- "SequentialTimeContainer::rewindEffect, resolveChild");
// deactivate child node when skip event occurs:
getContext().mrUserEventQueue.registerSkipEffectEvent(
mpCurrentSkipEvent,
mnFinishedChildren+1<maChildren.size());
- // rewind to previous child:
- getContext().mrUserEventQueue.registerRewindEffectEvent(
- mpCurrentRewindEvent );
}
return bResolved;
}
diff --git a/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx b/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx
index 9bf050315fbe..490f084ef678 100644
--- a/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx
+++ b/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx
@@ -51,7 +51,6 @@ private:
virtual void notifyDeactivating( AnimationNodeSharedPtr const& rNotifier ) SAL_OVERRIDE;
void skipEffect( AnimationNodeSharedPtr const& pChildNode );
- void rewindEffect( AnimationNodeSharedPtr const& pChildNode );
private:
bool resolveChild( AnimationNodeSharedPtr const& pChildNode );
diff --git a/slideshow/source/engine/eventmultiplexer.cxx b/slideshow/source/engine/eventmultiplexer.cxx
index 98d06d1d65b3..29c37c050d34 100644
--- a/slideshow/source/engine/eventmultiplexer.cxx
+++ b/slideshow/source/engine/eventmultiplexer.cxx
@@ -1242,11 +1242,6 @@ bool EventMultiplexer::notifyHyperlinkClicked(
boost::cref(hyperLink)) );
}
-bool EventMultiplexer::notifySlideTransitionStarted()
-{
- return true;
-}
-
} // namespace internal
} // namespace presentation
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index 21c3213c3110..3fc76235e7f7 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -1191,7 +1191,6 @@ void SlideShowImpl::displaySlide(
}
} // finally
- maEventMultiplexer.notifySlideTransitionStarted();
maListenerContainer.forEach<presentation::XSlideShowListener>(
boost::mem_fn( &presentation::XSlideShowListener::slideTransitionStarted ) );
@@ -1227,7 +1226,6 @@ void SlideShowImpl::redisplayCurrentSlide (void)
true ),
"SlideShowImpl::notifySlideTransitionEnded"));
- maEventMultiplexer.notifySlideTransitionStarted();
maListenerContainer.forEach<presentation::XSlideShowListener>(
boost::mem_fn( &presentation::XSlideShowListener::slideTransitionStarted ) );
}
diff --git a/slideshow/source/inc/eventmultiplexer.hxx b/slideshow/source/inc/eventmultiplexer.hxx
index 4ee7113f4fcf..716e02394281 100644
--- a/slideshow/source/inc/eventmultiplexer.hxx
+++ b/slideshow/source/inc/eventmultiplexer.hxx
@@ -612,10 +612,6 @@ public:
*/
bool notifyNextEffect();
- /** Notify that a new slide is about to be displayed
- */
- bool notifySlideTransitionStarted();
-
/** Notify that a new slide has started
This method is to be used from the Presentation object