From 2be4afe53a94fc051aae9ba9b20443f7a350fb18 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 24 Apr 2020 11:32:45 +0200 Subject: loplugin:unusedenumconstants ScrollType Change-Id: I996bd987169caa60c63832e62e210a8c62e6a0e6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92843 Tested-by: Jenkins Reviewed-by: Noel Grandin --- vcl/source/control/slider.cxx | 36 ++---------------------------------- 1 file changed, 2 insertions(+), 34 deletions(-) (limited to 'vcl') diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx index 0fdc49441bbb..61841ef4c216 100644 --- a/vcl/source/control/slider.cxx +++ b/vcl/source/control/slider.cxx @@ -530,9 +530,6 @@ long Slider::ImplDoAction() nDelta = ImplSlide( mnThumbPos+mnPageSize ); break; - case ScrollType::Set: - nDelta = ImplSlide( ImplCalcThumbPos( GetPointerPosPixel().X() ) ); - break; default: break; } @@ -547,20 +544,6 @@ void Slider::ImplDoMouseAction( const Point& rMousePos, bool bCallAction ) switch ( meScrollType ) { - case ScrollType::Set: - { - const bool bUp = ImplIsPageUp( rMousePos ), bDown = ImplIsPageDown( rMousePos ); - - if ( bUp || bDown ) - { - bAction = bCallAction; - mnStateFlags |= ( bUp ? SLIDER_STATE_CHANNEL1_DOWN : SLIDER_STATE_CHANNEL2_DOWN ); - } - else - mnStateFlags &= ~( SLIDER_STATE_CHANNEL1_DOWN | SLIDER_STATE_CHANNEL2_DOWN ); - break; - } - case ScrollType::PageUp: if ( ImplIsPageUp( rMousePos ) ) { @@ -653,31 +636,16 @@ void Slider::MouseButtonDown( const MouseEvent& rMEvt ) { // store Start position for cancel and EndScroll delta mnStartPos = mnThumbPos; - ImplDoMouseAction( rMousePos, meScrollType != ScrollType::Set ); + ImplDoMouseAction( rMousePos, /*bCallAction*/true ); PaintImmediately(); - if( meScrollType != ScrollType::Set ) - StartTracking( nTrackFlags ); + StartTracking( nTrackFlags ); } } } void Slider::MouseButtonUp( const MouseEvent& ) { - if( ScrollType::Set == meScrollType ) - { - // reset Button and PageRect state - const sal_uInt16 nOldStateFlags = mnStateFlags; - - mnStateFlags &= ~( SLIDER_STATE_CHANNEL1_DOWN | SLIDER_STATE_CHANNEL2_DOWN | SLIDER_STATE_THUMB_DOWN ); - - if ( nOldStateFlags != mnStateFlags ) - { - Invalidate(InvalidateFlags::NoChildren | InvalidateFlags::NoErase); - } - ImplDoAction(); - meScrollType = ScrollType::DontKnow; - } } void Slider::Tracking( const TrackingEvent& rTEvt ) -- cgit