convert SvButtonState to scoped enum

Change-Id: I601f9e2fe33e85cf3f7dc52ee20d68202bd2b09d

3 files changed, 13 insertions, 13 deletions

diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx
index 787bfd0d1676..ccc86ca0b763 100644
--- a/svtools/source/contnr/svlbitm.cxx
+++ b/svtools/source/contnr/svlbitm.cxx
@@ -42,7 +42,7 @@ void SvLBoxButtonData::InitData( bool _bRadioBtn, const Control* pCtrl )
     aBmps.resize((int)SvBmp::STATICIMAGE+1);
 
     bDataOk = false;
-    eState = SV_BUTTON_UNCHECKED;
+    eState = SvButtonState::Unchecked;
     pImpl->bDefaultImages = true;
     pImpl->bShowRadioButton = _bRadioBtn;
 
@@ -113,13 +113,13 @@ SvButtonState SvLBoxButtonData::ConvertToButtonState( SvItemStateFlags nItemFlag
     switch( nItemFlags )
     {
         case SvItemStateFlags::UNCHECKED:
-            return SV_BUTTON_UNCHECKED;
+            return SvButtonState::Unchecked;
         case SvItemStateFlags::CHECKED:
-            return SV_BUTTON_CHECKED;
+            return SvButtonState::Checked;
         case SvItemStateFlags::TRISTATE:
-            return SV_BUTTON_TRISTATE;
+            return SvButtonState::Tristate;
         default:
-            return SV_BUTTON_UNCHECKED;
+            return SvButtonState::Unchecked;
     }
 }
 
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index cb35cfa3a212..f3a9d92b0553 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -543,7 +543,7 @@ void SvHeaderTabListBox::InitHeaderBar( HeaderBar* pHeaderBar )
 
 bool SvHeaderTabListBox::IsItemChecked( SvTreeListEntry* pEntry, sal_uInt16 nCol )
 {
-    SvButtonState eState = SV_BUTTON_UNCHECKED;
+    SvButtonState eState = SvButtonState::Unchecked;
     SvLBoxButton& rItem = static_cast<SvLBoxButton&>( pEntry->GetItem( nCol + 1 ) );
 
     if (rItem.GetType() == SV_ITEM_ID_LBOXBUTTON)
@@ -552,7 +552,7 @@ bool SvHeaderTabListBox::IsItemChecked( SvTreeListEntry* pEntry, sal_uInt16 nCol
         eState = SvLBoxButtonData::ConvertToButtonState( nButtonFlags );
     }
 
-    return ( eState == SV_BUTTON_CHECKED );
+    return ( eState == SvButtonState::Checked );
 }
 
 SvTreeListEntry* SvHeaderTabListBox::InsertEntryToColumn(
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index f0bec8a23d77..821e2e5ddc30 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -1921,15 +1921,15 @@ void SvTreeListBox::SetCheckButtonState( SvTreeListEntry* pEntry, SvButtonState
             return ;
         switch( eState )
         {
-            case SV_BUTTON_CHECKED:
+            case SvButtonState::Checked:
                 pItem->SetStateChecked();
                 break;
 
-            case SV_BUTTON_UNCHECKED:
+            case SvButtonState::Unchecked:
                 pItem->SetStateUnchecked();
                 break;
 
-            case SV_BUTTON_TRISTATE:
+            case SvButtonState::Tristate:
                 pItem->SetStateTristate();
                 break;
         }
@@ -1949,12 +1949,12 @@ void SvTreeListBox::SetCheckButtonInvisible( SvTreeListEntry* pEntry)
 
 SvButtonState SvTreeListBox::GetCheckButtonState( SvTreeListEntry* pEntry ) const
 {
-    SvButtonState eState = SV_BUTTON_UNCHECKED;
+    SvButtonState eState = SvButtonState::Unchecked;
     if( pEntry && ( nTreeFlags & SvTreeFlags::CHKBTN ) )
     {
         SvLBoxButton* pItem = static_cast<SvLBoxButton*>(pEntry->GetFirstItem(SV_ITEM_ID_LBOXBUTTON));
         if(!pItem)
-            return SV_BUTTON_TRISTATE;
+            return SvButtonState::Tristate;
         SvItemStateFlags nButtonFlags = pItem->GetButtonFlags();
         eState = SvLBoxButtonData::ConvertToButtonState( nButtonFlags );
     }
@@ -3821,7 +3821,7 @@ void SvTreeListBox::FillAccessibleEntryStateSet( SvTreeListEntry* pEntry, ::utl:
             rStateSet.AddState( (sal_Int16)AccessibleStateType::EXPANDED );
     }
 
-    if ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED )
+    if ( GetCheckButtonState( pEntry ) == SvButtonState::Checked )
         rStateSet.AddState( AccessibleStateType::CHECKED );
     if ( IsEntryVisible( pEntry ) )
         rStateSet.AddState( AccessibleStateType::VISIBLE );