diff options
author | Noel Grandin <noel@peralex.com> | 2014-03-03 13:21:09 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-03-11 08:18:13 +0200 |
commit | ea2fb5f8f9ea44d7da5f9d34760e470d696f587d (patch) | |
tree | 6d0259df92cab5e4fc6027e3a9cc39269f627c28 /svx | |
parent | 050d7fc852f1539f16a358c03e4e8ffb57891c4d (diff) |
svx: sal_Bool->bool
Change-Id: I360b459102e61562b7cd1987545288d5ce8aed6b
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/accessibility/AccessibleControlShape.cxx | 4 | ||||
-rw-r--r-- | svx/source/accessibility/AccessibleShape.cxx | 10 | ||||
-rw-r--r-- | svx/source/accessibility/AccessibleTextHelper.cxx | 10 | ||||
-rw-r--r-- | svx/source/table/accessiblecell.cxx | 8 | ||||
-rw-r--r-- | svx/source/table/accessibletableshape.cxx | 10 |
5 files changed, 21 insertions, 21 deletions
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx index 9ccc8b6b44e5..3fd93f5a919f 100644 --- a/svx/source/accessibility/AccessibleControlShape.cxx +++ b/svx/source/accessibility/AccessibleControlShape.cxx @@ -697,10 +697,10 @@ void SAL_CALL AccessibleControlShape::disposing (void) AccessibleShape::disposing(); } -sal_Bool AccessibleControlShape::ensureControlModelAccess() SAL_THROW(()) +bool AccessibleControlShape::ensureControlModelAccess() SAL_THROW(()) { if ( m_xControlModel.is() ) - return sal_True; + return true; try { diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index d1a7d5ab420b..537fe41b2340 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -271,8 +271,8 @@ bool AccessibleShape::SetState (sal_Int16 aState) { // Offer FOCUSED state to edit engine and detect whether the state // changes. - sal_Bool bIsFocused = mpText->HaveFocus (); - mpText->SetFocus (sal_True); + bool bIsFocused = mpText->HaveFocus (); + mpText->SetFocus (true); bStateHasChanged = (bIsFocused != mpText->HaveFocus ()); } else @@ -292,8 +292,8 @@ bool AccessibleShape::ResetState (sal_Int16 aState) { // Try to remove FOCUSED state from the edit engine and detect // whether the state changes. - sal_Bool bIsFocused = mpText->HaveFocus (); - mpText->SetFocus (sal_False); + bool bIsFocused = mpText->HaveFocus (); + mpText->SetFocus (false); bStateHasChanged = (bIsFocused != mpText->HaveFocus ()); } else @@ -305,7 +305,7 @@ bool AccessibleShape::ResetState (sal_Int16 aState) -sal_Bool AccessibleShape::GetState (sal_Int16 aState) +bool AccessibleShape::GetState (sal_Int16 aState) { if (aState == AccessibleStateType::FOCUSED && mpText != NULL) { diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx index e1daab61276b..bc16276c2679 100644 --- a/svx/source/accessibility/AccessibleTextHelper.cxx +++ b/svx/source/accessibility/AccessibleTextHelper.cxx @@ -1777,7 +1777,7 @@ namespace accessibility #endif } - void AccessibleTextHelper::SetFocus( sal_Bool bHaveFocus ) SAL_THROW((::com::sun::star::uno::RuntimeException)) + void AccessibleTextHelper::SetFocus( bool bHaveFocus ) SAL_THROW((::com::sun::star::uno::RuntimeException)) { #ifdef DBG_UTIL // precondition: solar mutex locked @@ -1793,12 +1793,12 @@ namespace accessibility #endif } - sal_Bool AccessibleTextHelper::HaveFocus() SAL_THROW((::com::sun::star::uno::RuntimeException)) + bool AccessibleTextHelper::HaveFocus() SAL_THROW((::com::sun::star::uno::RuntimeException)) { #ifdef DBG_UTIL mpImpl->CheckInvariants(); - sal_Bool bRet( mpImpl->HaveFocus() ); + bool bRet( mpImpl->HaveFocus() ); mpImpl->CheckInvariants(); @@ -1938,14 +1938,14 @@ namespace accessibility #endif } - sal_Bool AccessibleTextHelper::IsSelected() const + bool AccessibleTextHelper::IsSelected() const { SolarMutexGuard aGuard; #ifdef DBG_UTIL mpImpl->CheckInvariants(); - sal_Bool aRet = mpImpl->IsSelected(); + bool aRet = mpImpl->IsSelected(); mpImpl->CheckInvariants(); diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index 56343a83a830..0b6643ff0fa4 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -105,8 +105,8 @@ bool AccessibleCell::SetState (sal_Int16 aState) { // Offer FOCUSED state to edit engine and detect whether the state // changes. - sal_Bool bIsFocused = mpText->HaveFocus (); - mpText->SetFocus (sal_True); + bool bIsFocused = mpText->HaveFocus (); + mpText->SetFocus (true); bStateHasChanged = (bIsFocused != mpText->HaveFocus ()); } else @@ -125,8 +125,8 @@ bool AccessibleCell::ResetState (sal_Int16 aState) { // Try to remove FOCUSED state from the edit engine and detect // whether the state changes. - sal_Bool bIsFocused = mpText->HaveFocus (); - mpText->SetFocus (sal_False); + bool bIsFocused = mpText->HaveFocus (); + mpText->SetFocus (false); bStateHasChanged = (bIsFocused != mpText->HaveFocus ()); } else diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx index d6a478f0ea6b..5c18091c17de 100644 --- a/svx/source/table/accessibletableshape.cxx +++ b/svx/source/table/accessibletableshape.cxx @@ -522,7 +522,7 @@ Reference< XAccessibleTable > SAL_CALL AccessibleTableShape::getAccessibleRowHea { if( pController->isRowHeader() ) { - AccessibleTableHeaderShape* pTableHeader = new AccessibleTableHeaderShape( this, sal_True ); + AccessibleTableHeaderShape* pTableHeader = new AccessibleTableHeaderShape( this, true ); xRet.set( pTableHeader ); } } @@ -539,7 +539,7 @@ Reference< XAccessibleTable > SAL_CALL AccessibleTableShape::getAccessibleColumn { if( pController->isColumnHeader() ) { - AccessibleTableHeaderShape* pTableHeader = new AccessibleTableHeaderShape( this, sal_False ); + AccessibleTableHeaderShape* pTableHeader = new AccessibleTableHeaderShape( this, false ); xRet.set( pTableHeader ); } } @@ -1024,12 +1024,12 @@ bool AccessibleTableShape::ResetState (sal_Int16 aState) return bStateHasChanged; } -sal_Bool AccessibleTableShape::SetStateDirectly (sal_Int16 aState) +bool AccessibleTableShape::SetStateDirectly (sal_Int16 aState) { return AccessibleContextBase::SetState (aState); } -sal_Bool AccessibleTableShape::ResetStateDirectly (sal_Int16 aState) +bool AccessibleTableShape::ResetStateDirectly (sal_Int16 aState) { return AccessibleContextBase::ResetState (aState); } @@ -1042,7 +1042,7 @@ void AccessibleTableShape::checkCellPosition( sal_Int32 nCol, sal_Int32 nRow ) t throw IndexOutOfBoundsException(); } -AccessibleTableHeaderShape::AccessibleTableHeaderShape( AccessibleTableShape* pTable, sal_Bool bRow ) +AccessibleTableHeaderShape::AccessibleTableHeaderShape( AccessibleTableShape* pTable, bool bRow ) { mpTable = pTable; mbRow = bRow; |