Skip to content

C
core
Kaydet (Commit) 1eed4c83 authored tarafından Ivan Timofeev's avatar Ivan Timofeev
Dosyalara gözat
Seçenekler

i#119400 repair broken undo 

Change-Id: I36d74fe1555bd436f93a5fa595e7da05bbd37493
üst b4fae029
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
svl/source/undo/undo.cxx
Dosyayı görüntüle @ 1eed4c83
...@@ -635,11 +635,15 @@ bool SfxUndoManager::ImplAddUndoAction_NoNotify( SfxUndoAction *pAction, bool bT ...@@ -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 ) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment