convert AUTOSCROLL constants to scoped enum

Change-Id: Id1d2b5c13ad6af05314cba60ba5b9a62e0683f5e

include/vcl/window.hxx

@@ -295,8 +295,16 @@ namespace o3tl
 #define STARTTRACK_FOCUSCANCEL          ((sal_uInt16)0x0040)
 
 // Flags for StartAutoScroll()
-#define AUTOSCROLL_VERT                 ((sal_uInt16)0x0001)
-#define AUTOSCROLL_HORZ                 ((sal_uInt16)0x0002)
+enum class StartAutoScrollFlags
+{
+    NONE                 = 0x0000,
+    Vert                 = 0x0001,
+    Horz                 = 0x0002,
+};
+namespace o3tl
+{
+    template<> struct typed_flags<StartAutoScrollFlags> : is_typed_flags<StartAutoScrollFlags, 0x0003> {};
+}
 
 // Flags for StateChanged()
 enum class StateChangedType : sal_uInt16
@@ -1244,7 +1252,7 @@ public:
     void                                EndTracking( TrackingEventFlags nFlags = TrackingEventFlags::NONE );
     bool                                IsTracking() const;
 
-    void                                StartAutoScroll( sal_uInt16 nFlags );
+    void                                StartAutoScroll( StartAutoScrollFlags nFlags );
     void                                EndAutoScroll();
 
     bool                                HandleScrollCommand( const CommandEvent& rCmd,

svtools/source/contnr/imivctl1.cxx

@@ -2143,12 +2143,12 @@ bool SvxIconChoiceCtrl_Impl::HandleScrollCommand( const CommandEvent& rCmd )
         case CommandEventId::StartAutoScroll:
         {
             pView->EndTracking();
-            sal_uInt16 nScrollFlags = 0;
+            StartAutoScrollFlags nScrollFlags = StartAutoScrollFlags::NONE;
             if( bHor )
-                nScrollFlags |= AUTOSCROLL_HORZ;
+                nScrollFlags |= StartAutoScrollFlags::Horz;
             if( bVer )
-                nScrollFlags |= AUTOSCROLL_VERT;
-            if( nScrollFlags )
+                nScrollFlags |= StartAutoScrollFlags::Vert;
+            if( nScrollFlags != StartAutoScrollFlags::NONE )
             {
                 pView->StartAutoScroll( nScrollFlags );
                 return true;

vcl/inc/svdata.hxx

@@ -196,7 +196,7 @@ struct ImplSVWinData
     ImageList*              mpMsgBoxImgList;                // ImageList for MessageBox
     VclPtr<vcl::Window>     mpAutoScrollWin;                // window, that is in AutoScrollMode mode
     sal_uInt16              mnTrackFlags;                   // tracking flags
-    sal_uInt16              mnAutoScrollFlags;              // auto scroll flags
+    StartAutoScrollFlags    mnAutoScrollFlags;              // auto scroll flags
     bool                    mbNoDeactivate;                 // true: do not execute Deactivate
     bool                    mbNoSaveFocus;                  // true: menus must not save/restore focus
     bool                    mbNoSaveBackground;             // true: save background is unnecessary or even less performant

vcl/source/window/scrwnd.cxx

@@ -49,9 +49,9 @@ ImplWheelWindow::ImplWheelWindow( vcl::Window* pParent ) :
     DBG_ASSERT( pParent, "ImplWheelWindow::ImplWheelWindow(): Parent not set!" );
 
     const Size      aSize( pParent->GetOutputSizePixel() );
-    const sal_uInt16    nFlags = ImplGetSVData()->maWinData.mnAutoScrollFlags;
-    const bool      bHorz = ( nFlags & AUTOSCROLL_HORZ ) != 0;
-    const bool      bVert = ( nFlags & AUTOSCROLL_VERT ) != 0;
+    const StartAutoScrollFlags nFlags = ImplGetSVData()->maWinData.mnAutoScrollFlags;
+    const bool      bHorz( nFlags & StartAutoScrollFlags::Horz );
+    const bool      bVert( nFlags & StartAutoScrollFlags::Vert );
 
     // calculate maximum speed distance
     mnMaxWidth = (sal_uLong) ( 0.4 * hypot( (double) aSize.Width(), aSize.Height() ) );
@@ -237,9 +237,9 @@ void ImplWheelWindow::ImplRecalcScrollValues()
 PointerStyle ImplWheelWindow::ImplGetMousePointer( long nDistX, long nDistY )
 {
     PointerStyle    eStyle;
-    const sal_uInt16    nFlags = ImplGetSVData()->maWinData.mnAutoScrollFlags;
-    const bool      bHorz = ( nFlags & AUTOSCROLL_HORZ ) != 0;
-    const bool      bVert = ( nFlags & AUTOSCROLL_VERT ) != 0;
+    const StartAutoScrollFlags nFlags = ImplGetSVData()->maWinData.mnAutoScrollFlags;
+    const bool      bHorz( nFlags & StartAutoScrollFlags::Horz );
+    const bool      bVert( nFlags & StartAutoScrollFlags::Vert );
 
     if( bHorz || bVert )
     {
@@ -316,9 +316,9 @@ void ImplWheelWindow::MouseMove( const MouseEvent& rMEvt )
     mnActDist = (sal_uLong) hypot( (double) nDistX, nDistY );
 
     const PointerStyle  eActStyle = ImplGetMousePointer( nDistX, nDistY );
-    const sal_uInt16        nFlags = ImplGetSVData()->maWinData.mnAutoScrollFlags;
-    const bool          bHorz = ( nFlags & AUTOSCROLL_HORZ ) != 0;
-    const bool          bVert = ( nFlags & AUTOSCROLL_VERT ) != 0;
+    const StartAutoScrollFlags nFlags = ImplGetSVData()->maWinData.mnAutoScrollFlags;
+    const bool          bHorz( nFlags & StartAutoScrollFlags::Horz );
+    const bool          bVert( nFlags & StartAutoScrollFlags::Vert );
     const bool          bOuter = mnActDist > WHEEL_RADIUS;
 
     if( bOuter && ( maLastMousePos != aMousePos ) )

vcl/source/window/window2.cxx

@@ -443,7 +443,7 @@ bool Window::IsTracking() const
     return (ImplGetSVData()->maWinData.mpTrackWin == this);
 }
 
-void Window::StartAutoScroll( sal_uInt16 nFlags )
+void Window::StartAutoScroll( StartAutoScrollFlags nFlags )
 {
     ImplSVData* pSVData = ImplGetSVData();
 
@@ -465,7 +465,7 @@ void Window::EndAutoScroll()
     if ( pSVData->maWinData.mpAutoScrollWin.get() == this )
     {
         pSVData->maWinData.mpAutoScrollWin = NULL;
-        pSVData->maWinData.mnAutoScrollFlags = 0;
+        pSVData->maWinData.mnAutoScrollFlags = StartAutoScrollFlags::NONE;
         pSVData->maAppData.mpWheelWindow->ImplStop();
         pSVData->maAppData.mpWheelWindow->doLazyDelete();
         pSVData->maAppData.mpWheelWindow = NULL;
@@ -787,21 +787,21 @@ bool Window::HandleScrollCommand( const CommandEvent& rCmd,
         {
             case CommandEventId::StartAutoScroll:
             {
-                sal_uInt16 nFlags = 0;
+                StartAutoScrollFlags nFlags = StartAutoScrollFlags::NONE;
                 if ( pHScrl )
                 {
                     if ( (pHScrl->GetVisibleSize() < pHScrl->GetRangeMax()) &&
                          pHScrl->IsEnabled() && pHScrl->IsInputEnabled() && ! pHScrl->IsInModalMode() )
-                        nFlags |= AUTOSCROLL_HORZ;
+                        nFlags |= StartAutoScrollFlags::Horz;
                 }
                 if ( pVScrl )
                 {
                     if ( (pVScrl->GetVisibleSize() < pVScrl->GetRangeMax()) &&
                          pVScrl->IsEnabled() && pVScrl->IsInputEnabled() && ! pVScrl->IsInModalMode() )
-                        nFlags |= AUTOSCROLL_VERT;
+                        nFlags |= StartAutoScrollFlags::Vert;
                 }
 
-                if ( nFlags )
+                if ( nFlags != StartAutoScrollFlags::NONE )
                 {
                     StartAutoScroll( nFlags );
                     bRet = true;