diff options
| author | Noel Grandin <noel@peralex.com> | 2016-03-18 12:46:20 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-03-18 12:46:35 +0200 |
| commit | c91b103930f4f441ab333d6f3026d6c19d4b4d0f (patch) | |
| tree | b3bb0edd19ebf20bdca3c9b3605cec986d2e650f /accessibility | |
| parent | 1c73135493e844c04446f58e7001920381787317 (diff) | |
convert SvButtonState to scoped enum
Change-Id: I601f9e2fe33e85cf3f7dc52ee20d68202bd2b09d
Diffstat (limited to 'accessibility')
| -rw-r--r-- | accessibility/source/extended/accessiblelistbox.cxx | 2 | ||||
| -rw-r--r-- | accessibility/source/extended/accessiblelistboxentry.cxx | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx index 019c6b5fe23c..63c2b5d45efa 100644 --- a/accessibility/source/extended/accessiblelistbox.cxx +++ b/accessibility/source/extended/accessiblelistbox.cxx @@ -87,7 +87,7 @@ namespace accessibility uno::Any aValue; aValue <<= AccessibleStateType::CHECKED; - if ( getListBox()->GetCheckButtonState( pCurOpEntry->GetSvLBoxEntry() ) == SV_BUTTON_CHECKED ) + if ( getListBox()->GetCheckButtonState( pCurOpEntry->GetSvLBoxEntry() ) == SvButtonState::Checked ) { pCurOpEntry->NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, uno::Any(), aValue ); } diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx index 97d09a289901..7efc72ed9ec8 100644 --- a/accessibility/source/extended/accessiblelistboxentry.cxx +++ b/accessibility/source/extended/accessiblelistboxentry.cxx @@ -428,10 +428,10 @@ namespace accessibility SvButtonState eState = pBox->GetCheckButtonState( pEntry ); switch( eState ) { - case SV_BUTTON_CHECKED: - case SV_BUTTON_UNCHECKED: + case SvButtonState::Checked: + case SvButtonState::Unchecked: return AccessibleRole::CHECK_BOX; - case SV_BUTTON_TRISTATE: + case SvButtonState::Tristate: default: return AccessibleRole::LABEL; } @@ -786,10 +786,10 @@ namespace accessibility { SvTreeListEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath ); SvButtonState state = getListBox()->GetCheckButtonState( pEntry ); - if ( state == SV_BUTTON_CHECKED ) - getListBox()->SetCheckButtonState(pEntry, SV_BUTTON_UNCHECKED); - else if (state == SV_BUTTON_UNCHECKED) - getListBox()->SetCheckButtonState(pEntry, SV_BUTTON_CHECKED); + if ( state == SvButtonState::Checked ) + getListBox()->SetCheckButtonState(pEntry, SvButtonState::Unchecked); + else if (state == SvButtonState::Unchecked) + getListBox()->SetCheckButtonState(pEntry, SvButtonState::Checked); } } else if( (nIndex == 1 && (treeFlag & SvTreeFlags::CHKBTN) ) || (nIndex == 0) ) @@ -826,9 +826,9 @@ namespace accessibility { if(getAccessibleRole() == AccessibleRole::CHECK_BOX) { - if ( state == SV_BUTTON_CHECKED ) + if ( state == SvButtonState::Checked ) return OUString(sActionDesc2); - else if (state == SV_BUTTON_UNCHECKED) + else if (state == SvButtonState::Unchecked) return OUString(sActionDesc1); } else |