mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

svx: sal_Bool->bool

Browse Source 
Change-Id: I360b459102e61562b7cd1987545288d5ce8aed6b
This commit is contained in:
Noel Grandin 2014-03-03 13:21:09 +02:00
parent 050d7fc852
commit ea2fb5f8f9
12 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/svx/AccessibleControlShape.hxx
View File

@ -138,7 +138,7 @@ protected:
OUString getControlModelStringProperty( const OUString& _rPropertyName ) const SAL_THROW(( )); OUString getControlModelStringProperty( const OUString& _rPropertyName ) const SAL_THROW(( ));
/// ensure that our control model exists(will be retrieved upon need only) /// ensure that our control model exists(will be retrieved upon need only)
sal_Bool ensureControlModelAccess( ) SAL_THROW(( )); bool ensureControlModelAccess( ) SAL_THROW(( ));
/// ensures that we're listening for the given property if(and only if!) necessary /// ensures that we're listening for the given property if(and only if!) necessary
bool ensureListeningState( const bool _bCurrentlyListening, const bool _bNeedNewListening, bool ensureListeningState( const bool _bCurrentlyListening, const bool _bNeedNewListening,

2
include/svx/AccessibleShape.hxx
View File

@ -208,7 +208,7 @@ public:
entity that manages the state set. entity that manages the state set.
*/ */
sal_Bool GetState (sal_Int16 aState); bool GetState (sal_Int16 aState);
//===== XAccessibleContext ============================================== //===== XAccessibleContext ==============================================

10
include/svx/AccessibleTableShape.hxx
View File

@ -134,8 +134,8 @@ public:
virtual bool SetState (sal_Int16 aState); virtual bool SetState (sal_Int16 aState);
virtual bool ResetState (sal_Int16 aState); virtual bool ResetState (sal_Int16 aState);
// The following two methods are used to set state directly on table object, instread of the internal cell or paragraph. // The following two methods are used to set state directly on table object, instread of the internal cell or paragraph.
sal_Bool SetStateDirectly (sal_Int16 aState); bool SetStateDirectly (sal_Int16 aState);
sal_Bool ResetStateDirectly (sal_Int16 aState); bool ResetStateDirectly (sal_Int16 aState);
// Get the currently active cell which is text editing // Get the currently active cell which is text editing
AccessibleCell* GetActiveAccessibleCell(); AccessibleCell* GetActiveAccessibleCell();
@ -164,8 +164,8 @@ class AccessibleTableHeaderShape : boost::noncopyable,
public AccessibleTableHeaderShape_BASE public AccessibleTableHeaderShape_BASE
{ {
public: public:
// bRow, sal_True means rowheader, sal_False means columnheader // bRow, true means rowheader, false means columnheader
AccessibleTableHeaderShape( AccessibleTableShape* pTable, sal_Bool bRow ); AccessibleTableHeaderShape( AccessibleTableShape* pTable, bool bRow );
virtual ~AccessibleTableHeaderShape(); virtual ~AccessibleTableHeaderShape();
// XAccessible // XAccessible
@ -227,7 +227,7 @@ public:
private: private:
SVX_DLLPRIVATE explicit AccessibleTableHeaderShape( const ::com::sun::star::uno::Reference< SVX_DLLPRIVATE explicit AccessibleTableHeaderShape( const ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible>& rxParent ); ::com::sun::star::accessibility::XAccessible>& rxParent );
sal_Bool mbRow; bool mbRow;
rtl::Reference< AccessibleTableShape > mpTable; rtl::Reference< AccessibleTableShape > mpTable;
}; };

14
include/svx/AccessibleTextHelper.hxx
View File

@ -318,24 +318,24 @@ namespace accessibility
from the main office thread. from the main office thread.
@param bHaveFocus @param bHaveFocus
Whether we got or we lost the focus. Set to sal_True if Whether we got or we lost the focus. Set to true if
focus is gotten, sal_False otherwise. focus is gotten, false otherwise.
@see HaveFocus() @see HaveFocus()
*/ */
virtual void SetFocus( sal_Bool bHaveFocus = sal_True ) SAL_THROW((::com::sun::star::uno::RuntimeException)); virtual void SetFocus( bool bHaveFocus = true ) SAL_THROW((::com::sun::star::uno::RuntimeException));
/** Query the focus state of the surrounding object /** Query the focus state of the surrounding object
If focus handling is delegated to this class, determine If focus handling is delegated to this class, determine
focus state with this method. Be prepared that even if you focus state with this method. Be prepared that even if you
set the focus with SetFocus(sal_True), this method might set the focus with SetFocus(true), this method might
return sal_False. This is the case if one of the children return false. This is the case if one of the children
actually got the focus. actually got the focus.
@return the state of the focus ownership @return the state of the focus ownership
*/ */
virtual sal_Bool HaveFocus() SAL_THROW((::com::sun::star::uno::RuntimeException)); virtual bool HaveFocus() SAL_THROW((::com::sun::star::uno::RuntimeException));
/** Call this method to invoke all event listeners with the given event /** Call this method to invoke all event listeners with the given event
@ -372,7 +372,7 @@ namespace accessibility
@return sal_True, if the text or parts of it are currently selected @return sal_True, if the text or parts of it are currently selected
*/ */
virtual sal_Bool IsSelected() const; virtual bool IsSelected() const;
// XAccessibleContext child handling methods // XAccessibleContext child handling methods

2
sc/source/ui/Accessibility/AccessibleEditObject.cxx
View File

@ -117,7 +117,7 @@ void ScAccessibleEditObject::GotFocus()
mbHasFocus = true; mbHasFocus = true;
CommitFocusGained(); CommitFocusGained();
if (mpTextHelper) if (mpTextHelper)
mpTextHelper->SetFocus(sal_True); mpTextHelper->SetFocus(true);
} }
//===== XInterface ========================================================== //===== XInterface ==========================================================

4
sd/source/ui/accessibility/AccessibleOutlineView.cxx
View File

@ -220,7 +220,7 @@ void AccessibleOutlineView::Activated (void)
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
// delegate listener handling to children manager. // delegate listener handling to children manager.
maTextHelper.SetFocus(sal_True); maTextHelper.SetFocus(true);
} }
void AccessibleOutlineView::Deactivated (void) void AccessibleOutlineView::Deactivated (void)
@ -228,7 +228,7 @@ void AccessibleOutlineView::Deactivated (void)
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
// delegate listener handling to children manager. // delegate listener handling to children manager.
maTextHelper.SetFocus(sal_False); maTextHelper.SetFocus(false);
} }
void SAL_CALL AccessibleOutlineView::disposing (void) void SAL_CALL AccessibleOutlineView::disposing (void)

4
svx/source/accessibility/AccessibleControlShape.cxx
View File

@ -697,10 +697,10 @@ void SAL_CALL AccessibleControlShape::disposing (void)
AccessibleShape::disposing(); AccessibleShape::disposing();
} }
sal_Bool AccessibleControlShape::ensureControlModelAccess() SAL_THROW(()) bool AccessibleControlShape::ensureControlModelAccess() SAL_THROW(())
{ {
if ( m_xControlModel.is() ) if ( m_xControlModel.is() )
return sal_True; return true;
try try
{ {

10
svx/source/accessibility/AccessibleShape.cxx
View File

@ -271,8 +271,8 @@ bool AccessibleShape::SetState (sal_Int16 aState)
{ {
// Offer FOCUSED state to edit engine and detect whether the state // Offer FOCUSED state to edit engine and detect whether the state
// changes. // changes.
sal_Bool bIsFocused = mpText->HaveFocus (); bool bIsFocused = mpText->HaveFocus ();
mpText->SetFocus (sal_True); mpText->SetFocus (true);
bStateHasChanged = (bIsFocused != mpText->HaveFocus ()); bStateHasChanged = (bIsFocused != mpText->HaveFocus ());
} }
else else
@ -292,8 +292,8 @@ bool AccessibleShape::ResetState (sal_Int16 aState)
{ {
// Try to remove FOCUSED state from the edit engine and detect // Try to remove FOCUSED state from the edit engine and detect
// whether the state changes. // whether the state changes.
sal_Bool bIsFocused = mpText->HaveFocus (); bool bIsFocused = mpText->HaveFocus ();
mpText->SetFocus (sal_False); mpText->SetFocus (false);
bStateHasChanged = (bIsFocused != mpText->HaveFocus ()); bStateHasChanged = (bIsFocused != mpText->HaveFocus ());
} }
else 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) if (aState == AccessibleStateType::FOCUSED && mpText != NULL)
{ {

10
svx/source/accessibility/AccessibleTextHelper.cxx
View File

@ -1777,7 +1777,7 @@ namespace accessibility
#endif #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 #ifdef DBG_UTIL
// precondition: solar mutex locked // precondition: solar mutex locked
@ -1793,12 +1793,12 @@ namespace accessibility
#endif #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 #ifdef DBG_UTIL
mpImpl->CheckInvariants(); mpImpl->CheckInvariants();
sal_Bool bRet( mpImpl->HaveFocus() ); bool bRet( mpImpl->HaveFocus() );
mpImpl->CheckInvariants(); mpImpl->CheckInvariants();
@ -1938,14 +1938,14 @@ namespace accessibility
#endif #endif
} }
sal_Bool AccessibleTextHelper::IsSelected() const bool AccessibleTextHelper::IsSelected() const
{ {
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
#ifdef DBG_UTIL #ifdef DBG_UTIL
mpImpl->CheckInvariants(); mpImpl->CheckInvariants();
sal_Bool aRet = mpImpl->IsSelected(); bool aRet = mpImpl->IsSelected();
mpImpl->CheckInvariants(); mpImpl->CheckInvariants();

8
svx/source/table/accessiblecell.cxx
View File

@ -105,8 +105,8 @@ bool AccessibleCell::SetState (sal_Int16 aState)
{ {
// Offer FOCUSED state to edit engine and detect whether the state // Offer FOCUSED state to edit engine and detect whether the state
// changes. // changes.
sal_Bool bIsFocused = mpText->HaveFocus (); bool bIsFocused = mpText->HaveFocus ();
mpText->SetFocus (sal_True); mpText->SetFocus (true);
bStateHasChanged = (bIsFocused != mpText->HaveFocus ()); bStateHasChanged = (bIsFocused != mpText->HaveFocus ());
} }
else else
@ -125,8 +125,8 @@ bool AccessibleCell::ResetState (sal_Int16 aState)
{ {
// Try to remove FOCUSED state from the edit engine and detect // Try to remove FOCUSED state from the edit engine and detect
// whether the state changes. // whether the state changes.
sal_Bool bIsFocused = mpText->HaveFocus (); bool bIsFocused = mpText->HaveFocus ();
mpText->SetFocus (sal_False); mpText->SetFocus (false);
bStateHasChanged = (bIsFocused != mpText->HaveFocus ()); bStateHasChanged = (bIsFocused != mpText->HaveFocus ());
} }
else else

10
svx/source/table/accessibletableshape.cxx
View File

@ -522,7 +522,7 @@ Reference< XAccessibleTable > SAL_CALL AccessibleTableShape::getAccessibleRowHea
{ {
if( pController->isRowHeader() ) if( pController->isRowHeader() )
{ {
AccessibleTableHeaderShape* pTableHeader = new AccessibleTableHeaderShape( this, sal_True ); AccessibleTableHeaderShape* pTableHeader = new AccessibleTableHeaderShape( this, true );
xRet.set( pTableHeader ); xRet.set( pTableHeader );
} }
} }
@ -539,7 +539,7 @@ Reference< XAccessibleTable > SAL_CALL AccessibleTableShape::getAccessibleColumn
{ {
if( pController->isColumnHeader() ) if( pController->isColumnHeader() )
{ {
AccessibleTableHeaderShape* pTableHeader = new AccessibleTableHeaderShape( this, sal_False ); AccessibleTableHeaderShape* pTableHeader = new AccessibleTableHeaderShape( this, false );
xRet.set( pTableHeader ); xRet.set( pTableHeader );
} }
} }
@ -1024,12 +1024,12 @@ bool AccessibleTableShape::ResetState (sal_Int16 aState)
return bStateHasChanged; return bStateHasChanged;
} }
sal_Bool AccessibleTableShape::SetStateDirectly (sal_Int16 aState) bool AccessibleTableShape::SetStateDirectly (sal_Int16 aState)
{ {
return AccessibleContextBase::SetState (aState); return AccessibleContextBase::SetState (aState);
} }
sal_Bool AccessibleTableShape::ResetStateDirectly (sal_Int16 aState) bool AccessibleTableShape::ResetStateDirectly (sal_Int16 aState)
{ {
return AccessibleContextBase::ResetState (aState); return AccessibleContextBase::ResetState (aState);
} }
@ -1042,7 +1042,7 @@ void AccessibleTableShape::checkCellPosition( sal_Int32 nCol, sal_Int32 nRow ) t
throw IndexOutOfBoundsException(); throw IndexOutOfBoundsException();
} }
AccessibleTableHeaderShape::AccessibleTableHeaderShape( AccessibleTableShape* pTable, sal_Bool bRow ) AccessibleTableHeaderShape::AccessibleTableHeaderShape( AccessibleTableShape* pTable, bool bRow )
{ {
mpTable = pTable; mpTable = pTable;
mbRow = bRow; mbRow = bRow;

4
sw/source/core/uibase/docvw/SidebarTxtControlAcc.cxx
View File

@ -253,13 +253,13 @@ void SidebarTxtControlAccessibleContext::ProcessWindowEvent( const VclWindowEven
case VCLEVENT_WINDOW_GETFOCUS: case VCLEVENT_WINDOW_GETFOCUS:
case VCLEVENT_CONTROL_GETFOCUS: case VCLEVENT_CONTROL_GETFOCUS:
{ {
mpAccessibleTextHelper->SetFocus( sal_True ); mpAccessibleTextHelper->SetFocus( true );
} }
break; break;
case VCLEVENT_WINDOW_LOSEFOCUS: case VCLEVENT_WINDOW_LOSEFOCUS:
case VCLEVENT_CONTROL_LOSEFOCUS: case VCLEVENT_CONTROL_LOSEFOCUS:
{ {
mpAccessibleTextHelper->SetFocus( sal_False ); mpAccessibleTextHelper->SetFocus( false );
} }
break; break;
} }