diff options
Diffstat (limited to 'vcl/source/control/slider.cxx')
-rw-r--r-- | vcl/source/control/slider.cxx | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx index f25cd384d68c..af259cd184e7 100644 --- a/vcl/source/control/slider.cxx +++ b/vcl/source/control/slider.cxx @@ -202,19 +202,19 @@ void Slider::ImplUpdateRects( bool bUpdate ) } } -long Slider::ImplCalcThumbPos( long nPixPos ) +tools::Long Slider::ImplCalcThumbPos( tools::Long nPixPos ) { // calculate position - long nCalcThumbPos; + tools::Long nCalcThumbPos; nCalcThumbPos = ImplMulDiv( nPixPos-mnThumbPixOffset, mnMaxRange-mnMinRange, mnThumbPixRange-1 ); nCalcThumbPos += mnMinRange; return nCalcThumbPos; } -long Slider::ImplCalcThumbPosPix( long nPos ) +tools::Long Slider::ImplCalcThumbPosPix( tools::Long nPos ) { // calculate position - long nCalcThumbPos; + tools::Long nCalcThumbPos; nCalcThumbPos = ImplMulDiv( nPos-mnMinRange, mnThumbPixRange-1, mnMaxRange-mnMinRange ); // at the beginning and end we try to display Slider correctly if ( !nCalcThumbPos && (mnThumbPos > mnMinRange) ) @@ -263,11 +263,11 @@ void Slider::ImplCalc( bool bUpdate ) } } - long nOldChannelPixRange = mnChannelPixRange; - long nOldChannelPixTop = mnChannelPixTop; - long nOldChannelPixBottom = mnChannelPixBottom; - long nCalcWidth; - long nCalcHeight; + tools::Long nOldChannelPixRange = mnChannelPixRange; + tools::Long nOldChannelPixTop = mnChannelPixTop; + tools::Long nOldChannelPixBottom = mnChannelPixBottom; + tools::Long nCalcWidth; + tools::Long nCalcHeight; maChannel1Rect.SetEmpty(); maChannel2Rect.SetEmpty(); @@ -360,7 +360,7 @@ void Slider::ImplDraw(vcl::RenderContext& rRenderContext) if (!maChannel1Rect.IsEmpty()) { - long nRectSize; + tools::Long nRectSize; tools::Rectangle aRect = maChannel1Rect; rRenderContext.SetLineColor(rStyleSettings.GetShadowColor()); if (GetStyle() & WB_HORZ) @@ -404,7 +404,7 @@ void Slider::ImplDraw(vcl::RenderContext& rRenderContext) if (!maChannel2Rect.IsEmpty()) { - long nRectSize; + tools::Long nRectSize; tools::Rectangle aRect = maChannel2Rect; rRenderContext.SetLineColor(rStyleSettings.GetLightColor()); if (GetStyle() & WB_HORZ) @@ -495,11 +495,11 @@ bool Slider::ImplIsPageDown( const Point& rPos ) return aRect.IsInside( rPos ); } -long Slider::ImplSlide( long nNewPos ) +tools::Long Slider::ImplSlide( tools::Long nNewPos ) { - long nOldPos = mnThumbPos; + tools::Long nOldPos = mnThumbPos; SetThumbPos( nNewPos ); - long nDelta = mnThumbPos-nOldPos; + tools::Long nDelta = mnThumbPos-nOldPos; if ( nDelta ) { Slide(); @@ -507,9 +507,9 @@ long Slider::ImplSlide( long nNewPos ) return nDelta; } -long Slider::ImplDoAction() +tools::Long Slider::ImplDoAction() { - long nDelta = 0; + tools::Long nDelta = 0; switch ( meScrollType ) { @@ -579,7 +579,7 @@ void Slider::ImplDoMouseAction( const Point& rMousePos, bool bCallAction ) } } -void Slider::ImplDoSlide( long nNewPos ) +void Slider::ImplDoSlide( tools::Long nNewPos ) { if ( meScrollType != ScrollType::DontKnow ) return; @@ -683,7 +683,7 @@ void Slider::Tracking( const TrackingEvent& rTEvt ) // special handling for dragging if ( meScrollType == ScrollType::Drag ) { - long nMovePix; + tools::Long nMovePix; Point aCenterPos = maThumbRect.Center(); if ( GetStyle() & WB_HORZ ) nMovePix = rMousePos.X()-(aCenterPos.X()+mnMouseOff); @@ -697,7 +697,7 @@ void Slider::Tracking( const TrackingEvent& rTEvt ) mnThumbPixPos = mnThumbPixOffset; if ( mnThumbPixPos > (mnThumbPixOffset+mnThumbPixRange-1) ) mnThumbPixPos = mnThumbPixOffset+mnThumbPixRange-1; - long nOldPos = mnThumbPos; + tools::Long nOldPos = mnThumbPos; mnThumbPos = ImplCalcThumbPos( mnThumbPixPos ); if ( nOldPos != mnThumbPos ) { @@ -836,12 +836,12 @@ void Slider::Slide() maSlideHdl.Call( this ); } -void Slider::SetRangeMin(long nNewRange) +void Slider::SetRangeMin(tools::Long nNewRange) { SetRange(Range(nNewRange, GetRangeMax())); } -void Slider::SetRangeMax(long nNewRange) +void Slider::SetRangeMax(tools::Long nNewRange) { SetRange(Range(GetRangeMin(), nNewRange)); } @@ -851,8 +851,8 @@ void Slider::SetRange( const Range& rRange ) // adjust Range Range aRange = rRange; aRange.Justify(); - long nNewMinRange = aRange.Min(); - long nNewMaxRange = aRange.Max(); + tools::Long nNewMinRange = aRange.Min(); + tools::Long nNewMaxRange = aRange.Max(); // reset Range if different if ( (mnMinRange != nNewMinRange) || @@ -870,7 +870,7 @@ void Slider::SetRange( const Range& rRange ) } } -void Slider::SetThumbPos( long nNewThumbPos ) +void Slider::SetThumbPos( tools::Long nNewThumbPos ) { if ( nNewThumbPos < mnMinRange ) nNewThumbPos = mnMinRange; @@ -886,8 +886,8 @@ void Slider::SetThumbPos( long nNewThumbPos ) Size Slider::CalcWindowSizePixel() { - long nWidth = mnMaxRange - mnMinRange + mnThumbSize + 1; - long nHeight = SLIDER_HEIGHT; + tools::Long nWidth = mnMaxRange - mnMinRange + mnThumbSize + 1; + tools::Long nHeight = SLIDER_HEIGHT; Size aSize; if ( GetStyle() & WB_HORZ ) { |