diff options
Diffstat (limited to 'accessibility/source/standard')
22 files changed, 173 insertions, 173 deletions
diff --git a/accessibility/source/standard/accessiblemenubasecomponent.cxx b/accessibility/source/standard/accessiblemenubasecomponent.cxx index 4fff31c5f5c4..945758e27572 100644 --- a/accessibility/source/standard/accessiblemenubasecomponent.cxx +++ b/accessibility/source/standard/accessiblemenubasecomponent.cxx @@ -47,11 +47,11 @@ using namespace ::comphelper; OAccessibleMenuBaseComponent::OAccessibleMenuBaseComponent( Menu* pMenu ) :AccessibleExtendedComponentHelper_BASE( new VCLExternalSolarLock() ) ,m_pMenu( pMenu ) - ,m_bEnabled( sal_False ) - ,m_bFocused( sal_False ) - ,m_bVisible( sal_False ) - ,m_bSelected( sal_False ) - ,m_bChecked( sal_False ) + ,m_bEnabled( false ) + ,m_bFocused( false ) + ,m_bVisible( false ) + ,m_bSelected( false ) + ,m_bChecked( false ) { m_pExternalLock = static_cast< VCLExternalSolarLock* >( getExternalLock() ); @@ -75,37 +75,37 @@ OAccessibleMenuBaseComponent::~OAccessibleMenuBaseComponent() -sal_Bool OAccessibleMenuBaseComponent::IsEnabled() +bool OAccessibleMenuBaseComponent::IsEnabled() { - return sal_False; + return false; } -sal_Bool OAccessibleMenuBaseComponent::IsFocused() +bool OAccessibleMenuBaseComponent::IsFocused() { - return sal_False; + return false; } -sal_Bool OAccessibleMenuBaseComponent::IsVisible() +bool OAccessibleMenuBaseComponent::IsVisible() { - return sal_False; + return false; } -sal_Bool OAccessibleMenuBaseComponent::IsSelected() +bool OAccessibleMenuBaseComponent::IsSelected() { - return sal_False; + return false; } -sal_Bool OAccessibleMenuBaseComponent::IsChecked() +bool OAccessibleMenuBaseComponent::IsChecked() { - return sal_False; + return false; } @@ -121,7 +121,7 @@ void OAccessibleMenuBaseComponent::SetStates() -void OAccessibleMenuBaseComponent::SetEnabled( sal_Bool bEnabled ) +void OAccessibleMenuBaseComponent::SetEnabled( bool bEnabled ) { if ( m_bEnabled != bEnabled ) { @@ -149,7 +149,7 @@ void OAccessibleMenuBaseComponent::SetEnabled( sal_Bool bEnabled ) -void OAccessibleMenuBaseComponent::SetFocused( sal_Bool bFocused ) +void OAccessibleMenuBaseComponent::SetFocused( bool bFocused ) { if ( m_bFocused != bFocused ) { @@ -165,7 +165,7 @@ void OAccessibleMenuBaseComponent::SetFocused( sal_Bool bFocused ) -void OAccessibleMenuBaseComponent::SetVisible( sal_Bool bVisible ) +void OAccessibleMenuBaseComponent::SetVisible( bool bVisible ) { if ( m_bVisible != bVisible ) { @@ -181,7 +181,7 @@ void OAccessibleMenuBaseComponent::SetVisible( sal_Bool bVisible ) -void OAccessibleMenuBaseComponent::SetSelected( sal_Bool bSelected ) +void OAccessibleMenuBaseComponent::SetSelected( bool bSelected ) { if ( m_bSelected != bSelected ) { @@ -197,7 +197,7 @@ void OAccessibleMenuBaseComponent::SetSelected( sal_Bool bSelected ) -void OAccessibleMenuBaseComponent::SetChecked( sal_Bool bChecked ) +void OAccessibleMenuBaseComponent::SetChecked( bool bChecked ) { if ( m_bChecked != bChecked ) { @@ -213,7 +213,7 @@ void OAccessibleMenuBaseComponent::SetChecked( sal_Bool bChecked ) -void OAccessibleMenuBaseComponent::UpdateEnabled( sal_Int32 i, sal_Bool bEnabled ) +void OAccessibleMenuBaseComponent::UpdateEnabled( sal_Int32 i, bool bEnabled ) { if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() ) { @@ -229,7 +229,7 @@ void OAccessibleMenuBaseComponent::UpdateEnabled( sal_Int32 i, sal_Bool bEnabled -void OAccessibleMenuBaseComponent::UpdateFocused( sal_Int32 i, sal_Bool bFocused ) +void OAccessibleMenuBaseComponent::UpdateFocused( sal_Int32 i, bool bFocused ) { if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() ) { @@ -262,7 +262,7 @@ void OAccessibleMenuBaseComponent::UpdateVisible() -void OAccessibleMenuBaseComponent::UpdateSelected( sal_Int32 i, sal_Bool bSelected ) +void OAccessibleMenuBaseComponent::UpdateSelected( sal_Int32 i, bool bSelected ) { NotifyAccessibleEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any() ); @@ -280,7 +280,7 @@ void OAccessibleMenuBaseComponent::UpdateSelected( sal_Int32 i, sal_Bool bSelect -void OAccessibleMenuBaseComponent::UpdateChecked( sal_Int32 i, sal_Bool bChecked ) +void OAccessibleMenuBaseComponent::UpdateChecked( sal_Int32 i, bool bChecked ) { if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() ) { @@ -478,16 +478,16 @@ void OAccessibleMenuBaseComponent::RemoveChild( sal_Int32 i ) -sal_Bool OAccessibleMenuBaseComponent::IsHighlighted() +bool OAccessibleMenuBaseComponent::IsHighlighted() { - return sal_False; + return false; } -sal_Bool OAccessibleMenuBaseComponent::IsChildHighlighted() +bool OAccessibleMenuBaseComponent::IsChildHighlighted() { - sal_Bool bChildHighlighted = sal_False; + bool bChildHighlighted = false; for ( sal_uInt32 i = 0; i < m_aAccessibleChildren.size(); ++i ) { @@ -497,7 +497,7 @@ sal_Bool OAccessibleMenuBaseComponent::IsChildHighlighted() OAccessibleMenuBaseComponent* pComp = static_cast< OAccessibleMenuBaseComponent* >( xChild.get() ); if ( pComp && pComp->IsHighlighted() ) { - bChildHighlighted = sal_True; + bChildHighlighted = true; break; } } @@ -529,12 +529,12 @@ void OAccessibleMenuBaseComponent::DeSelectAll() -sal_Bool OAccessibleMenuBaseComponent::IsChildSelected( sal_Int32 i ) +bool OAccessibleMenuBaseComponent::IsChildSelected( sal_Int32 i ) { - sal_Bool bSelected = sal_False; + bool bSelected = false; if ( m_pMenu && m_pMenu->IsHighlighted( (sal_uInt16)i ) ) - bSelected = sal_True; + bSelected = true; return bSelected; } @@ -559,9 +559,9 @@ void OAccessibleMenuBaseComponent::Click() -sal_Bool OAccessibleMenuBaseComponent::IsPopupMenuOpen() +bool OAccessibleMenuBaseComponent::IsPopupMenuOpen() { - return sal_False; + return false; } @@ -593,15 +593,15 @@ void OAccessibleMenuBaseComponent::ProcessMenuEvent( const VclMenuEvent& rVclMen break; case VCLEVENT_MENU_HIGHLIGHT: { - SetFocused( sal_False ); - UpdateFocused( nItemPos, sal_True ); - UpdateSelected( nItemPos, sal_True ); + SetFocused( false ); + UpdateFocused( nItemPos, true ); + UpdateSelected( nItemPos, true ); } break; case VCLEVENT_MENU_DEHIGHLIGHT: { - UpdateFocused( nItemPos, sal_False ); - UpdateSelected( nItemPos, sal_False ); + UpdateFocused( nItemPos, false ); + UpdateSelected( nItemPos, false ); } break; case VCLEVENT_MENU_SUBMENUACTIVATE: @@ -610,17 +610,17 @@ void OAccessibleMenuBaseComponent::ProcessMenuEvent( const VclMenuEvent& rVclMen break; case VCLEVENT_MENU_SUBMENUDEACTIVATE: { - UpdateFocused( nItemPos, sal_True ); + UpdateFocused( nItemPos, true ); } break; case VCLEVENT_MENU_ENABLE: { - UpdateEnabled( nItemPos, sal_True ); + UpdateEnabled( nItemPos, true ); } break; case VCLEVENT_MENU_DISABLE: { - UpdateEnabled( nItemPos, sal_False ); + UpdateEnabled( nItemPos, false ); } break; case VCLEVENT_MENU_SUBMENUCHANGED: @@ -652,12 +652,12 @@ void OAccessibleMenuBaseComponent::ProcessMenuEvent( const VclMenuEvent& rVclMen break; case VCLEVENT_MENU_ITEMCHECKED: { - UpdateChecked( nItemPos, sal_True ); + UpdateChecked( nItemPos, true ); } break; case VCLEVENT_MENU_ITEMUNCHECKED: { - UpdateChecked( nItemPos, sal_False ); + UpdateChecked( nItemPos, false ); } break; case VCLEVENT_OBJECT_DYING: @@ -768,9 +768,9 @@ Reference< XAccessibleStateSet > OAccessibleMenuBaseComponent::getAccessibleStat -sal_Bool OAccessibleMenuBaseComponent::IsMenuHideDisabledEntries() +bool OAccessibleMenuBaseComponent::IsMenuHideDisabledEntries() { - return sal_False; + return false; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/accessiblemenucomponent.cxx b/accessibility/source/standard/accessiblemenucomponent.cxx index 43b388c73162..0824882917ec 100644 --- a/accessibility/source/standard/accessiblemenucomponent.cxx +++ b/accessibility/source/standard/accessiblemenucomponent.cxx @@ -60,16 +60,16 @@ OAccessibleMenuComponent::~OAccessibleMenuComponent() -sal_Bool OAccessibleMenuComponent::IsEnabled() +bool OAccessibleMenuComponent::IsEnabled() { - return sal_True; + return true; } -sal_Bool OAccessibleMenuComponent::IsVisible() +bool OAccessibleMenuComponent::IsVisible() { - sal_Bool bVisible = sal_False; + bool bVisible = false; if ( m_pMenu ) bVisible = m_pMenu->IsMenuVisible(); diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx b/accessibility/source/standard/accessiblemenuitemcomponent.cxx index 19cbe7aaf778..79fbcbc43aba 100644 --- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx +++ b/accessibility/source/standard/accessiblemenuitemcomponent.cxx @@ -72,11 +72,11 @@ OAccessibleMenuItemComponent::~OAccessibleMenuItemComponent() -sal_Bool OAccessibleMenuItemComponent::IsEnabled() +bool OAccessibleMenuItemComponent::IsEnabled() { OExternalLockGuard aGuard( this ); - sal_Bool bEnabled = sal_False; + bool bEnabled = false; if ( m_pParent ) bEnabled = m_pParent->IsItemEnabled( m_pParent->GetItemId( m_nItemPos ) ); @@ -85,9 +85,9 @@ sal_Bool OAccessibleMenuItemComponent::IsEnabled() -sal_Bool OAccessibleMenuItemComponent::IsVisible() +bool OAccessibleMenuItemComponent::IsVisible() { - sal_Bool bVisible = sal_False; + bool bVisible = false; if ( m_pParent ) bVisible = m_pParent->IsItemPosVisible( m_nItemPos ); @@ -234,7 +234,7 @@ OUString OAccessibleMenuItemComponent::GetItemText() void OAccessibleMenuItemComponent::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { - sal_Bool bEnabled = IsEnabled(); + bool bEnabled = IsEnabled(); if ( bEnabled ) { rStateSet.AddState( AccessibleStateType::ENABLED ); @@ -493,16 +493,16 @@ OUString OAccessibleMenuItemComponent::getToolTipText( ) throw (RuntimeExceptio -sal_Bool OAccessibleMenuItemComponent::IsMenuHideDisabledEntries() +bool OAccessibleMenuItemComponent::IsMenuHideDisabledEntries() { if (m_pParent ) { if( m_pParent->GetMenuFlags() & MENU_FLAG_HIDEDISABLEDENTRIES) { - return sal_True; + return true; } } - return sal_False; + return false; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx index 898a8c9c7c91..a1281db2489c 100644 --- a/accessibility/source/standard/vclxaccessiblebox.cxx +++ b/accessibility/source/standard/vclxaccessiblebox.cxx @@ -416,7 +416,7 @@ sal_Int32 SAL_CALL VCLXAccessibleBox::getAccessibleActionCount (void) sal_Bool SAL_CALL VCLXAccessibleBox::doAccessibleAction (sal_Int32 nIndex) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { - sal_Bool bNotify = sal_False; + bool bNotify = false; { SolarMutexGuard aSolarGuard; @@ -435,7 +435,7 @@ sal_Bool SAL_CALL VCLXAccessibleBox::doAccessibleAction (sal_Int32 nIndex) if (pComboBox != NULL) { pComboBox->ToggleDropDown(); - bNotify = sal_True; + bNotify = true; } } else if (m_aBoxType == LISTBOX) @@ -444,7 +444,7 @@ sal_Bool SAL_CALL VCLXAccessibleBox::doAccessibleAction (sal_Int32 nIndex) if (pListBox != NULL) { pListBox->ToggleDropDown(); - bNotify = sal_True; + bNotify = true; } } } @@ -534,7 +534,7 @@ sal_Bool VCLXAccessibleBox::setCurrentValue( const Any& aNumber ) ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); ::rtl::OUString fValue; - sal_Bool bValid = (aNumber >>= fValue); + bool bValid = (aNumber >>= fValue); if( bValid ) { diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx b/accessibility/source/standard/vclxaccessiblebutton.cxx index 63267f9f70a7..ba057d5cddcc 100644 --- a/accessibility/source/standard/vclxaccessiblebutton.cxx +++ b/accessibility/source/standard/vclxaccessiblebutton.cxx @@ -277,7 +277,7 @@ sal_Bool VCLXAccessibleButton::setCurrentValue( const Any& aNumber ) throw (Runt { OExternalLockGuard aGuard( this ); - sal_Bool bReturn = sal_False; + bool bReturn = false; PushButton* pButton = (PushButton*) GetWindow(); if ( pButton ) @@ -290,8 +290,8 @@ sal_Bool VCLXAccessibleButton::setCurrentValue( const Any& aNumber ) throw (Runt else if ( nValue > 1 ) nValue = 1; - pButton->SetPressed( (sal_Bool) nValue ); - bReturn = sal_True; + pButton->SetPressed( nValue == 1 ); + bReturn = true; } return bReturn; diff --git a/accessibility/source/standard/vclxaccessiblecheckbox.cxx b/accessibility/source/standard/vclxaccessiblecheckbox.cxx index 6780d6810361..2ce86d579b22 100644 --- a/accessibility/source/standard/vclxaccessiblecheckbox.cxx +++ b/accessibility/source/standard/vclxaccessiblecheckbox.cxx @@ -298,7 +298,7 @@ sal_Bool VCLXAccessibleCheckBox::setCurrentValue( const Any& aNumber ) throw (Ru { OExternalLockGuard aGuard( this ); - sal_Bool bReturn = sal_False; + bool bReturn = false; VCLXCheckBox* pVCLXCheckBox = static_cast< VCLXCheckBox* >( GetVCLXWindow() ); if ( pVCLXCheckBox ) @@ -314,7 +314,7 @@ sal_Bool VCLXAccessibleCheckBox::setCurrentValue( const Any& aNumber ) throw (Ru nValue = nValueMax; pVCLXCheckBox->setState( (sal_Int16) nValue ); - bReturn = sal_True; + bReturn = true; } return bReturn; diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx index b51f09eee22d..9d74931638af 100644 --- a/accessibility/source/standard/vclxaccessibleedit.cxx +++ b/accessibility/source/standard/vclxaccessibleedit.cxx @@ -255,12 +255,12 @@ sal_Bool VCLXAccessibleEdit::doAccessibleAction ( sal_Int32 nIndex ) throw (Inde if ( nIndex < 0 || nIndex >= getAccessibleActionCount() ) throw IndexOutOfBoundsException(); - sal_Bool bDoAction = sal_False; + bool bDoAction = false; Window* pWindow = GetWindow(); if ( pWindow ) { pWindow->GrabFocus(); - bDoAction = sal_True; + bDoAction = true; } return bDoAction; @@ -419,7 +419,7 @@ sal_Bool VCLXAccessibleEdit::setSelection( sal_Int32 nStartIndex, sal_Int32 nEnd { OExternalLockGuard aGuard( this ); - sal_Bool bReturn = sal_False; + bool bReturn = false; OUString sText( implGetText() ); if ( !implIsValidRange( nStartIndex, nEndIndex, sText.getLength() ) ) @@ -430,7 +430,7 @@ sal_Bool VCLXAccessibleEdit::setSelection( sal_Int32 nStartIndex, sal_Int32 nEnd if ( pVCLXEdit && pEdit && pEdit->IsEnabled() ) { pVCLXEdit->setSelection( awt::Selection( nStartIndex, nEndIndex ) ); - bReturn = sal_True; + bReturn = true; } return bReturn; @@ -507,7 +507,7 @@ sal_Bool VCLXAccessibleEdit::pasteText( sal_Int32 nIndex ) throw (IndexOutOfBoun { OExternalLockGuard aGuard( this ); - sal_Bool bReturn = sal_False; + bool bReturn = false; if ( GetWindow() ) { @@ -559,7 +559,7 @@ sal_Bool VCLXAccessibleEdit::replaceText( sal_Int32 nStartIndex, sal_Int32 nEndI { OExternalLockGuard aGuard( this ); - sal_Bool bReturn = sal_False; + bool bReturn = false; OUString sText( implGetText() ); if ( !implIsValidRange( nStartIndex, nEndIndex, sText.getLength() ) ) @@ -574,7 +574,7 @@ sal_Bool VCLXAccessibleEdit::replaceText( sal_Int32 nStartIndex, sal_Int32 nEndI pVCLXEdit->setText( sText.replaceAt( nMinIndex, nMaxIndex - nMinIndex, sReplacement ) ); sal_Int32 nIndex = nMinIndex + sReplacement.getLength(); setSelection( nIndex, nIndex ); - bReturn = sal_True; + bReturn = true; } return bReturn; @@ -598,7 +598,7 @@ sal_Bool VCLXAccessibleEdit::setText( const OUString& sText ) throw (RuntimeExce { OExternalLockGuard aGuard( this ); - sal_Bool bSuccess = sal_False; + bool bSuccess = false; try { bSuccess = replaceText( 0, implGetText().getLength(), sText ); diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx index a998032f6e31..6d3ba7e55a0d 100644 --- a/accessibility/source/standard/vclxaccessiblelist.cxx +++ b/accessibility/source/standard/vclxaccessiblelist.cxx @@ -41,7 +41,7 @@ using namespace ::accessibility; namespace { - void checkSelection_Impl( sal_Int32 _nIndex, const IComboListBoxHelper& _rListBox, sal_Bool bSelected ) + void checkSelection_Impl( sal_Int32 _nIndex, const IComboListBoxHelper& _rListBox, bool bSelected ) throw (::com::sun::star::lang::IndexOutOfBoundsException) { sal_Int32 nCount = bSelected ? (sal_Int32)_rListBox.GetSelectEntryCount() @@ -155,7 +155,7 @@ void VCLXAccessibleList::FillAccessibleStateSet (utl::AccessibleStateSetHelper& } } -void VCLXAccessibleList::notifyVisibleStates(sal_Bool _bSetNew ) +void VCLXAccessibleList::notifyVisibleStates(bool _bSetNew ) { m_bVisible = _bSetNew ? true : false; Any aOldValue, aNewValue; @@ -178,7 +178,7 @@ void VCLXAccessibleList::notifyVisibleStates(sal_Bool _bSetNew ) if ( m_pListBoxHelper ) nTopEntry = m_pListBoxHelper->GetTopEntry(); sal_uInt16 nPos = (sal_uInt16)(aIter - m_aAccessibleChildren.begin()); - sal_Bool bVisible = ( nPos>=nTopEntry && nPos<( nTopEntry + m_nVisibleLineCount ) ); + bool bVisible = ( nPos>=nTopEntry && nPos<( nTopEntry + m_nVisibleLineCount ) ); pItem->SetVisible( m_bVisible && bVisible ); } @@ -225,7 +225,7 @@ void VCLXAccessibleList::UpdateSelection_Impl_Acc(bool b_IsDropDownList) { VCLXAccessibleListItem* pItem = static_cast< VCLXAccessibleListItem* >( xHold.get() ); // Retrieve the item's index from the list entry. - sal_Bool bNowSelected = m_pListBoxHelper->IsEntryPosSelected (i); + bool bNowSelected = m_pListBoxHelper->IsEntryPosSelected (i); if (bNowSelected) m_nCurSelectedPos = i; @@ -402,10 +402,10 @@ void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEve switch ( rVclWindowEvent.GetId() ) { case VCLEVENT_DROPDOWN_OPEN: - notifyVisibleStates(sal_True); + notifyVisibleStates(true); break; case VCLEVENT_DROPDOWN_CLOSE: - notifyVisibleStates(sal_False); + notifyVisibleStates(false); break; case VCLEVENT_LISTBOX_SCROLLED: case VCLEVENT_COMBOBOX_SCROLLED: @@ -440,7 +440,7 @@ void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEve { VCLXAccessibleComponent::ProcessWindowEvent (rVclWindowEvent); // Added by IBM Symphony Acc team to handle the list item focus when List control get focus - sal_Bool b_IsDropDownList = sal_True; + bool b_IsDropDownList = true; if (m_pListBoxHelper) b_IsDropDownList = ((m_pListBoxHelper->GetStyle() & WB_DROPDOWN ) == WB_DROPDOWN); if ( m_aBoxType == LISTBOX && !b_IsDropDownList ) @@ -648,12 +648,12 @@ sal_Int16 SAL_CALL VCLXAccessibleList::getAccessibleRole (void) //===== XAccessibleComponent ================================================ -sal_Bool SAL_CALL VCLXAccessibleList::contains( const awt::Point& rPoint ) throw (RuntimeException) +bool SAL_CALL VCLXAccessibleList::contains( const awt::Point& rPoint ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - sal_Bool bInside = sal_False; + bool bInside = false; Window* pListBox = GetWindow(); if ( pListBox ) @@ -748,7 +748,7 @@ void VCLXAccessibleList::UpdateEntryRange_Impl() sal_Int32 nEnd = std::max( m_nLastTopEntry + m_nVisibleLineCount, nTop + m_nVisibleLineCount ); for (sal_uInt16 i = static_cast<sal_uInt16>(nBegin); (i <= static_cast<sal_uInt16>(nEnd)); ++i) { - sal_Bool bVisible = ( i >= nTop && i < ( nTop + m_nVisibleLineCount ) ); + bool bVisible = ( i >= nTop && i < ( nTop + m_nVisibleLineCount ) ); Reference< XAccessible > xHold; if ( i < m_aAccessibleChildren.size() ) xHold = m_aAccessibleChildren[i]; @@ -763,10 +763,10 @@ void VCLXAccessibleList::UpdateEntryRange_Impl() m_nLastTopEntry = nTop; } -sal_Bool VCLXAccessibleList::checkEntrySelected(sal_uInt16 _nPos,Any& _rNewValue,Reference< XAccessible >& _rxNewAcc) +bool VCLXAccessibleList::checkEntrySelected(sal_uInt16 _nPos,Any& _rNewValue,Reference< XAccessible >& _rxNewAcc) { OSL_ENSURE(m_pListBoxHelper,"Helper is not valid!"); - sal_Bool bNowSelected = sal_False; + bool bNowSelected = false; if ( m_pListBoxHelper ) { bNowSelected = m_pListBoxHelper->IsEntryPosSelected (_nPos); @@ -801,7 +801,7 @@ void VCLXAccessibleList::UpdateSelection_Impl(sal_uInt16) { VCLXAccessibleListItem* pItem = static_cast< VCLXAccessibleListItem* >( xHold.get() ); // Retrieve the item's index from the list entry. - sal_Bool bNowSelected = m_pListBoxHelper->IsEntryPosSelected (i); + bool bNowSelected = m_pListBoxHelper->IsEntryPosSelected (i); if (bNowSelected) m_nCurSelectedPos = i; @@ -851,7 +851,7 @@ void VCLXAccessibleList::UpdateSelection_Impl(sal_uInt16) void SAL_CALL VCLXAccessibleList::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { - sal_Bool bNotify = sal_False; + bool bNotify = false; { SolarMutexGuard aSolarGuard; @@ -859,14 +859,14 @@ void SAL_CALL VCLXAccessibleList::selectAccessibleChild( sal_Int32 nChildIndex ) if ( m_pListBoxHelper ) { - checkSelection_Impl(nChildIndex,*m_pListBoxHelper,sal_False); + checkSelection_Impl(nChildIndex,*m_pListBoxHelper,false); m_pListBoxHelper->SelectEntryPos( (sal_uInt16)nChildIndex, true ); // call the select handler, don't handle events in this time m_bDisableProcessEvent = true; m_pListBoxHelper->Select(); m_bDisableProcessEvent = false; - bNotify = sal_True; + bNotify = true; } } @@ -879,10 +879,10 @@ sal_Bool SAL_CALL VCLXAccessibleList::isAccessibleChildSelected( sal_Int32 nChil SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - sal_Bool bRet = sal_False; + bool bRet = false; if ( m_pListBoxHelper ) { - checkSelection_Impl(nChildIndex,*m_pListBoxHelper,sal_False); + checkSelection_Impl(nChildIndex,*m_pListBoxHelper,false); bRet = m_pListBoxHelper->IsEntryPosSelected( (sal_uInt16)nChildIndex ); } @@ -891,7 +891,7 @@ sal_Bool SAL_CALL VCLXAccessibleList::isAccessibleChildSelected( sal_Int32 nChil void SAL_CALL VCLXAccessibleList::clearAccessibleSelection( ) throw (RuntimeException, std::exception) { - sal_Bool bNotify = sal_False; + bool bNotify = false; { SolarMutexGuard aSolarGuard; @@ -900,7 +900,7 @@ void SAL_CALL VCLXAccessibleList::clearAccessibleSelection( ) throw (RuntimeExc if ( m_pListBoxHelper ) { m_pListBoxHelper->SetNoSelection(); - bNotify = sal_True; + bNotify = true; } } @@ -910,7 +910,7 @@ void SAL_CALL VCLXAccessibleList::clearAccessibleSelection( ) throw (RuntimeExc void SAL_CALL VCLXAccessibleList::selectAllAccessibleChildren( ) throw (RuntimeException, std::exception) { - sal_Bool bNotify = sal_False; + bool bNotify = false; { SolarMutexGuard aSolarGuard; @@ -925,7 +925,7 @@ void SAL_CALL VCLXAccessibleList::selectAllAccessibleChildren( ) throw (Runtime m_bDisableProcessEvent = true; m_pListBoxHelper->Select(); m_bDisableProcessEvent = false; - bNotify = sal_True; + bNotify = true; } } @@ -951,7 +951,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleList::getSelectedAccessibleChild if ( m_pListBoxHelper ) { - checkSelection_Impl(nSelectedChildIndex,*m_pListBoxHelper,sal_True); + checkSelection_Impl(nSelectedChildIndex,*m_pListBoxHelper,true); return getAccessibleChild( (sal_Int32)m_pListBoxHelper->GetSelectEntryPos( (sal_uInt16)nSelectedChildIndex ) ); } @@ -960,7 +960,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleList::getSelectedAccessibleChild void SAL_CALL VCLXAccessibleList::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { - sal_Bool bNotify = sal_False; + bool bNotify = false; { SolarMutexGuard aSolarGuard; @@ -968,14 +968,14 @@ void SAL_CALL VCLXAccessibleList::deselectAccessibleChild( sal_Int32 nSelectedCh if ( m_pListBoxHelper ) { - checkSelection_Impl(nSelectedChildIndex,*m_pListBoxHelper,sal_False); + checkSelection_Impl(nSelectedChildIndex,*m_pListBoxHelper,false); m_pListBoxHelper->SelectEntryPos( (sal_uInt16)nSelectedChildIndex, false ); // call the select handler, don't handle events in this time m_bDisableProcessEvent = true; m_pListBoxHelper->Select(); m_bDisableProcessEvent = false; - bNotify = sal_True; + bNotify = true; } } @@ -1042,7 +1042,7 @@ awt::Point VCLXAccessibleList::getLocationOnScreen( ) throw (uno::RuntimeExcept -sal_Bool VCLXAccessibleList::IsInDropDown() +bool VCLXAccessibleList::IsInDropDown() { return m_pListBoxHelper->IsInDropDown(); } diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx index 9396b826bd2e..4a6606a4866b 100644 --- a/accessibility/source/standard/vclxaccessiblelistitem.cxx +++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx @@ -66,8 +66,8 @@ VCLXAccessibleListItem::VCLXAccessibleListItem( ::accessibility::IComboListBoxHe VCLXAccessibleListItem_BASE ( m_aMutex ), m_nIndexInParent( _nIndexInParent ), - m_bSelected ( sal_False ), - m_bVisible ( sal_False ), + m_bSelected ( false ), + m_bVisible ( false ), m_nClientId ( 0 ), m_pListBoxHelper( _pListBoxHelper ), m_xParent ( _xParent ) @@ -84,7 +84,7 @@ VCLXAccessibleListItem::~VCLXAccessibleListItem() { } -void VCLXAccessibleListItem::SetSelected( sal_Bool _bSelected ) +void VCLXAccessibleListItem::SetSelected( bool _bSelected ) { if ( m_bSelected != _bSelected ) { @@ -99,7 +99,7 @@ void VCLXAccessibleListItem::SetSelected( sal_Bool _bSelected ) } } -void VCLXAccessibleListItem::SetVisible( sal_Bool _bVisible ) +void VCLXAccessibleListItem::SetVisible( bool _bVisible ) { if ( m_bVisible != _bVisible ) { @@ -326,7 +326,7 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::containsPoint( const awt::Point& _aPoi SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); - sal_Bool bInside = sal_False; + bool bInside = false; if ( m_pListBoxHelper ) { Rectangle aRect( m_pListBoxHelper->GetBoundingRectangle( (sal_uInt16)m_nIndexInParent ) ); @@ -568,7 +568,7 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::copyText( sal_Int32 nStartIndex, sal_I checkIndex_Impl( nStartIndex, m_sEntryText ); checkIndex_Impl( nEndIndex, m_sEntryText ); - sal_Bool bRet = sal_False; + bool bRet = false; if ( m_pListBoxHelper ) { Reference< datatransfer::clipboard::XClipboard > xClipboard = m_pListBoxHelper->GetClipboard(); @@ -584,7 +584,7 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::copyText( sal_Int32 nStartIndex, sal_I xFlushableClipboard->flushClipboard(); Application::AcquireSolarMutex( nRef ); - bRet = sal_True; + bRet = true; } } diff --git a/accessibility/source/standard/vclxaccessiblemenu.cxx b/accessibility/source/standard/vclxaccessiblemenu.cxx index 95d0a9550c24..80758f805a6e 100644 --- a/accessibility/source/standard/vclxaccessiblemenu.cxx +++ b/accessibility/source/standard/vclxaccessiblemenu.cxx @@ -47,27 +47,27 @@ VCLXAccessibleMenu::~VCLXAccessibleMenu() -sal_Bool VCLXAccessibleMenu::IsFocused() +bool VCLXAccessibleMenu::IsFocused() { - sal_Bool bFocused = sal_False; + bool bFocused = false; if ( IsHighlighted() && !IsChildHighlighted() ) - bFocused = sal_True; + bFocused = true; return bFocused; } -sal_Bool VCLXAccessibleMenu::IsPopupMenuOpen() +bool VCLXAccessibleMenu::IsPopupMenuOpen() { - sal_Bool bPopupMenuOpen = sal_False; + bool bPopupMenuOpen = false; if ( m_pParent ) { PopupMenu* pPopupMenu = m_pParent->GetPopupMenu( m_pParent->GetItemId( m_nItemPos ) ); if ( pPopupMenu && pPopupMenu->IsMenuVisible() ) - bPopupMenuOpen = sal_True; + bPopupMenuOpen = true; } return bPopupMenuOpen; diff --git a/accessibility/source/standard/vclxaccessiblemenubar.cxx b/accessibility/source/standard/vclxaccessiblemenubar.cxx index a72b60d9b5ec..2cb4cc4c353d 100644 --- a/accessibility/source/standard/vclxaccessiblemenubar.cxx +++ b/accessibility/source/standard/vclxaccessiblemenubar.cxx @@ -61,12 +61,12 @@ VCLXAccessibleMenuBar::~VCLXAccessibleMenuBar() -sal_Bool VCLXAccessibleMenuBar::IsFocused() +bool VCLXAccessibleMenuBar::IsFocused() { - sal_Bool bFocused = sal_False; + bool bFocused = false; if ( m_pWindow && m_pWindow->HasFocus() && !IsChildHighlighted() ) - bFocused = sal_True; + bFocused = true; return bFocused; } diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx b/accessibility/source/standard/vclxaccessiblemenuitem.cxx index 2cb5fa054535..6daadb440ee5 100644 --- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx +++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx @@ -62,29 +62,29 @@ VCLXAccessibleMenuItem::~VCLXAccessibleMenuItem() -sal_Bool VCLXAccessibleMenuItem::IsFocused() +bool VCLXAccessibleMenuItem::IsFocused() { return IsHighlighted(); } -sal_Bool VCLXAccessibleMenuItem::IsSelected() +bool VCLXAccessibleMenuItem::IsSelected() { return IsHighlighted(); } -sal_Bool VCLXAccessibleMenuItem::IsChecked() +bool VCLXAccessibleMenuItem::IsChecked() { - sal_Bool bChecked = sal_False; + bool bChecked = false; if ( m_pParent ) { sal_uInt16 nItemId = m_pParent->GetItemId( m_nItemPos ); if ( m_pParent->IsItemChecked( nItemId ) ) - bChecked = sal_True; + bChecked = true; } return bChecked; @@ -92,12 +92,12 @@ sal_Bool VCLXAccessibleMenuItem::IsChecked() -sal_Bool VCLXAccessibleMenuItem::IsHighlighted() +bool VCLXAccessibleMenuItem::IsHighlighted() { - sal_Bool bHighlighted = sal_False; + bool bHighlighted = false; if ( m_pParent && m_pParent->IsHighlighted( m_nItemPos ) ) - bHighlighted = sal_True; + bHighlighted = true; return bHighlighted; } @@ -391,7 +391,7 @@ sal_Bool VCLXAccessibleMenuItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEnd { OExternalLockGuard aGuard( this ); - sal_Bool bReturn = sal_False; + bool bReturn = false; if ( m_pParent ) { @@ -413,7 +413,7 @@ sal_Bool VCLXAccessibleMenuItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEnd Application::AcquireSolarMutex( nRef ); - bReturn = sal_True; + bReturn = true; } } } @@ -558,19 +558,19 @@ sal_Bool VCLXAccessibleMenuItem::setCurrentValue( const Any& aNumber ) throw (Ru { OExternalLockGuard aGuard( this ); - sal_Bool bReturn = sal_False; + bool bReturn = false; sal_Int32 nValue = 0; OSL_VERIFY( aNumber >>= nValue ); if ( nValue <= 0 ) { DeSelect(); - bReturn = sal_True; + bReturn = true; } else if ( nValue >= 1 ) { Select(); - bReturn = sal_True; + bReturn = true; } return bReturn; diff --git a/accessibility/source/standard/vclxaccessiblepopupmenu.cxx b/accessibility/source/standard/vclxaccessiblepopupmenu.cxx index 16ed7167ee4a..b0b394151ae5 100644 --- a/accessibility/source/standard/vclxaccessiblepopupmenu.cxx +++ b/accessibility/source/standard/vclxaccessiblepopupmenu.cxx @@ -45,7 +45,7 @@ VCLXAccessiblePopupMenu::~VCLXAccessiblePopupMenu() -sal_Bool VCLXAccessiblePopupMenu::IsFocused() +bool VCLXAccessiblePopupMenu::IsFocused() { return !IsChildHighlighted(); } diff --git a/accessibility/source/standard/vclxaccessibleradiobutton.cxx b/accessibility/source/standard/vclxaccessibleradiobutton.cxx index d9ae06a00fde..331075bb4e6e 100644 --- a/accessibility/source/standard/vclxaccessibleradiobutton.cxx +++ b/accessibility/source/standard/vclxaccessibleradiobutton.cxx @@ -254,7 +254,7 @@ sal_Bool VCLXAccessibleRadioButton::setCurrentValue( const Any& aNumber ) throw { OExternalLockGuard aGuard( this ); - sal_Bool bReturn = sal_False; + bool bReturn = false; VCLXRadioButton* pVCLXRadioButton = static_cast< VCLXRadioButton* >( GetVCLXWindow() ); if ( pVCLXRadioButton ) @@ -267,8 +267,8 @@ sal_Bool VCLXAccessibleRadioButton::setCurrentValue( const Any& aNumber ) throw else if ( nValue > 1 ) nValue = 1; - pVCLXRadioButton->setState( (sal_Bool) nValue ); - bReturn = sal_True; + pVCLXRadioButton->setState( nValue == 1 ); + bReturn = true; } return bReturn; diff --git a/accessibility/source/standard/vclxaccessiblescrollbar.cxx b/accessibility/source/standard/vclxaccessiblescrollbar.cxx index 3c772b4fe6fc..44faa7ed8ba9 100644 --- a/accessibility/source/standard/vclxaccessiblescrollbar.cxx +++ b/accessibility/source/standard/vclxaccessiblescrollbar.cxx @@ -138,7 +138,7 @@ sal_Bool VCLXAccessibleScrollBar::doAccessibleAction ( sal_Int32 nIndex ) throw if ( nIndex < 0 || nIndex >= getAccessibleActionCount() ) throw IndexOutOfBoundsException(); - sal_Bool bReturn = sal_False; + bool bReturn = false; ScrollBar* pScrollBar = static_cast< ScrollBar* >( GetWindow() ); if ( pScrollBar ) { @@ -152,7 +152,7 @@ sal_Bool VCLXAccessibleScrollBar::doAccessibleAction ( sal_Int32 nIndex ) throw default: eScrollType = SCROLL_DONTKNOW; break; } if ( pScrollBar->DoScrollAction( eScrollType ) ) - bReturn = sal_True; + bReturn = true; } return bReturn; @@ -216,7 +216,7 @@ sal_Bool VCLXAccessibleScrollBar::setCurrentValue( const Any& aNumber ) throw (R { OExternalLockGuard aGuard( this ); - sal_Bool bReturn = sal_False; + bool bReturn = false; VCLXScrollBar* pVCLXScrollBar = static_cast< VCLXScrollBar* >( GetVCLXWindow() ); if ( pVCLXScrollBar ) @@ -232,7 +232,7 @@ sal_Bool VCLXAccessibleScrollBar::setCurrentValue( const Any& aNumber ) throw (R nValue = nValueMax; pVCLXScrollBar->setValue( nValue ); - bReturn = sal_True; + bReturn = true; } return bReturn; diff --git a/accessibility/source/standard/vclxaccessiblestatusbar.cxx b/accessibility/source/standard/vclxaccessiblestatusbar.cxx index 5579a4ce122f..31f800450b28 100644 --- a/accessibility/source/standard/vclxaccessiblestatusbar.cxx +++ b/accessibility/source/standard/vclxaccessiblestatusbar.cxx @@ -52,7 +52,7 @@ VCLXAccessibleStatusBar::~VCLXAccessibleStatusBar() -void VCLXAccessibleStatusBar::UpdateShowing( sal_Int32 i, sal_Bool bShowing ) +void VCLXAccessibleStatusBar::UpdateShowing( sal_Int32 i, bool bShowing ) { if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() ) { diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx index 4a99f692efd4..99c58a280ab6 100644 --- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx +++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx @@ -70,9 +70,9 @@ VCLXAccessibleStatusBarItem::~VCLXAccessibleStatusBarItem() -sal_Bool VCLXAccessibleStatusBarItem::IsShowing() +bool VCLXAccessibleStatusBarItem::IsShowing() { - sal_Bool bShowing = sal_False; + bool bShowing = false; if ( m_pStatusBar ) bShowing = m_pStatusBar->IsItemVisible( m_nItemId ); @@ -82,7 +82,7 @@ sal_Bool VCLXAccessibleStatusBarItem::IsShowing() -void VCLXAccessibleStatusBarItem::SetShowing( sal_Bool bShowing ) +void VCLXAccessibleStatusBarItem::SetShowing( bool bShowing ) { if ( m_bShowing != bShowing ) { @@ -582,7 +582,7 @@ sal_Bool VCLXAccessibleStatusBarItem::copyText( sal_Int32 nStartIndex, sal_Int32 { OExternalLockGuard aGuard( this ); - sal_Bool bReturn = sal_False; + bool bReturn = false; if ( m_pStatusBar ) { @@ -601,7 +601,7 @@ sal_Bool VCLXAccessibleStatusBarItem::copyText( sal_Int32 nStartIndex, sal_Int32 Application::AcquireSolarMutex( nRef ); - bReturn = sal_True; + bReturn = true; } } diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx b/accessibility/source/standard/vclxaccessibletabcontrol.cxx index f161f400ab44..f71f561700f9 100644 --- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx +++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx @@ -433,9 +433,9 @@ sal_Bool VCLXAccessibleTabControl::isAccessibleChildSelected( sal_Int32 nChildIn if ( nChildIndex < 0 || nChildIndex >= getAccessibleChildCount() ) throw IndexOutOfBoundsException(); - sal_Bool bSelected = sal_False; + bool bSelected = false; if ( m_pTabControl && m_pTabControl->GetCurPageId() == m_pTabControl->GetPageId( (sal_uInt16)nChildIndex ) ) - bSelected = sal_True; + bSelected = true; return bSelected; } diff --git a/accessibility/source/standard/vclxaccessibletabpage.cxx b/accessibility/source/standard/vclxaccessibletabpage.cxx index 2fc80195a799..84a689d7088b 100644 --- a/accessibility/source/standard/vclxaccessibletabpage.cxx +++ b/accessibility/source/standard/vclxaccessibletabpage.cxx @@ -655,7 +655,7 @@ sal_Bool VCLXAccessibleTabPage::copyText( sal_Int32 nStartIndex, sal_Int32 nEndI { OExternalLockGuard aGuard( this ); - sal_Bool bReturn = sal_False; + bool bReturn = false; if ( m_pTabControl ) { @@ -674,7 +674,7 @@ sal_Bool VCLXAccessibleTabPage::copyText( sal_Int32 nStartIndex, sal_Int32 nEndI Application::AcquireSolarMutex( nRef ); - bReturn = sal_True; + bReturn = true; } } diff --git a/accessibility/source/standard/vclxaccessibletextcomponent.cxx b/accessibility/source/standard/vclxaccessibletextcomponent.cxx index 8d7a26165bbe..7ed497a75529 100644 --- a/accessibility/source/standard/vclxaccessibletextcomponent.cxx +++ b/accessibility/source/standard/vclxaccessibletextcomponent.cxx @@ -374,7 +374,7 @@ sal_Bool VCLXAccessibleTextComponent::copyText( sal_Int32 nStartIndex, sal_Int32 { OExternalLockGuard aGuard( this ); - sal_Bool bReturn = sal_False; + bool bReturn = false; if ( GetWindow() ) { @@ -393,7 +393,7 @@ sal_Bool VCLXAccessibleTextComponent::copyText( sal_Int32 nStartIndex, sal_Int32 Application::AcquireSolarMutex( nRef ); - bReturn = sal_True; + bReturn = true; } } diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx b/accessibility/source/standard/vclxaccessibletoolbox.cxx index 6edd6048524c..106574f38c84 100644 --- a/accessibility/source/standard/vclxaccessibletoolbox.cxx +++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx @@ -89,7 +89,7 @@ namespace inline sal_Int32 getIndexInParent() const { return m_nIndexInParent; } inline void setIndexInParent( sal_Int32 _nNewIndex ) { m_nIndexInParent = _nNewIndex; } - static sal_Bool isWindowItem( const Reference< XAccessible >& _rxAcc, OToolBoxWindowItem** /* [out] */ _ppImplementation = NULL ); + static bool isWindowItem( const Reference< XAccessible >& _rxAcc, OToolBoxWindowItem** /* [out] */ _ppImplementation = NULL ); public: OToolBoxWindowItem(sal_Int32 _nIndexInParent, @@ -128,7 +128,7 @@ namespace return new OToolBoxWindowItemContext( m_nIndexInParent, getComponentContext(), _rxInnerContext, this, getParent() ); } - sal_Bool OToolBoxWindowItem::isWindowItem( const Reference< XAccessible >& _rxAcc, OToolBoxWindowItem** /* [out] */ _ppImplementation ) + bool OToolBoxWindowItem::isWindowItem( const Reference< XAccessible >& _rxAcc, OToolBoxWindowItem** /* [out] */ _ppImplementation ) { OToolBoxWindowItem* pImplementation = NULL; @@ -203,16 +203,16 @@ void VCLXAccessibleToolBox::UpdateFocus_Impl() return; // submit events only if toolbox has the focus to avoid sending events due to mouse move - sal_Bool bHasFocus = sal_False; + bool bHasFocus = false; if ( pToolBox->HasFocus() ) - bHasFocus = sal_True; + bHasFocus = true; else { // check for subtoolbar, i.e. check if our parent is a toolbar ToolBox* pToolBoxParent = dynamic_cast< ToolBox* >( pToolBox->GetParent() ); // subtoolbars never get the focus as key input is just forwarded, so check if the parent toolbar has it if ( pToolBoxParent && pToolBoxParent->HasFocus() ) - bHasFocus = sal_True; + bHasFocus = true; } if ( bHasFocus ) @@ -231,13 +231,13 @@ void VCLXAccessibleToolBox::UpdateFocus_Impl() if ( pItem->HasFocus() && nItemId != nHighlightItemId ) { // reset the old focused item - pItem->SetFocus( sal_False ); + pItem->SetFocus( false ); nFocusCount++; } if ( nItemId == nHighlightItemId ) { // set the new focused item - pItem->SetFocus( sal_True ); + pItem->SetFocus( true ); nFocusCount++; } } @@ -259,7 +259,7 @@ void VCLXAccessibleToolBox::ReleaseFocus_Impl( sal_Int32 _nPos ) VCLXAccessibleToolBoxItem* pItem = static_cast< VCLXAccessibleToolBoxItem* >( aIter->second.get() ); if ( pItem->HasFocus() ) - pItem->SetFocus( sal_False ); + pItem->SetFocus( false ); } } } @@ -285,7 +285,7 @@ void VCLXAccessibleToolBox::UpdateChecked_Impl( sal_Int32 _nPos ) } //Solution:If the position is not a child item,the focus should not be called if ( pFocusItem && (sal_uInt16)_nPos != TOOLBOX_ITEM_NOTFOUND ) - pFocusItem->SetFocus( sal_True ); + pFocusItem->SetFocus( true ); } } @@ -339,7 +339,7 @@ void VCLXAccessibleToolBox::implReleaseToolboxItem( ToolBoxItemsMap::iterator& _ } } -void VCLXAccessibleToolBox::UpdateItem_Impl( sal_Int32 _nPos, sal_Bool _bItemAdded ) +void VCLXAccessibleToolBox::UpdateItem_Impl( sal_Int32 _nPos, bool _bItemAdded ) { if ( _nPos < sal_Int32( m_aAccessibleChildren.size() ) ) { @@ -566,7 +566,7 @@ void VCLXAccessibleToolBox::ProcessWindowEvent( const VclWindowEvent& rVclWindow break; case VCLEVENT_TOOLBOX_ITEMADDED : - UpdateItem_Impl( (sal_Int32)(sal_IntPtr)rVclWindowEvent.GetData(), sal_True ); + UpdateItem_Impl( (sal_Int32)(sal_IntPtr)rVclWindowEvent.GetData(), true ); break; case VCLEVENT_TOOLBOX_ITEMREMOVED : @@ -735,9 +735,9 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleChild( sal } xChild = pChild; if ( nHighlightItemId > 0 && nItemId == nHighlightItemId ) - pChild->SetFocus( sal_True ); + pChild->SetFocus( true ); if ( pToolBox->IsItemChecked( nItemId ) ) - pChild->SetChecked( sal_True ); + pChild->SetChecked( true ); if ( pToolBox->GetItemState( nItemId ) == TRISTATE_INDET ) pChild->SetIndeterminate( true ); m_aAccessibleChildren.insert( ToolBoxItemsMap::value_type( i, xChild ) ); diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx index 293e546253e1..ff903d166c02 100644 --- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx +++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx @@ -65,8 +65,8 @@ VCLXAccessibleToolBoxItem::VCLXAccessibleToolBoxItem( ToolBox* _pToolBox, sal_In m_nIndexInParent( _nPos ), m_nRole ( AccessibleRole::PUSH_BUTTON ), m_nItemId ( 0 ), - m_bHasFocus ( sal_False ), - m_bIsChecked ( sal_False ), + m_bHasFocus ( false ), + m_bIsChecked ( false ), m_bIndeterminate( false ) { @@ -144,7 +144,7 @@ OUString VCLXAccessibleToolBoxItem::GetText( bool _bAsName ) return sRet; } -void VCLXAccessibleToolBoxItem::SetFocus( sal_Bool _bFocus ) +void VCLXAccessibleToolBoxItem::SetFocus( bool _bFocus ) { if ( m_bHasFocus != _bFocus ) { @@ -159,7 +159,7 @@ void VCLXAccessibleToolBoxItem::SetFocus( sal_Bool _bFocus ) } } -void VCLXAccessibleToolBoxItem::SetChecked( sal_Bool _bCheck ) +void VCLXAccessibleToolBoxItem::SetChecked( bool _bCheck ) { if( m_nRole == AccessibleRole::PANEL) return; @@ -509,7 +509,7 @@ sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::copyText( sal_Int32 nStartIndex, sa if ( !implIsValidRange( nStartIndex, nEndIndex, implGetText().getLength() ) ) throw IndexOutOfBoundsException(); - sal_Bool bReturn = sal_False; + bool bReturn = false; if ( m_pToolBox ) { @@ -528,7 +528,7 @@ sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::copyText( sal_Int32 nStartIndex, sa Application::AcquireSolarMutex( nRef ); - bReturn = sal_True; + bReturn = true; } } @@ -680,7 +680,7 @@ sal_Bool VCLXAccessibleToolBoxItem::setCurrentValue( const Any& aNumber ) throw { OExternalLockGuard aGuard( this ); - sal_Bool bReturn = sal_False; + bool bReturn = false; if ( m_pToolBox ) { @@ -692,8 +692,8 @@ sal_Bool VCLXAccessibleToolBoxItem::setCurrentValue( const Any& aNumber ) throw else if ( nValue > 1 ) nValue = 1; - m_pToolBox->CheckItem( m_nItemId, (sal_Bool) nValue ); - bReturn = sal_True; + m_pToolBox->CheckItem( m_nItemId, nValue == 1 ); + bReturn = true; } return bReturn; |