fdo#84938: replace MENUITEM constants with enum

Change-Id: I7b0085af3b13bd6e1a50bf1e0e986d1524b52d7b

9 files changed, 45 insertions, 45 deletions

diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx
index f7234496ae03..41e7711ebd03 100644
--- a/vcl/osx/salmenu.cxx
+++ b/vcl/osx/salmenu.cxx
@@ -906,7 +906,7 @@ AquaSalMenuItem::AquaSalMenuItem( const SalItemParams* pItemData ) :
     // Delete mnemonics
     OUString aText( comphelper::string::remove(pItemData->aText, '~') );
 
-    if (pItemData->eType == MENUITEM_SEPARATOR)
+    if (pItemData->eType == MenuItemType::SEPARATOR)
     {
         mpMenuItem = [NSMenuItem separatorItem];
         // these can go occasionally go in and out of a menu, ensure their lifecycle
diff --git a/vcl/source/window/debugevent.cxx b/vcl/source/window/debugevent.cxx
index b2b755303763..65a117223f21 100644
--- a/vcl/source/window/debugevent.cxx
+++ b/vcl/source/window/debugevent.cxx
@@ -68,7 +68,7 @@ static void CollectMenuItemIds( Menu *pMenu, MenuItemIds &rIds )
     sal_uInt16 nItems = pMenu->GetItemCount();
     for (sal_uInt16 i = 0; i < nItems; i++)
     {
-        if (pMenu->GetItemType( i ) != MENUITEM_SEPARATOR || getRandom() < 0.01)
+        if (pMenu->GetItemType( i ) != MenuItemType::SEPARATOR || getRandom() < 0.01)
             rIds.push_back( SalMenuEvent( pMenu->GetItemId( i ), pMenu ) );
         PopupMenu *pPopup = pMenu->GetPopupMenu( i );
         if (pPopup)
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 0f15f99e5e85..5ec2aa4d7418 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -103,11 +103,11 @@ static void ImplSetMenuItemData( MenuItemData* pData )
 {
     // convert data
     if ( !pData->aImage )
-        pData->eType = MENUITEM_STRING;
+        pData->eType = MenuItemType::STRING;
     else if ( pData->aText.isEmpty() )
-        pData->eType = MENUITEM_IMAGE;
+        pData->eType = MenuItemType::IMAGE;
     else
-        pData->eType = MENUITEM_STRINGIMAGE;
+        pData->eType = MenuItemType::STRINGIMAGE;
 }
 
 Menu::Menu()
@@ -382,7 +382,7 @@ void Menu::InsertItem(sal_uInt16 nItemId, const OUString& rStr, MenuItemBits nIt
         nPos = MENU_APPEND;
 
     // put Item in MenuItemList
-    MenuItemData* pData = pItemList->Insert(nItemId, MENUITEM_STRING,
+    MenuItemData* pData = pItemList->Insert(nItemId, MenuItemType::STRING,
                              nItemBits, rStr, Image(), this, nPos, rIdent);
 
     // update native menu
@@ -576,10 +576,10 @@ void ImplCopyItem( Menu* pThis, const Menu& rMenu, sal_uInt16 nPos, sal_uInt16 n
 {
     MenuItemType eType = rMenu.GetItemType( nPos );
 
-    if ( eType == MENUITEM_DONTKNOW )
+    if ( eType == MenuItemType::DONTKNOW )
         return;
 
-    if ( eType == MENUITEM_SEPARATOR )
+    if ( eType == MenuItemType::SEPARATOR )
         pThis->InsertSeparator( OString(), nNewPos );
     else
     {
@@ -593,9 +593,9 @@ void ImplCopyItem( Menu* pThis, const Menu& rMenu, sal_uInt16 nPos, sal_uInt16 n
         if (!pData)
             return;
 
-        if ( eType == MENUITEM_STRINGIMAGE )
+        if ( eType == MenuItemType::STRINGIMAGE )
             pThis->InsertItem( nId, pData->aText, pData->aImage, pData->nBits, pData->sIdent, nNewPos );
-        else if ( eType == MENUITEM_STRING )
+        else if ( eType == MenuItemType::STRING )
             pThis->InsertItem( nId, pData->aText, pData->nBits, pData->sIdent, nNewPos );
         else
             pThis->InsertItem( nId, pData->aImage, pData->nBits, pData->sIdent, nNewPos );
@@ -721,7 +721,7 @@ MenuItemType Menu::GetItemType( sal_uInt16 nPos ) const
     if ( pData )
         return pData->eType;
     else
-        return MENUITEM_DONTKNOW;
+        return MenuItemType::DONTKNOW;
 }
 
 OString Menu::GetCurItemIdent() const
@@ -1266,7 +1266,7 @@ bool Menu::ImplIsVisible( sal_uInt16 nPos ) const
     if( pData && !pData->bVisible )
         bVisible = false;
 
-    if ( bVisible && pData && pData->eType == MENUITEM_SEPARATOR )
+    if ( bVisible && pData && pData->eType == MenuItemType::SEPARATOR )
     {
         if( nPos == 0 ) // no separator should be shown at the very beginning
             bVisible = false;
@@ -1282,14 +1282,14 @@ bool Menu::ImplIsVisible( sal_uInt16 nPos ) const
                 pNextData = pItemList->GetDataFromPos( n );
                 if( pNextData && pNextData->bVisible )
                 {
-                    if( pNextData->eType == MENUITEM_SEPARATOR || ImplIsVisible(n) )
+                    if( pNextData->eType == MenuItemType::SEPARATOR || ImplIsVisible(n) )
                         break;
                 }
             }
             if( n == nCount ) // no next visible item
                 bVisible = false;
             // check for separator
-            if( pNextData && pNextData->bVisible && pNextData->eType == MENUITEM_SEPARATOR )
+            if( pNextData && pNextData->bVisible && pNextData->eType == MenuItemType::SEPARATOR )
                 bVisible = false;
 
             if( bVisible )
@@ -1299,7 +1299,7 @@ bool Menu::ImplIsVisible( sal_uInt16 nPos ) const
                     pNextData = pItemList->GetDataFromPos( n-1 );
                     if( pNextData && pNextData->bVisible )
                     {
-                        if( pNextData->eType != MENUITEM_SEPARATOR && ImplIsVisible(n-1) )
+                        if( pNextData->eType != MenuItemType::SEPARATOR && ImplIsVisible(n-1) )
                             break;
                     }
                 }
@@ -1316,7 +1316,7 @@ bool Menu::ImplIsVisible( sal_uInt16 nPos ) const
     {
         if( !pData ) // e.g. nPos == ITEMPOS_INVALID
             bVisible = false;
-        else if ( pData->eType != MENUITEM_SEPARATOR ) // separators handled above
+        else if ( pData->eType != MenuItemType::SEPARATOR ) // separators handled above
         {
             // bVisible = pData->bEnabled && ( !pData->pSubMenu || pData->pSubMenu->HasValidEntries( true ) );
             bVisible = pData->bEnabled; // do not check submenus as they might be filled at Activate().
@@ -1519,8 +1519,8 @@ Size Menu::ImplCalcSize( const vcl::Window* pWin )
         {
             MenuItemData* pData = pItemList->GetDataFromPos( --i );
             if ( ImplIsVisible( i )
-               && (  ( pData->eType == MENUITEM_IMAGE )
-                  || ( pData->eType == MENUITEM_STRINGIMAGE )
+               && (  ( pData->eType == MenuItemType::IMAGE )
+                  || ( pData->eType == MenuItemType::STRINGIMAGE )
                   )
                )
             {
@@ -1550,14 +1550,14 @@ Size Menu::ImplCalcSize( const vcl::Window* pWin )
             long nWidth = 0;
 
             // Separator
-            if (!IsMenuBar()&& (pData->eType == MENUITEM_SEPARATOR))
+            if (!IsMenuBar()&& (pData->eType == MenuItemType::SEPARATOR))
             {
                 DBG_ASSERT( !IsMenuBar(), "Separator in MenuBar ?! " );
                 pData->aSz.Height() = 4;
             }
 
             // Image:
-            if (!IsMenuBar()&& ((pData->eType == MENUITEM_IMAGE) || (pData->eType == MENUITEM_STRINGIMAGE)))
+            if (!IsMenuBar()&& ((pData->eType == MenuItemType::IMAGE) || (pData->eType == MenuItemType::STRINGIMAGE)))
             {
                 Size aImgSz = pData->aImage.GetSizePixel();
                 aImgSz.Height() += 4; // add a border for native marks
@@ -1575,12 +1575,12 @@ Size Menu::ImplCalcSize( const vcl::Window* pWin )
             {
                 nCheckWidth = aMaxSize.Width();
                 // checks / images take the same place
-                if( ! ( ( pData->eType == MENUITEM_IMAGE ) || ( pData->eType == MENUITEM_STRINGIMAGE ) ) )
+                if( ! ( ( pData->eType == MenuItemType::IMAGE ) || ( pData->eType == MenuItemType::STRINGIMAGE ) ) )
                     nWidth += nCheckWidth + nExtra * 2;
             }
 
             // Text:
-            if ( (pData->eType == MENUITEM_STRING) || (pData->eType == MENUITEM_STRINGIMAGE) )
+            if ( (pData->eType == MenuItemType::STRING) || (pData->eType == MenuItemType::STRINGIMAGE) )
             {
                 long nTextWidth = pWin->GetCtrlTextWidth( pData->aText );
                 long nTextHeight = pWin->GetTextHeight();
@@ -1811,7 +1811,7 @@ void Menu::ImplPaint( vcl::Window* pWin, sal_uInt16 nBorder, long nStartY, MenuI
                 }
 
                 // Separator
-                if (!bLayout && !IsMenuBar() && (pData->eType == MENUITEM_SEPARATOR))
+                if (!bLayout && !IsMenuBar() && (pData->eType == MenuItemType::SEPARATOR))
                 {
                     bool bNativeOk = false;
                     if( pWin->IsNativeControlSupported( CTRL_MENU_POPUP,
@@ -1860,7 +1860,7 @@ void Menu::ImplPaint( vcl::Window* pWin, sal_uInt16 nBorder, long nStartY, MenuI
                     // however do not do this if native checks will be painted since
                     // the selection color too often does not fit the theme's check and/or radio
 
-                    if( ! ( ( pData->eType == MENUITEM_IMAGE ) || ( pData->eType == MENUITEM_STRINGIMAGE ) ) )
+                    if( ! ( ( pData->eType == MenuItemType::IMAGE ) || ( pData->eType == MenuItemType::STRINGIMAGE ) ) )
                     {
                         if ( pWin->IsNativeControlSupported( CTRL_MENU_POPUP,
                                                              (pData->nBits & MIB_RADIOCHECK)
@@ -1922,7 +1922,7 @@ void Menu::ImplPaint( vcl::Window* pWin, sal_uInt16 nBorder, long nStartY, MenuI
                 }
 
                 // Image:
-                if (!bLayout && !IsMenuBar() && ((pData->eType == MENUITEM_IMAGE) || (pData->eType == MENUITEM_STRINGIMAGE)))
+                if (!bLayout && !IsMenuBar() && ((pData->eType == MenuItemType::IMAGE) || (pData->eType == MenuItemType::STRINGIMAGE)))
                 {
                     // Don't render an image for a check thing
                     if( pData->bChecked )
@@ -1934,7 +1934,7 @@ void Menu::ImplPaint( vcl::Window* pWin, sal_uInt16 nBorder, long nStartY, MenuI
                 }
 
                 // Text:
-                if ( ( pData->eType == MENUITEM_STRING ) || ( pData->eType == MENUITEM_STRINGIMAGE ) )
+                if ( ( pData->eType == MenuItemType::STRING ) || ( pData->eType == MenuItemType::STRINGIMAGE ) )
                 {
                     aTmpPos.X() = aPos.X() + nTextPos;
                     aTmpPos.Y() = aPos.Y();
@@ -2171,9 +2171,9 @@ void Menu::RemoveDisabledEntries( bool bCheckPopups, bool bRemoveEmptyPopups )
     {
         bool bRemove = false;
         MenuItemData* pItem = pItemList->GetDataFromPos( n );
-        if ( pItem->eType == MENUITEM_SEPARATOR )
+        if ( pItem->eType == MenuItemType::SEPARATOR )
         {
-            if ( !n || ( GetItemType( n-1 ) == MENUITEM_SEPARATOR ) )
+            if ( !n || ( GetItemType( n-1 ) == MenuItemType::SEPARATOR ) )
                 bRemove = true;
         }
         else
@@ -2194,7 +2194,7 @@ void Menu::RemoveDisabledEntries( bool bCheckPopups, bool bRemoveEmptyPopups )
     {
         sal_uInt16 nLast = GetItemCount() - 1;
         MenuItemData* pItem = pItemList->GetDataFromPos( nLast );
-        if ( pItem->eType == MENUITEM_SEPARATOR )
+        if ( pItem->eType == MenuItemType::SEPARATOR )
             RemoveItem( nLast );
     }
     delete mpLayoutData, mpLayoutData = NULL;
@@ -2207,7 +2207,7 @@ bool Menu::HasValidEntries( bool bCheckPopups )
     for ( sal_uInt16 n = 0; !bValidEntries && ( n < nCount ); n++ )
     {
         MenuItemData* pItem = pItemList->GetDataFromPos( n );
-        if ( pItem->bEnabled && ( pItem->eType != MENUITEM_SEPARATOR ) )
+        if ( pItem->bEnabled && ( pItem->eType != MenuItemType::SEPARATOR ) )
         {
             if ( bCheckPopups && pItem->pSubMenu )
                 bValidEntries = pItem->pSubMenu->HasValidEntries( true );
@@ -2862,7 +2862,7 @@ sal_uInt16 PopupMenu::ImplExecute( vcl::Window* pW, const Rectangle& rRect, sal_
         {
             OUString aTmpEntryText( ResId( SV_RESID_STRING_NOSELECTIONPOSSIBLE, *pResMgr ) );
             MenuItemData* pData = pItemList->Insert(
-                0xFFFF, MENUITEM_STRING, 0, aTmpEntryText, Image(), NULL, 0xFFFF, OString() );
+                0xFFFF, MenuItemType::STRING, 0, aTmpEntryText, Image(), NULL, 0xFFFF, OString() );
             size_t nPos = 0;
             pData = pItemList->GetData( pData->nId, nPos );
             assert(pData);
@@ -2975,7 +2975,7 @@ sal_uInt16 PopupMenu::ImplExecute( vcl::Window* pW, const Rectangle& rRect, sal_
             if (  (  pData->bEnabled
                   || !Application::GetSettings().GetStyleSettings().GetSkipDisabledInMenus()
                   )
-               && ( pData->eType != MENUITEM_SEPARATOR )
+               && ( pData->eType != MenuItemType::SEPARATOR )
                && ImplIsVisible( n )
                && ImplIsSelectable( n )
                )
diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx
index 63011d297395..ebbfeecc6881 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -582,7 +582,7 @@ void MenuBarWindow::HighlightItem( sal_uInt16 nPos, bool bHighlight )
         MenuItemData* pData = pMenu->pItemList->GetDataFromPos( n );
         if ( n == nPos )
         {
-            if ( pData->eType != MENUITEM_SEPARATOR )
+            if ( pData->eType != MenuItemType::SEPARATOR )
             {
                 // #107747# give menuitems the height of the menubar
                 Rectangle aRect = Rectangle( Point( nX, 1 ), Size( pData->aSz.Width(), GetOutputSizePixel().Height()-2 ) );
@@ -681,7 +681,7 @@ Rectangle MenuBarWindow::ImplGetItemRect( sal_uInt16 nPos )
             MenuItemData* pData = pMenu->pItemList->GetDataFromPos( n );
             if ( n == nPos )
             {
-                if ( pData->eType != MENUITEM_SEPARATOR )
+                if ( pData->eType != MenuItemType::SEPARATOR )
                     // #107747# give menuitems the height of the menubar
                     aRect = Rectangle( Point( nX, 1 ), Size( pData->aSz.Width(), GetOutputSizePixel().Height()-2 ) );
                 break;
@@ -785,7 +785,7 @@ bool MenuBarWindow::HandleKeyEvent( const KeyEvent& rKEvent, bool bFromMenu )
                 }
 
                 MenuItemData* pData = (MenuItemData*)pMenu->GetItemList()->GetDataFromPos( n );
-                if ( ( pData->eType != MENUITEM_SEPARATOR ) && pMenu->ImplIsVisible( n ) )
+                if ( ( pData->eType != MenuItemType::SEPARATOR ) && pMenu->ImplIsVisible( n ) )
                 {
                     bool bDoSelect = true;
                     if( ImplGetSVData()->maNWFData.mbOpenMenuOnF10 )
diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx
index a61345af1e62..e3a7c13c7d7c 100644
--- a/vcl/source/window/menufloatingwindow.cxx
+++ b/vcl/source/window/menufloatingwindow.cxx
@@ -501,7 +501,7 @@ void MenuFloatingWindow::MouseButtonUp( const MouseEvent& rMEvt )
     // as it will be too late after EndExecute
     sal_uInt16 _nMBDownPos = nMBDownPos;
     nMBDownPos = ITEMPOS_INVALID;
-    if ( pData && pData->bEnabled && ( pData->eType != MENUITEM_SEPARATOR ) )
+    if ( pData && pData->bEnabled && ( pData->eType != MenuItemType::SEPARATOR ) )
     {
         if ( !pData->pSubMenu )
         {
@@ -731,7 +731,7 @@ void MenuFloatingWindow::HighlightItem( sal_uInt16 nPos, bool bHighlight )
         if ( n == nPos )
         {
             DBG_ASSERT( pMenu->ImplIsVisible( n ), "Highlight: Item not visible!" );
-            if ( pData->eType != MENUITEM_SEPARATOR )
+            if ( pData->eType != MenuItemType::SEPARATOR )
             {
                 bool bRestoreLineColor = false;
                 Color oldLineColor;
@@ -824,7 +824,7 @@ Rectangle MenuFloatingWindow::ImplGetItemRect( sal_uInt16 nPos )
         if ( n == nPos )
         {
             DBG_ASSERT( pMenu->ImplIsVisible( n ), "ImplGetItemRect: Item not visible!" );
-            if ( pData->eType != MENUITEM_SEPARATOR )
+            if ( pData->eType != MenuItemType::SEPARATOR )
             {
                 aRect = Rectangle( Point( nX, nY ), Size( aSz.Width(), pData->aSz.Height() ) );
                 if ( pData->nBits & MIB_POPUPSELECT )
@@ -899,7 +899,7 @@ void MenuFloatingWindow::ImplCursorUpDown( bool bUp, bool bHomeEnd )
 
         MenuItemData* pData = (MenuItemData*)pMenu->GetItemList()->GetDataFromPos( n );
         if ( ( pData->bEnabled || !rSettings.GetSkipDisabledInMenus() )
-              && ( pData->eType != MENUITEM_SEPARATOR ) && pMenu->ImplIsVisible( n ) && pMenu->ImplIsSelectable( n ) )
+              && ( pData->eType != MenuItemType::SEPARATOR ) && pMenu->ImplIsVisible( n ) && pMenu->ImplIsSelectable( n ) )
         {
             // Is selection in visible area?
             if ( IsScrollMenu() )
diff --git a/vcl/source/window/menuitemlist.cxx b/vcl/source/window/menuitemlist.cxx
index 10129d468885..505bdf72e98b 100644
--- a/vcl/source/window/menuitemlist.cxx
+++ b/vcl/source/window/menuitemlist.cxx
@@ -98,7 +98,7 @@ void MenuItemList::InsertSeparator(const OString &rIdent, size_t nPos)
     MenuItemData* pData     = new MenuItemData;
     pData->nId              = 0;
     pData->sIdent           = rIdent;
-    pData->eType            = MENUITEM_SEPARATOR;
+    pData->eType            = MenuItemType::SEPARATOR;
     pData->nBits            = 0;
     pData->pSubMenu         = NULL;
     pData->pAutoSubMenu     = NULL;
@@ -112,7 +112,7 @@ void MenuItemList::InsertSeparator(const OString &rIdent, size_t nPos)
 
     SalItemParams aSalMIData;
     aSalMIData.nId = 0;
-    aSalMIData.eType = MENUITEM_SEPARATOR;
+    aSalMIData.eType = MenuItemType::SEPARATOR;
     aSalMIData.nBits = 0;
     aSalMIData.pMenu = NULL;
     aSalMIData.aText = OUString();
diff --git a/vcl/source/window/menuitemlist.hxx b/vcl/source/window/menuitemlist.hxx
index 27f138efb4d1..da69193770db 100644
--- a/vcl/source/window/menuitemlist.hxx
+++ b/vcl/source/window/menuitemlist.hxx
@@ -59,7 +59,7 @@ struct MenuItemData
 
     MenuItemData()
         : nId(0)
-        , eType(MENUITEM_DONTKNOW)
+        , eType(MenuItemType::DONTKNOW)
         , nBits(0)
         , pSubMenu(NULL)
         , pAutoSubMenu(NULL)
@@ -75,7 +75,7 @@ struct MenuItemData
     }
     MenuItemData( const OUString& rStr, const Image& rImage )
         : nId(0)
-        , eType(MENUITEM_DONTKNOW)
+        , eType(MenuItemType::DONTKNOW)
         , nBits(0)
         , pSubMenu(NULL)
         , pAutoSubMenu(NULL)
diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx b/vcl/unx/gtk/window/gtksalmenu.cxx
index 7a56ad63ad7b..676e68c5f5a5 100644
--- a/vcl/unx/gtk/window/gtksalmenu.cxx
+++ b/vcl/unx/gtk/window/gtksalmenu.cxx
@@ -284,7 +284,7 @@ void GtkSalMenu::ImplUpdate( gboolean bRecurse )
         GtkSalMenuItem *pSalMenuItem = GetItemAtPos( nItem );
         sal_uInt16 nId = pSalMenuItem->mnId;
 
-        if ( pSalMenuItem->mnType == MENUITEM_SEPARATOR )
+        if ( pSalMenuItem->mnType == MenuItemType::SEPARATOR )
         {
             // Delete extra items from current section.
             RemoveSpareItemsFromNativeMenu( pLOMenu, &pOldCommandList, nSection, validItems );
diff --git a/vcl/win/source/window/salmenu.cxx b/vcl/win/source/window/salmenu.cxx
index 7deb54b04b76..422701a6865e 100644
--- a/vcl/win/source/window/salmenu.cxx
+++ b/vcl/win/source/window/salmenu.cxx
@@ -79,7 +79,7 @@ SalMenuItem* WinSalInstance::CreateMenuItem( const SalItemParams* pItemData )
     memset( &pSalMenuItem->mInfo, 0, sizeof( MENUITEMINFOW ) );
     pSalMenuItem->mInfo.cbSize = sizeof( MENUITEMINFOW );
 
-    if( pItemData->eType == MENUITEM_SEPARATOR )
+    if( pItemData->eType == MenuItemType::SEPARATOR )
     {
         // separator
         pSalMenuItem->mInfo.fMask = MIIM_TYPE;