diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-26 08:29:52 +0200 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-02-05 22:07:57 -0500 |
| commit | 4a650fbcb3836204797c2cbd3ee553acb3b02eb5 (patch) | |
| tree | fbc3b0ac9bfd1739b5728c1bf946ce41c9cb0558 /sw | |
| parent | 7f4402c6fcdac3e483343ab64b10613094de1f9e (diff) | |
convert SCROLL constants to scoped enum
(cherry picked from commit 204d147b8a887d17e6457f795e8b8f4d632213ae)
Change-Id: I5696fa39b2d032735cea7abe039349d4f83cf68d
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/view/viewsh.cxx | 8 | ||||
| -rw-r--r-- | sw/source/uibase/inc/pview.hxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/uiview/pview.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index 883f5c6d0819..1cebd5c33ed9 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -1361,10 +1361,10 @@ bool SwViewShell::SmoothScroll( long lXDiff, long lYDiff, const Rectangle *pRect Rectangle aTmp( aTmpOldVis.SVRect() ); aTmp.Left() = pRect->Left(); aTmp.Right()= pRect->Right(); - GetWin()->Scroll( 0, lScroll, aTmp, SCROLL_CHILDREN); + GetWin()->Scroll( 0, lScroll, aTmp, ScrollFlags::Children); } else - GetWin()->Scroll( 0, lScroll, SCROLL_CHILDREN ); + GetWin()->Scroll( 0, lScroll, ScrollFlags::Children ); const Point aTmpPt( -VisArea().Left(), -VisArea().Top() ); MapMode aTmpMapMode( GetWin()->GetMapMode() ); @@ -1442,9 +1442,9 @@ bool SwViewShell::SmoothScroll( long lXDiff, long lYDiff, const Rectangle *pRect maVisArea.Pos().X() -= lXDiff; maVisArea.Pos().Y() -= lYDiff; if ( pRect ) - GetWin()->Scroll( lXDiff, lYDiff, *pRect, SCROLL_CHILDREN); + GetWin()->Scroll( lXDiff, lYDiff, *pRect, ScrollFlags::Children); else - GetWin()->Scroll( lXDiff, lYDiff, SCROLL_CHILDREN); + GetWin()->Scroll( lXDiff, lYDiff, ScrollFlags::Children); return false; } diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx index 2fd7d5bdcc0d..ff4732ea996b 100644 --- a/sw/source/uibase/inc/pview.hxx +++ b/sw/source/uibase/inc/pview.hxx @@ -153,7 +153,7 @@ public: return maPaintedPreviewDocRect; } - void Scroll(long nXMove, long nYMove, sal_uInt16 nFlags = 0) SAL_OVERRIDE; + void Scroll(long nXMove, long nYMove, ScrollFlags nFlags = ScrollFlags::NONE) SAL_OVERRIDE; /** Method to enable/disable book preview @param _bBookPreview diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index 2974766b9bfe..1e317066f79a 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -1784,7 +1784,7 @@ void SwPagePreviewWin::AdjustPreviewToNewZoom( const sal_uInt16 _nZoomFactor, * when less than the desired number of rows fits into * the view */ -void SwPagePreviewWin::Scroll(long nXMove, long nYMove, sal_uInt16 /*nFlags*/) +void SwPagePreviewWin::Scroll(long nXMove, long nYMove, ScrollFlags /*nFlags*/) { maPaintedPreviewDocRect.Move(nXMove, nYMove); mpPgPreviewLayout->Prepare( 0, maPaintedPreviewDocRect.TopLeft(), |