diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-15 08:48:36 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-17 08:25:06 +0200 |
| commit | 16690220ed6e68f2e9674a09b5008f38c5e6ed8d (patch) | |
| tree | 2f830b7ac23f136585e7dc4adf5d456f4995cc99 /sd/source | |
| parent | 86d70dc840b88ed827d6d8febaf512264009951d (diff) | |
loplugin:singlevalfields
tighten up the handling of binary operators
Change-Id: I262ec57bf7142fa094d240738150a94d83fd15ee
Reviewed-on: https://gerrit.libreoffice.org/61777
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd/source')
| -rw-r--r-- | sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx | 16 | ||||
| -rw-r--r-- | sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx | 1 |
2 files changed, 2 insertions, 15 deletions
diff --git a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx index fab565c07883..6c9d4edaf176 100644 --- a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx @@ -54,7 +54,6 @@ VisibleAreaManager::VisibleAreaManager (SlideSorter& rSlideSorter) maVisibleRequests(), mnScrollAnimationId(Animator::NotAnAnimationId), maRequestedVisibleTopLeft(), - meRequestedAnimationMode(Animator::AM_Immediate), mbIsCurrentSlideTrackingActive(true), mnDisableCount(0) { @@ -131,19 +130,8 @@ void VisibleAreaManager::MakeVisible() mrSlideSorter, aCurrentTopLeft, maRequestedVisibleTopLeft); - if (meRequestedAnimationMode==Animator::AM_Animated - && mrSlideSorter.GetProperties()->IsSmoothSelectionScrolling()) - { - mnScrollAnimationId = mrSlideSorter.GetController().GetAnimator()->AddAnimation( - aAnimation, - Animator::FinishFunctor()); - } - else - { - // Execute the animation at its final value. - aAnimation(1.0); - } - meRequestedAnimationMode = Animator::AM_Immediate; + // Execute the animation at its final value. + aAnimation(1.0); } ::boost::optional<Point> VisibleAreaManager::GetRequestedTopLeft() const diff --git a/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx index aea0888fd214..537434b2a198 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx @@ -78,7 +78,6 @@ private: */ Animator::AnimationId mnScrollAnimationId; Point maRequestedVisibleTopLeft; - Animator::AnimationMode meRequestedAnimationMode; bool mbIsCurrentSlideTrackingActive; int mnDisableCount; |