summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-01-31 12:08:52 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-01-31 19:37:48 +0100
commitde06f883e2ab53e5d74d480da7abb5c7dd33de3e (patch)
treed63697b67e57575222b38030ab082a59dcb1aa19 /slideshow
parentc599e23a92310916d4e7f09c5aaf354d63973d0b (diff)
loplugin:unusedfields improve checking for fields guarded by existence check
which resulted in only a couple of real finds, mostly false+ Change-Id: I26058a29c27bff50e9526bedd54fb04589c2934d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87765 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx6
-rw-r--r--slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx1
-rw-r--r--slideshow/source/engine/usereventqueue.cxx5
-rw-r--r--slideshow/source/inc/usereventqueue.hxx1
4 files changed, 0 insertions, 13 deletions
diff --git a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx
index 9a4737dd9784..3f928593c846 100644
--- a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx
+++ b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx
@@ -57,10 +57,6 @@ void SequentialTimeContainer::dispose()
mpCurrentSkipEvent->dispose();
mpCurrentSkipEvent.reset();
}
- if (mpCurrentRewindEvent) {
- mpCurrentRewindEvent->dispose();
- mpCurrentRewindEvent.reset();
- }
}
void SequentialTimeContainer::skipEffect(
@@ -85,8 +81,6 @@ bool SequentialTimeContainer::resolveChild(
// discharge events:
if (mpCurrentSkipEvent)
mpCurrentSkipEvent->dispose();
- if (mpCurrentRewindEvent)
- mpCurrentRewindEvent->dispose();
// event that will deactivate the resolved/running child:
mpCurrentSkipEvent = makeEvent(
diff --git a/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx b/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx
index 0ee4e42ef94b..ad9dbb40132e 100644
--- a/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx
+++ b/slideshow/source/engine/animationnodes/sequentialtimecontainer.hxx
@@ -55,7 +55,6 @@ private:
bool resolveChild( AnimationNodeSharedPtr const& pChildNode );
EventSharedPtr mpCurrentSkipEvent;
- EventSharedPtr mpCurrentRewindEvent;
};
} // namespace internal
diff --git a/slideshow/source/engine/usereventqueue.cxx b/slideshow/source/engine/usereventqueue.cxx
index 2dfeba8221ff..bd3e1820ea14 100644
--- a/slideshow/source/engine/usereventqueue.cxx
+++ b/slideshow/source/engine/usereventqueue.cxx
@@ -535,7 +535,6 @@ UserEventQueue::UserEventQueue( EventMultiplexer& rMultiplexer,
mpAudioStoppedEventHandler(),
mpClickEventHandler(),
mpSkipEffectEventHandler(),
- mpDoubleClickEventHandler(),
mpMouseEnterHandler(),
mpMouseLeaveHandler(),
mbAdvanceOnClick( true )
@@ -591,10 +590,6 @@ void UserEventQueue::clear()
mrMultiplexer.removeMouseMoveHandler( mpShapeDoubleClickEventHandler );
mpShapeDoubleClickEventHandler.reset();
}
- if( mpDoubleClickEventHandler ) {
- mrMultiplexer.removeDoubleClickHandler( mpDoubleClickEventHandler );
- mpDoubleClickEventHandler.reset();
- }
if( mpMouseEnterHandler ) {
mrMultiplexer.removeMouseMoveHandler( mpMouseEnterHandler );
mpMouseEnterHandler.reset();
diff --git a/slideshow/source/inc/usereventqueue.hxx b/slideshow/source/inc/usereventqueue.hxx
index a60a931b473b..13b4d3adf385 100644
--- a/slideshow/source/inc/usereventqueue.hxx
+++ b/slideshow/source/inc/usereventqueue.hxx
@@ -257,7 +257,6 @@ private:
::std::shared_ptr<ClickEventHandler> mpClickEventHandler;
::std::shared_ptr<SkipEffectEventHandler> mpSkipEffectEventHandler;
::std::shared_ptr<ShapeClickEventHandler> mpShapeDoubleClickEventHandler;
- ::std::shared_ptr<ClickEventHandler> mpDoubleClickEventHandler;
::std::shared_ptr<MouseEnterHandler> mpMouseEnterHandler;
::std::shared_ptr<MouseLeaveHandler> mpMouseLeaveHandler;