diff options
| author | Ivan Timofeev <timofeev.i.s@gmail.com> | 2012-06-28 13:12:56 +0400 |
|---|---|---|
| committer | Ivan Timofeev <timofeev.i.s@gmail.com> | 2012-06-28 14:02:35 +0400 |
| commit | a20b6ed44995c91211b090a8470e0dd64079269e (patch) | |
| tree | fde5687497a34db85113a5fff592f2ed67cfdfb7 /svl | |
| parent | 1a19e67d1a20d448d4e0f64647540f6ecc7b7e51 (diff) | |
i#119400 repair broken undo
Change-Id: I36d74fe1555bd436f93a5fa595e7da05bbd37493
(cherry picked from commit 1eed4c837828c00dff4ef0b2cf29b1e2962e912d)
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/undo/undo.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx index e27bf00e5ba4..e9166758cd17 100644 --- a/svl/source/undo/undo.cxx +++ b/svl/source/undo/undo.cxx @@ -635,10 +635,14 @@ bool SfxUndoManager::ImplAddUndoAction_NoNotify( SfxUndoAction *pAction, bool bT // merge, if required SfxUndoAction* pMergeWithAction = m_pData->pActUndoArray->nCurUndoAction ? m_pData->pActUndoArray->aUndoActions[m_pData->pActUndoArray->nCurUndoAction-1].pAction : NULL; - if ( bTryMerge && ( !pMergeWithAction || !pMergeWithAction->Merge( pAction ) ) ) + if ( bTryMerge && pMergeWithAction ) { - i_guard.markForDeletion( pAction ); - return false; + bool bMerged = pMergeWithAction->Merge( pAction ); + if ( bMerged ) + { + i_guard.markForDeletion( pAction ); + return false; + } } // clear redo stack, if requested |