summaryrefslogtreecommitdiff
path: root/accessibility
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-04-20 15:50:47 +0200
committerNoel Grandin <noel@peralex.com>2015-04-22 10:28:41 +0200
commit8d3eefd3b2b6dad051247fbd4a8097bb154617e1 (patch)
treed3f5b29d0006197893da0b8b94ab455a230c9bfb /accessibility
parent923de833be3131c36cd2b5952f3311f810aac01b (diff)
convert TREEFLAG_ constants to scoped enum
Change-Id: Ibf9eab757fbe94dbff3fd09472f3ca74fffd5094
Diffstat (limited to 'accessibility')
-rw-r--r--accessibility/source/extended/accessiblelistbox.cxx4
-rw-r--r--accessibility/source/extended/accessiblelistboxentry.cxx22
2 files changed, 13 insertions, 13 deletions
diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx
index b7af42d8ba09..c031bcf0283a 100644
--- a/accessibility/source/extended/accessiblelistbox.cxx
+++ b/accessibility/source/extended/accessiblelistbox.cxx
@@ -414,7 +414,7 @@ namespace accessibility
}
bool bHasButtons = (getListBox()->GetStyle() & WB_HASBUTTONS)!=0;
- if( !(getListBox()->GetTreeFlags() & TREEFLAG_CHKBTN) )
+ if( !(getListBox()->GetTreeFlags() & SvTreeFlags::CHKBTN) )
{
if( bHasButtons )
nCase = 1;
@@ -445,7 +445,7 @@ namespace accessibility
//o is: return AccessibleRole::TREE;
bool bHasButtons = (getListBox()->GetStyle() & WB_HASBUTTONS)!=0;
- if(!bHasButtons && (getListBox()->GetTreeFlags() & TREEFLAG_CHKBTN))
+ if(!bHasButtons && (getListBox()->GetTreeFlags() & SvTreeFlags::CHKBTN))
return AccessibleRole::LIST;
else
if (GetRoleType() == 0)
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx
index 991b165af3d7..39e4cf2e7f53 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -393,7 +393,7 @@ namespace accessibility
}
bool bHasButtons = (getListBox()->GetStyle() & WB_HASBUTTONS)!=0;
- if( !(getListBox()->GetTreeFlags() & TREEFLAG_CHKBTN) )
+ if( !(getListBox()->GetTreeFlags() & SvTreeFlags::CHKBTN) )
{
if( bHasButtons )
nCase = 1;
@@ -422,8 +422,8 @@ namespace accessibility
else if( nType == TREEBOX_ALLITEM_ACCROLE_TYPE_LIST)
return AccessibleRole::LIST_ITEM;
- sal_uInt16 treeFlag = pBox->GetTreeFlags();
- if(treeFlag & TREEFLAG_CHKBTN )
+ SvTreeFlags treeFlag = pBox->GetTreeFlags();
+ if(treeFlag & SvTreeFlags::CHKBTN )
{
SvTreeListEntry* pEntry = pBox->GetEntryFromPath( m_aEntryPath );
SvButtonState eState = pBox->GetCheckButtonState( pEntry );
@@ -757,9 +757,9 @@ namespace accessibility
// three actions supported
SvTreeListBox* pBox = getListBox();
- sal_uInt16 treeFlag = pBox->GetTreeFlags();
+ SvTreeFlags treeFlag = pBox->GetTreeFlags();
bool bHasButtons = (getListBox()->GetStyle() & WB_HASBUTTONS)!=0;
- if( (treeFlag & TREEFLAG_CHKBTN) && !bHasButtons)
+ if( (treeFlag & SvTreeFlags::CHKBTN) && !bHasButtons)
{
sal_Int16 role = getAccessibleRole();
if ( role == AccessibleRole::CHECK_BOX )
@@ -781,8 +781,8 @@ namespace accessibility
checkActionIndex_Impl( nIndex );
EnsureIsAlive();
- sal_uInt16 treeFlag = getListBox()->GetTreeFlags();
- if( nIndex == 0 && (treeFlag & TREEFLAG_CHKBTN) )
+ SvTreeFlags treeFlag = getListBox()->GetTreeFlags();
+ if( nIndex == 0 && (treeFlag & SvTreeFlags::CHKBTN) )
{
if(getAccessibleRole() == AccessibleRole::CHECK_BOX)
{
@@ -794,7 +794,7 @@ namespace accessibility
getListBox()->SetCheckButtonState(pEntry, SV_BUTTON_CHECKED);
}
}
- else if( (nIndex == 1 && (treeFlag & TREEFLAG_CHKBTN) ) || (nIndex == 0) )
+ else if( (nIndex == 1 && (treeFlag & SvTreeFlags::CHKBTN) ) || (nIndex == 0) )
{
SvTreeListEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
if ( pEntry )
@@ -823,8 +823,8 @@ namespace accessibility
// sal_Bool bHasButtons = (getListBox()->GetStyle() & WB_HASBUTTONS)!=0;
SvTreeListEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
SvButtonState state = getListBox()->GetCheckButtonState( pEntry );
- sal_uInt16 treeFlag = getListBox()->GetTreeFlags();
- if(nIndex == 0 && (treeFlag & TREEFLAG_CHKBTN))
+ SvTreeFlags treeFlag = getListBox()->GetTreeFlags();
+ if(nIndex == 0 && (treeFlag & SvTreeFlags::CHKBTN))
{
if(getAccessibleRole() == AccessibleRole::CHECK_BOX)
{
@@ -838,7 +838,7 @@ namespace accessibility
//Sometimes, a List or Tree may have both checkbox and label at the same time
return OUString();
}
- }else if( (nIndex == 1 && (treeFlag & TREEFLAG_CHKBTN)) || nIndex == 0 )
+ }else if( (nIndex == 1 && (treeFlag & SvTreeFlags::CHKBTN)) || nIndex == 0 )
{
if( pEntry->HasChildren() || pEntry->HasChildrenOnDemand() )
return getListBox()->IsExpanded( pEntry ) ? \