svl/source/undo/undo.cxx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
New commits: commit a20b6ed44995c91211b090a8470e0dd64079269e Author: Ivan Timofeev <timofeev....@gmail.com> Date: Thu Jun 28 13:12:56 2012 +0400 i#119400 repair broken undo Change-Id: I36d74fe1555bd436f93a5fa595e7da05bbd37493 (cherry picked from commit 1eed4c837828c00dff4ef0b2cf29b1e2962e912d) diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx index e27bf00..e916675 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 _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits