diff options
| author | Carsten Driesner <cd@openoffice.org> | 2011-02-07 15:17:39 +0100 |
|---|---|---|
| committer | Carsten Driesner <cd@openoffice.org> | 2011-02-07 15:17:39 +0100 |
| commit | 31c7fdb84ac0fbed29a06b3a6410cee962d770a8 (patch) | |
| tree | 1fa615e658c763e9eb8121e5eb515d89fc9bc125 /svl/source/undo | |
| parent | c39a5bda38b3af9ac6d964e6dff598e93121798a (diff) | |
removetooltypes01: #i112600# Fix problem after rebase in svl
Diffstat (limited to 'svl/source/undo')
| -rw-r--r-- | svl/source/undo/undo.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx index d277123637d7..af22c04c79ff 100644 --- a/svl/source/undo/undo.cxx +++ b/svl/source/undo/undo.cxx @@ -759,7 +759,7 @@ bool SfxUndoManager::IsDoing() const //------------------------------------------------------------------------ -BOOL SfxUndoManager::Undo() +sal_Bool SfxUndoManager::Undo() { return ImplUndo( NULL ); } @@ -829,7 +829,7 @@ sal_Bool SfxUndoManager::ImplUndo( SfxUndoContext* i_contextOrNull ) aGuard.scheduleNotification( &SfxUndoListener::actionUndone, sActionComment ); - return TRUE; + return sal_True; } //------------------------------------------------------------------------ @@ -873,7 +873,7 @@ sal_Bool SfxUndoManager::RedoWithContext( SfxUndoContext& i_context ) //------------------------------------------------------------------------ -BOOL SfxUndoManager::ImplRedo( SfxUndoContext* i_contextOrNull ) +sal_Bool SfxUndoManager::ImplRedo( SfxUndoContext* i_contextOrNull ) { UndoManagerGuard aGuard( *m_pData ); OSL_ENSURE( !IsDoing(), "SfxUndoManager::Redo: *nested* Undo/Redo actions? How this?" ); @@ -884,13 +884,13 @@ BOOL SfxUndoManager::ImplRedo( SfxUndoContext* i_contextOrNull ) if ( ImplIsInListAction_Lock() ) { OSL_ENSURE( false, "SfxUndoManager::Redo: not possible when within a list action!" ); - return FALSE; + return sal_False; } if ( m_pData->pActUndoArray->nCurUndoAction >= m_pData->pActUndoArray->aUndoActions.size() ) { OSL_ENSURE( false, "SfxUndoManager::Redo: redo stack is empty!" ); - return FALSE; + return sal_False; } SfxUndoAction* pAction = m_pData->pActUndoArray->aUndoActions[ m_pData->pActUndoArray->nCurUndoAction++ ].pAction; @@ -930,7 +930,7 @@ BOOL SfxUndoManager::ImplRedo( SfxUndoContext* i_contextOrNull ) aGuard.scheduleNotification( &SfxUndoListener::actionRedone, sActionComment ); - return TRUE; + return sal_True; } //------------------------------------------------------------------------ @@ -952,7 +952,7 @@ XubString SfxUndoManager::GetRepeatActionComment( SfxRepeatTarget &rTarget) cons //------------------------------------------------------------------------ -sal_Bool SfxUndoManager::Repeat( SfxRepeatTarget &rTarget, sal_uInt16 /*nFrom*/, sal_uInt16 /*nCount*/ ) +sal_Bool SfxUndoManager::Repeat( SfxRepeatTarget &rTarget ) { UndoManagerGuard aGuard( *m_pData ); if ( !m_pData->pActUndoArray->aUndoActions.empty() ) @@ -961,7 +961,7 @@ sal_Bool SfxUndoManager::Repeat( SfxRepeatTarget &rTarget, sal_uInt16 /*nFrom*/, aGuard.clear(); if ( pAction->CanRepeat( rTarget ) ) pAction->Repeat( rTarget ); - return TRUE; + return sal_True; } return sal_False; @@ -969,7 +969,7 @@ sal_Bool SfxUndoManager::Repeat( SfxRepeatTarget &rTarget, sal_uInt16 /*nFrom*/, //------------------------------------------------------------------------ -BOOL SfxUndoManager::CanRepeat( SfxRepeatTarget &rTarget ) const +sal_Bool SfxUndoManager::CanRepeat( SfxRepeatTarget &rTarget ) const { UndoManagerGuard aGuard( *m_pData ); if ( !m_pData->pActUndoArray->aUndoActions.empty() ) @@ -977,7 +977,7 @@ BOOL SfxUndoManager::CanRepeat( SfxRepeatTarget &rTarget ) const size_t nActionNo = m_pData->pActUndoArray->aUndoActions.size() - 1; return m_pData->pActUndoArray->aUndoActions[nActionNo].pAction->CanRepeat(rTarget); } - return FALSE; + return sal_False; } //------------------------------------------------------------------------ |