convert TOTOP constants to scoped enum

Change-Id: I85ba631ba298f1034dc5b6a04a5ff3d509c41bcb

15 files changed, 42 insertions, 34 deletions

diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index f07042d44a23..3e720b5b3ef8 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -270,12 +270,12 @@ void ServiceImpl::startExecuteModal(
             if ( bCloseDialog )
                 myExtMgr->Close();
             else
-                myExtMgr->ToTop( TOTOP_RESTOREWHENMIN );
+                myExtMgr->ToTop( ToTopFlags::RestoreWhenMin );
         }
         else
         {
             myExtMgr->Show();
-            myExtMgr->ToTop( TOTOP_RESTOREWHENMIN );
+            myExtMgr->ToTop( ToTopFlags::RestoreWhenMin );
         }
     }
 
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
index ccf0b54ff150..d04c3569d3ca 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
@@ -148,7 +148,7 @@ void TheExtensionManager::SetText( const OUString &rTitle )
 }
 
 
-void TheExtensionManager::ToTop( sal_uInt16 nFlags )
+void TheExtensionManager::ToTop( ToTopFlags nFlags )
 {
     const SolarMutexGuard guard;
 
@@ -442,7 +442,7 @@ void TheExtensionManager::queryTermination( ::lang::EventObject const & )
 
     if ( m_pExecuteCmdQueue->isBusy() || ( pDialogHelper && pDialogHelper->isBusy() ) )
     {
-        ToTop( TOTOP_RESTOREWHENMIN );
+        ToTop( ToTopFlags::RestoreWhenMin );
         throw frame::TerminationVetoException(
             "The office cannot be closed while the Extension Manager is running",
             static_cast<frame::XTerminateListener*>(this));
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
index 2341a5ad9a3c..cde3202025e2 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx
@@ -87,7 +87,7 @@ public:
 
     void SetText( const OUString &rTitle );
     void Show();
-    void ToTop( sal_uInt16 nFlags );
+    void ToTop( ToTopFlags nFlags );
     bool Close();
     bool isVisible();
 
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index 7cd0e7dd6c06..e6580b50e922 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -846,7 +846,7 @@ IMPL_LINK( MenuManager, Select, Menu *, pMenu )
                     {
                         vcl::Window* pWin = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() );
                         pWin->GrabFocus();
-                        pWin->ToTop( TOTOP_RESTOREWHENMIN );
+                        pWin->ToTop( ToTopFlags::RestoreWhenMin );
                         break;
                     }
 
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index ad424fdc22c2..921a75b1fa5e 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -985,7 +985,7 @@ IMPL_LINK( MenuBarManager, Select, Menu *, pMenu )
                     {
                         vcl::Window* pWin = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() );
                         pWin->GrabFocus();
-                        pWin->ToTop( TOTOP_RESTOREWHENMIN );
+                        pWin->ToTop( ToTopFlags::RestoreWhenMin );
                         break;
                     }
 
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index eb2d6a864169..c791ddea0600 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -207,10 +207,18 @@ namespace o3tl
 }
 
 // ToTop-Flags
-#define TOTOP_RESTOREWHENMIN            ((sal_uInt16)0x0001)
-#define TOTOP_FOREGROUNDTASK            ((sal_uInt16)0x0002)
-#define TOTOP_NOGRABFOCUS               ((sal_uInt16)0x0004)
-#define TOTOP_GRABFOCUSONLY             ((sal_uInt16)0x0008)
+enum class ToTopFlags
+{
+    NONE            = 0x0000,
+    RestoreWhenMin  = 0x0001,
+    ForegroundTask  = 0x0002,
+    NoGrabFocus     = 0x0004,
+    GrabFocusOnly   = 0x0008,
+};
+namespace o3tl
+{
+    template<> struct typed_flags<ToTopFlags> : is_typed_flags<ToTopFlags, 0x000f> {};
+}
 
 // Flags for Invalidate
 #define INVALIDATE_CHILDREN             ((sal_uInt16)0x0001)
@@ -671,9 +679,9 @@ private:
     SAL_DLLPRIVATE void                 ImplToBottomChild();
 
     SAL_DLLPRIVATE void                 ImplCalcToTop( ImplCalcToTopData* pPrevData );
-    SAL_DLLPRIVATE void                 ImplToTop( sal_uInt16 nFlags );
-    SAL_DLLPRIVATE void                 ImplStartToTop( sal_uInt16 nFlags );
-    SAL_DLLPRIVATE void                 ImplFocusToTop( sal_uInt16 nFlags, bool bReallyVisible );
+    SAL_DLLPRIVATE void                 ImplToTop( ToTopFlags nFlags );
+    SAL_DLLPRIVATE void                 ImplStartToTop( ToTopFlags nFlags );
+    SAL_DLLPRIVATE void                 ImplFocusToTop( ToTopFlags nFlags, bool bReallyVisible );
 
     SAL_DLLPRIVATE void                 ImplShowAllOverlaps();
     SAL_DLLPRIVATE void                 ImplHideAllOverlaps();
@@ -1020,7 +1028,7 @@ public:
     void                                SetActivateMode( ActivateModeFlags nMode );
     ActivateModeFlags                   GetActivateMode() const;
 
-    void                                ToTop( sal_uInt16 nFlags = 0 );
+    void                                ToTop( ToTopFlags nFlags = ToTopFlags::NONE );
     void                                SetZOrder( vcl::Window* pRefWindow, ZOrderFlags nFlags );
     void                                EnableAlwaysOnTop( bool bEnable = true );
     bool                                IsAlwaysOnTopEnabled() const;
diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx
index 04564cdd8b0f..69017d577c75 100644
--- a/sfx2/source/inet/inettbc.cxx
+++ b/sfx2/source/inet/inettbc.cxx
@@ -184,7 +184,7 @@ IMPL_LINK_NOARG(SfxURLToolBoxControl_Impl, OpenHdl)
         if ( pWin )
         {
             pWin->GrabFocus();
-            pWin->ToTop( TOTOP_RESTOREWHENMIN );
+            pWin->ToTop( ToTopFlags::RestoreWhenMin );
         }
     }
 
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index e14bb24e24e1..2ca790ebf76a 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -953,7 +953,7 @@ IMPL_LINK( SfxVirtualMenu, Select, Menu *, pMenu )
             {
                 vcl::Window* pWin = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() );
                 pWin->GrabFocus();
-                pWin->ToTop( TOTOP_RESTOREWHENMIN );
+                pWin->ToTop( ToTopFlags::RestoreWhenMin );
                 break;
             }
 
diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx
index 48b593eb37fb..06cba55f05dc 100644
--- a/toolkit/source/awt/vclxtopwindow.cxx
+++ b/toolkit/source/awt/vclxtopwindow.cxx
@@ -136,7 +136,7 @@ void VCLXTopWindow_Base::toFront(  ) throw(::com::sun::star::uno::RuntimeExcepti
 
     vcl::Window* pWindow = GetWindowImpl();
     if ( pWindow )
-        static_cast<WorkWindow*>(pWindow)->ToTop( TOTOP_RESTOREWHENMIN );
+        static_cast<WorkWindow*>(pWindow)->ToTop( ToTopFlags::RestoreWhenMin );
 }
 
 void VCLXTopWindow_Base::toBack(  ) throw(::com::sun::star::uno::RuntimeException, std::exception)
diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx
index 0c201b9b0c37..c5dfc892a727 100644
--- a/vcl/source/window/event.cxx
+++ b/vcl/source/window/event.cxx
@@ -158,7 +158,7 @@ bool Window::Notify( NotifyEvent& rNEvt )
                  * would not notice any change since "this" already has the focus.
                  */
                 if( pWrapper->IsFloatingMode() )
-                    ToTop( TOTOP_GRABFOCUSONLY );
+                    ToTop( ToTopFlags::GrabFocusOnly );
                 return true;
             }
         }
diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx
index 0093ba1949ca..ad7bd0ffc27b 100644
--- a/vcl/source/window/menufloatingwindow.cxx
+++ b/vcl/source/window/menufloatingwindow.cxx
@@ -507,7 +507,7 @@ void MenuFloatingWindow::MouseButtonDown( const MouseEvent& rMEvt )
     // should stay on top...
     // due to focus change this would close all menus -> don't do it (#94123)
     //if ( pActivePopup && pActivePopup->ImplGetWindow() && !pActivePopup->ImplGetFloatingWindow()->pActivePopup )
-    //    pActivePopup->ImplGetFloatingWindow()->ToTop( TOTOP_NOGRABFOCUS );
+    //    pActivePopup->ImplGetFloatingWindow()->ToTop( ToTopFlags::NoGrabFocus );
 
     ImplHighlightItem( rMEvt, true );
 
diff --git a/vcl/source/window/stacking.cxx b/vcl/source/window/stacking.cxx
index 8c6c97be2c7e..96e27e49d0e1 100644
--- a/vcl/source/window/stacking.cxx
+++ b/vcl/source/window/stacking.cxx
@@ -236,7 +236,7 @@ void Window::ImplCalcToTop( ImplCalcToTopData* pPrevData )
     }
 }
 
-void Window::ImplToTop( sal_uInt16 nFlags )
+void Window::ImplToTop( ToTopFlags nFlags )
 {
     DBG_ASSERT( ImplIsOverlapWindow(), "Window::ImplToTop(): Is not a OverlapWindow" );
 
@@ -253,11 +253,11 @@ void Window::ImplToTop( sal_uInt16 nFlags )
             if( !ImplGetClientWindow() || !(ImplGetClientWindow()->GetStyle() & WB_SYSTEMFLOATWIN) )
             {
                 sal_uInt16 nSysFlags = 0;
-                if ( nFlags & TOTOP_RESTOREWHENMIN )
+                if ( nFlags & ToTopFlags::RestoreWhenMin )
                     nSysFlags |= SAL_FRAME_TOTOP_RESTOREWHENMIN;
-                if ( nFlags & TOTOP_FOREGROUNDTASK )
+                if ( nFlags & ToTopFlags::ForegroundTask )
                     nSysFlags |= SAL_FRAME_TOTOP_FOREGROUNDTASK;
-                if ( nFlags & TOTOP_GRABFOCUSONLY )
+                if ( nFlags & ToTopFlags::GrabFocusOnly )
                     nSysFlags |= SAL_FRAME_TOTOP_GRABFOCUS_ONLY;
                 mpWindowImpl->mpFrame->ToTop( nSysFlags );
             }
@@ -326,7 +326,7 @@ void Window::ImplToTop( sal_uInt16 nFlags )
     }
 }
 
-void Window::ImplStartToTop( sal_uInt16 nFlags )
+void Window::ImplStartToTop( ToTopFlags nFlags )
 {
     ImplCalcToTopData   aStartData;
     ImplCalcToTopData*  pCurData;
@@ -379,10 +379,10 @@ void Window::ImplStartToTop( sal_uInt16 nFlags )
     }
 }
 
-void Window::ImplFocusToTop( sal_uInt16 nFlags, bool bReallyVisible )
+void Window::ImplFocusToTop( ToTopFlags nFlags, bool bReallyVisible )
 {
     // do we need to fetch the focus?
-    if ( !(nFlags & TOTOP_NOGRABFOCUS) )
+    if ( !(nFlags & ToTopFlags::NoGrabFocus) )
     {
         // first window with GrabFocus-Activate gets the focus
         vcl::Window* pFocusWindow = this;
@@ -436,7 +436,7 @@ void Window::ImplHideAllOverlaps()
     }
 }
 
-void Window::ToTop( sal_uInt16 nFlags )
+void Window::ToTop( ToTopFlags nFlags )
 {
 
     ImplStartToTop( nFlags );
diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx
index 25867d8f460e..c02cfc608ab7 100644
--- a/vcl/source/window/syschild.cxx
+++ b/vcl/source/window/syschild.cxx
@@ -64,7 +64,7 @@ long ImplSysChildProc( void* pInst, SalObject* /* pObject */,
             // that the frame does not steal it
             pWindow->ImplGetFrameData()->mbSysObjFocus = true;
             pWindow->ImplGetFrameData()->mbInSysObjToTopHdl = true;
-            pWindow->ToTop( TOTOP_NOGRABFOCUS );
+            pWindow->ToTop( ToTopFlags::NoGrabFocus );
             if( aDogTag.IsDead() )
                 break;
             pWindow->ImplGetFrameData()->mbInSysObjToTopHdl = false;
@@ -89,7 +89,7 @@ long ImplSysChildProc( void* pInst, SalObject* /* pObject */,
         case SALOBJ_EVENT_TOTOP:
             pWindow->ImplGetFrameData()->mbInSysObjToTopHdl = true;
             if ( !Application::GetFocusWindow() || pWindow->HasChildPathFocus() )
-                pWindow->ToTop( TOTOP_NOGRABFOCUS );
+                pWindow->ToTop( ToTopFlags::NoGrabFocus );
             else
                 pWindow->ToTop();
             if( aDogTag.IsDead() )
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 8a5d7d8f0844..be51862b6d40 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -2407,8 +2407,8 @@ void Window::Show(bool bVisible, ShowFlags nFlags)
             // all other windows if needed.
             if ( ImplIsOverlapWindow() && !(nFlags & ShowFlags::NoActivate) )
             {
-                ImplStartToTop(( nFlags & ShowFlags::ForegroundTask ) ? TOTOP_FOREGROUNDTASK : 0 );
-                ImplFocusToTop( 0, false );
+                ImplStartToTop(( nFlags & ShowFlags::ForegroundTask ) ? ToTopFlags::ForegroundTask : ToTopFlags::NONE );
+                ImplFocusToTop( ToTopFlags::NONE, false );
             }
 
             // save background
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 4331a4037905..ff1252bcfc30 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -698,7 +698,7 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow, MouseNotifyEvent nSVEvent, bool
                 // Auto-ToTop
                 if ( !pSVData->maWinData.mpCaptureWin &&
                      (pChild->GetSettings().GetMouseSettings().GetOptions() & MouseSettingsOptions::AutoFocus) )
-                    pChild->ToTop( TOTOP_NOGRABFOCUS );
+                    pChild->ToTop( ToTopFlags::NoGrabFocus );
 
                 if( aDelData.IsDead() )
                     bCallHelpRequest = false;
@@ -1812,7 +1812,7 @@ IMPL_LINK_NOARG(vcl::Window, ImplAsyncFocusHdl)
                 vcl::Window*     pTopLevelWindow = ImplGetWindowImpl()->mpFrameData->mpFocusWin->ImplGetFirstOverlapWindow();
                 if ( ( ! pTopLevelWindow->IsInputEnabled() || pTopLevelWindow->IsInModalMode() )
                      && pSVData->maWinData.mpLastExecuteDlg )
-                    pSVData->maWinData.mpLastExecuteDlg->ToTop( TOTOP_RESTOREWHENMIN | TOTOP_GRABFOCUSONLY);
+                    pSVData->maWinData.mpLastExecuteDlg->ToTop( ToTopFlags::RestoreWhenMin | ToTopFlags::GrabFocusOnly);
                 else
                     pTopLevelWindow->GrabFocus();
             }