diff options
| author | Noel Grandin <noel@peralex.com> | 2014-12-20 16:21:21 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-01-06 10:59:40 +0200 |
| commit | bae855e667993ea6cddd551452c6e2fa60bdc2f3 (patch) | |
| tree | 6ddf4f5d003ce53e9855cbe260851ef00ffa69ca /accessibility | |
| parent | 9b45157ab20c9b158a1ef8f4f364d7a46d9c276b (diff) | |
fdo#84938: replace BUTTONTYPE_ constants with 'enum class'
Change-Id: I54f9019297913683605b5aea9f79b3defc1dcc13
Diffstat (limited to 'accessibility')
| -rw-r--r-- | accessibility/source/standard/vclxaccessibletoolboxitem.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx index b3143a362a29..3d2fb8d929c8 100644 --- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx +++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx @@ -125,7 +125,7 @@ OUString VCLXAccessibleToolBoxItem::GetText( bool _bAsName ) { OUString sRet; // no text for separators and spaces - if ( m_pToolBox && m_nItemId > 0 && ( _bAsName || m_pToolBox->GetButtonType() != BUTTON_SYMBOL ) ) + if ( m_pToolBox && m_nItemId > 0 && ( _bAsName || m_pToolBox->GetButtonType() != ButtonType::SYMBOLONLY ) ) { sRet = m_pToolBox->GetItemText( m_nItemId ); if (sRet.isEmpty()) @@ -270,7 +270,7 @@ Any SAL_CALL VCLXAccessibleToolBoxItem::queryInterface( const Type& _rType ) thr { // #i33611# - toolbox buttons without text don't support XAccessibleText if ( _rType == cppu::UnoType<XAccessibleText>::get() - && ( !m_pToolBox || m_pToolBox->GetButtonType() == BUTTON_SYMBOL ) ) + && ( !m_pToolBox || m_pToolBox->GetButtonType() == ButtonType::SYMBOLONLY ) ) return Any(); ::com::sun::star::uno::Any aReturn = AccessibleTextHelper_BASE::queryInterface( _rType ); @@ -466,7 +466,7 @@ awt::Rectangle SAL_CALL VCLXAccessibleToolBoxItem::getCharacterBounds( sal_Int32 throw IndexOutOfBoundsException(); awt::Rectangle aBounds( 0, 0, 0, 0 ); - if ( m_pToolBox && m_pToolBox->GetButtonType() != BUTTON_SYMBOL ) // symbol buttons have no character bounds + if ( m_pToolBox && m_pToolBox->GetButtonType() != ButtonType::SYMBOLONLY ) // symbol buttons have no character bounds { Rectangle aCharRect = m_pToolBox->GetCharacterBounds( m_nItemId, nIndex ); Rectangle aItemRect = m_pToolBox->GetItemRect( m_nItemId ); @@ -482,7 +482,7 @@ sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getIndexAtPoint( const awt::Point& OExternalLockGuard aGuard( this ); sal_Int32 nIndex = -1; - if ( m_pToolBox && m_pToolBox->GetButtonType() != BUTTON_SYMBOL ) // symbol buttons have no character bounds + if ( m_pToolBox && m_pToolBox->GetButtonType() != ButtonType::SYMBOLONLY ) // symbol buttons have no character bounds { sal_uInt16 nItemId = 0; Rectangle aItemRect = m_pToolBox->GetItemRect( m_nItemId ); |