convert SV_ITEMSTATE constants to SvItemState scoped enum

Change-Id: I7d7d516f37cbb5e28a842bbc6bff54916d450dbb

3 files changed, 28 insertions, 34 deletions

diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx
index 2e88f578d4de..00e65e34cc56 100644
--- a/svtools/source/contnr/svlbitm.cxx
+++ b/svtools/source/contnr/svlbitm.cxx
@@ -76,27 +76,23 @@ void SvLBoxButtonData::CallLink()
     aLink.Call( this );
 }
 
-SvBmp SvLBoxButtonData::GetIndex( sal_uInt16 nItemState )
+SvBmp SvLBoxButtonData::GetIndex( SvItemStateFlags nItemState )
 {
-    nItemState &= 0x000F;
     SvBmp nIdx;
-    switch( nItemState )
-    {
-        case SV_ITEMSTATE_UNCHECKED:
-                nIdx = SvBmp::UNCHECKED; break;
-        case SV_ITEMSTATE_CHECKED:
-                nIdx = SvBmp::CHECKED; break;
-        case SV_ITEMSTATE_TRISTATE:
-                nIdx = SvBmp::TRISTATE; break;
-        case SV_ITEMSTATE_UNCHECKED | SV_ITEMSTATE_HILIGHTED:
-                nIdx = SvBmp::HIUNCHECKED; break;
-        case SV_ITEMSTATE_CHECKED | SV_ITEMSTATE_HILIGHTED:
-                nIdx = SvBmp::HICHECKED; break;
-        case SV_ITEMSTATE_TRISTATE | SV_ITEMSTATE_HILIGHTED:
-                nIdx = SvBmp::HITRISTATE; break;
-        default:
-                nIdx = SvBmp::UNCHECKED;
-    }
+    if (nItemState == SvItemStateFlags::UNCHECKED)
+        nIdx = SvBmp::UNCHECKED;
+    else if (nItemState == SvItemStateFlags::CHECKED)
+        nIdx = SvBmp::CHECKED;
+    else if (nItemState == SvItemStateFlags::TRISTATE)
+        nIdx = SvBmp::TRISTATE;
+    else if (nItemState == (SvItemStateFlags::UNCHECKED | SvItemStateFlags::HILIGHTED))
+        nIdx = SvBmp::HIUNCHECKED;
+    else if (nItemState == (SvItemStateFlags::CHECKED | SvItemStateFlags::HILIGHTED))
+        nIdx = SvBmp::HICHECKED;
+    else if (nItemState == (SvItemStateFlags::TRISTATE | SvItemStateFlags::HILIGHTED))
+        nIdx = SvBmp::HITRISTATE;
+    else
+        nIdx = SvBmp::UNCHECKED;
     return nIdx;
 }
 
@@ -109,26 +105,24 @@ void SvLBoxButtonData::SetWidthAndHeight()
 }
 
 
-void SvLBoxButtonData::StoreButtonState( SvTreeListEntry* pActEntry, sal_uInt16 nItemFlags )
+void SvLBoxButtonData::StoreButtonState( SvTreeListEntry* pActEntry, SvItemStateFlags nItemFlags )
 {
     pImpl->pEntry = pActEntry;
     eState = ConvertToButtonState( nItemFlags );
 }
 
-SvButtonState SvLBoxButtonData::ConvertToButtonState( sal_uInt16 nItemFlags ) const
+SvButtonState SvLBoxButtonData::ConvertToButtonState( SvItemStateFlags nItemFlags ) const
 {
-    nItemFlags &= (SV_ITEMSTATE_UNCHECKED |
-                   SV_ITEMSTATE_CHECKED |
-                   SV_ITEMSTATE_TRISTATE);
+    nItemFlags &= (SvItemStateFlags::UNCHECKED |
+                   SvItemStateFlags::CHECKED |
+                   SvItemStateFlags::TRISTATE);
     switch( nItemFlags )
     {
-        case SV_ITEMSTATE_UNCHECKED:
+        case SvItemStateFlags::UNCHECKED:
             return SV_BUTTON_UNCHECKED;
-
-        case SV_ITEMSTATE_CHECKED:
+        case SvItemStateFlags::CHECKED:
             return SV_BUTTON_CHECKED;
-
-        case SV_ITEMSTATE_TRISTATE:
+        case SvItemStateFlags::TRISTATE:
             return SV_BUTTON_TRISTATE;
         default:
             return SV_BUTTON_UNCHECKED;
@@ -305,7 +299,7 @@ SvLBoxButton::SvLBoxButton( SvTreeListEntry* pEntry, SvLBoxButtonKind eTheKind,
     , isVis(true)
     , pData(pBData)
     , eKind(eTheKind)
-    , nItemFlags(0)
+    , nItemFlags(SvItemStateFlags::NONE)
 {
     SetStateUnchecked();
 }
@@ -315,7 +309,7 @@ SvLBoxButton::SvLBoxButton()
     , isVis(false)
     , pData(0)
     , eKind(SvLBoxButtonKind_enabledCheckbox)
-    , nItemFlags(0)
+    , nItemFlags(SvItemStateFlags::NONE)
 {
     SetStateUnchecked();
 }
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index bf59a71722e4..94e237df5545 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -554,7 +554,7 @@ bool SvHeaderTabListBox::IsItemChecked( SvTreeListEntry* pEntry, sal_uInt16 nCol
 
     if (pItem && pItem->GetType() == SV_ITEM_ID_LBOXBUTTON)
     {
-        sal_uInt16 nButtonFlags = pItem->GetButtonFlags();
+        SvItemStateFlags nButtonFlags = pItem->GetButtonFlags();
         eState = pCheckButtonData->ConvertToButtonState( nButtonFlags );
     }
 
@@ -686,7 +686,7 @@ bool SvHeaderTabListBox::IsCellCheckBox( long _nRow, sal_uInt16 _nColumn, TriSta
             if (pItem && pItem->GetType() == SV_ITEM_ID_LBOXBUTTON)
             {
                 bRet = true;
-                _rState = ( ( pItem->GetButtonFlags() & SV_ITEMSTATE_UNCHECKED ) == 0 )
+                _rState = ( ( pItem->GetButtonFlags() & SvItemStateFlags::UNCHECKED ) == SvItemStateFlags::NONE )
                             ? TRISTATE_TRUE : TRISTATE_FALSE;
             }
         }
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 9505f8414bf6..bc58e2d42792 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -2006,7 +2006,7 @@ SvButtonState SvTreeListBox::GetCheckButtonState( SvTreeListEntry* pEntry ) cons
         SvLBoxButton* pItem = static_cast<SvLBoxButton*>(pEntry->GetFirstItem(SV_ITEM_ID_LBOXBUTTON));
         if(!pItem)
             return SV_BUTTON_TRISTATE;
-        sal_uInt16 nButtonFlags = pItem->GetButtonFlags();
+        SvItemStateFlags nButtonFlags = pItem->GetButtonFlags();
         eState = pCheckButtonData->ConvertToButtonState( nButtonFlags );
     }
     return eState;