diff options
| author | Oliver-Rainer Wittmann <orw@apache.org> | 2012-06-15 10:42:45 +0000 |
|---|---|---|
| committer | Oliver-Rainer Wittmann <orw@apache.org> | 2012-06-15 10:42:45 +0000 |
| commit | 5ee01da78720425d7f8e4c647a9efda36ca25df6 (patch) | |
| tree | be0a3751bbcf044dbd57cd9facdff9a6f1b86dba /svl | |
| parent | 980cf32beb48ef0799794b2bc133fe1adb018bf3 (diff) | |
#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>
Notes
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/undo/undo.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx index 54970054e31a..889692645130 100644 --- a/svl/source/undo/undo.cxx +++ b/svl/source/undo/undo.cxx @@ -627,7 +627,7 @@ 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 && pMergeWithAction->Merge( pAction ) ) ) { i_guard.markForDeletion( pAction ); return false; |