diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-11-23 17:00:22 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2022-11-23 20:38:00 +0100 |
| commit | 5b3b13ceed474873776464269c5d71544252a928 (patch) | |
| tree | fe21673c7d608c0effe2cae8b399e85926e48bfb /vcl | |
| parent | aba9b0a359aa47e6c9b05e2aeea3de4b30495dd2 (diff) | |
rename ImplScroll to ImplScrollCalendar
to avoid collision with Window::ImplScroll
Change-Id: I16e72ff842054979733b5149cd220a7a77f79351
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143187
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/calendar.hxx | 3 | ||||
| -rw-r--r-- | vcl/source/control/calendar.cxx | 14 |
2 files changed, 8 insertions, 9 deletions
diff --git a/vcl/inc/calendar.hxx b/vcl/inc/calendar.hxx index a40f1ffdf323..5d757e056170 100644 --- a/vcl/inc/calendar.hxx +++ b/vcl/inc/calendar.hxx @@ -176,8 +176,7 @@ class Calendar final : public Control void ImplUpdateSelection( IntDateSet* pOld ); void ImplMouseSelect( const Date& rDate, sal_uInt16 nHitTest ); void ImplUpdate( bool bCalcNew = false ); - using Window::ImplScroll; - void ImplScroll( bool bPrev ); + void ImplScrollCalendar( bool bPrev ); void ImplShowMenu( const Point& rPos, const Date& rDate ); void ImplTracking( const Point& rPos, bool bRepeat ); void ImplEndTracking( bool bCancel ); diff --git a/vcl/source/control/calendar.cxx b/vcl/source/control/calendar.cxx index 3995aa142bae..44d6fc56ab70 100644 --- a/vcl/source/control/calendar.cxx +++ b/vcl/source/control/calendar.cxx @@ -864,7 +864,7 @@ void Calendar::ImplUpdate( bool bCalcNew ) mbFormat = true; } -void Calendar::ImplScroll( bool bPrev ) +void Calendar::ImplScrollCalendar( bool bPrev ) { Date aNewFirstMonth = GetFirstMonth(); if ( bPrev ) @@ -943,7 +943,7 @@ void Calendar::ImplTracking( const Point& rPos, bool bRepeat ) if ( bRepeat && (mbPrevIn || mbNextIn) ) { - ImplScroll( mbPrevIn ); + ImplScrollCalendar( mbPrevIn ); } } else @@ -992,9 +992,9 @@ void Calendar::ImplEndTracking( bool bCancel ) Date aFirstSelDate( *mpSelectTable->begin() ); Date aLastSelDate( *mpSelectTable->rbegin() ); if ( aLastSelDate < GetFirstMonth() ) - ImplScroll( true ); + ImplScrollCalendar( true ); else if ( GetLastMonth() < aFirstSelDate ) - ImplScroll( false ); + ImplScrollCalendar( false ); } } @@ -1026,7 +1026,7 @@ void Calendar::MouseButtonDown( const MouseEvent& rMEvt ) if ( mbPrevIn || mbNextIn ) { mbSpinDown = true; - ImplScroll( mbPrevIn ); + ImplScrollCalendar( mbPrevIn ); // it should really read BUTTONREPEAT, therefore do not // change it to SCROLLREPEAT, check with TH, // why it could be different (71775) @@ -1224,7 +1224,7 @@ void Calendar::Command( const CommandEvent& rCEvt ) { while ( nNotchDelta < 0 ) { - ImplScroll( true ); + ImplScrollCalendar( true ); nNotchDelta++; } } @@ -1232,7 +1232,7 @@ void Calendar::Command( const CommandEvent& rCEvt ) { while ( nNotchDelta > 0 ) { - ImplScroll( false ); + ImplScrollCalendar( false ); nNotchDelta--; } } |