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

i#119400 repair broken undo

Browse Source 
Change-Id: I36d74fe1555bd436f93a5fa595e7da05bbd37493
This commit is contained in:
Ivan Timofeev
2012-06-28 13:12:56 +04:00
parent b4fae02946
commit 1eed4c8378
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
svl/source/undo/undo.cxx
View File

@@ -635,11 +635,15 @@ bool SfxUndoManager::ImplAddUndoAction_NoNotify( SfxUndoAction *pAction, bool bT
// merge, if required // merge, if required
SfxUndoAction* pMergeWithAction = m_pData->pActUndoArray->nCurUndoAction ? SfxUndoAction* pMergeWithAction = m_pData->pActUndoArray->nCurUndoAction ?
m_pData->pActUndoArray->aUndoActions[m_pData->pActUndoArray->nCurUndoAction-1].pAction : NULL; m_pData->pActUndoArray->aUndoActions[m_pData->pActUndoArray->nCurUndoAction-1].pAction : NULL;
if ( bTryMerge && ( !pMergeWithAction || !pMergeWithAction->Merge( pAction ) ) ) if ( bTryMerge && pMergeWithAction )
{
bool bMerged = pMergeWithAction->Merge( pAction );
if ( bMerged )
{ {
i_guard.markForDeletion( pAction ); i_guard.markForDeletion( pAction );
return false; return false;
} }
}
// clear redo stack, if requested // clear redo stack, if requested
if ( bClearRedo && ( ImplGetRedoActionCount_Lock( CurrentLevel ) > 0 ) ) if ( bClearRedo && ( ImplGetRedoActionCount_Lock( CurrentLevel ) > 0 ) )