You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by or...@apache.org on 2012/06/15 13:42:45 UTC
svn commit: r1350585 - in /incubator/ooo/trunk: ./
main/svl/source/undo/undo.cxx
Author: orw
Date: Fri Jun 15 11:42:45 2012
New Revision: 1350585
URL: http://svn.apache.org/viewvc?rev=1350585&view=rev
Log:
#119400# - method <SfxUndoManager::ImplAddUndoAction_NoNotify(..)>
- correct condition for merging undo actions
merged from branch AOO34
Found by: DonJaime <donjaime at freenet dot de>
Patch by: hanya <hanya.runo at gmail dot com>
Review by: Oliver <orw at apache dot org>
Modified:
incubator/ooo/trunk/ (props changed)
incubator/ooo/trunk/main/svl/source/undo/undo.cxx
Propchange: incubator/ooo/trunk/
------------------------------------------------------------------------------
Merged /incubator/ooo/branches/AOO34:r1350569
Modified: incubator/ooo/trunk/main/svl/source/undo/undo.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svl/source/undo/undo.cxx?rev=1350585&r1=1350584&r2=1350585&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svl/source/undo/undo.cxx (original)
+++ incubator/ooo/trunk/main/svl/source/undo/undo.cxx Fri Jun 15 11:42:45 2012
@@ -627,7 +627,7 @@ bool SfxUndoManager::ImplAddUndoAction_N
// 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 && pMergeWithAction->Merge( pAction ) ) )
{
i_guard.markForDeletion( pAction );
return false;