View | Details | Raw Unified | Return to issue 119400
Collapse All | Expand All

(-)svl/source/undo/undo.cxx (-1 / +1 lines)
Lines 627-633 Link Here
627 
    // merge, if required
 627 
    // merge, if required
628 
	SfxUndoAction* pMergeWithAction = m_pData->pActUndoArray->nCurUndoAction ?
 628 
	SfxUndoAction* pMergeWithAction = m_pData->pActUndoArray->nCurUndoAction ?
629 
		m_pData->pActUndoArray->aUndoActions[m_pData->pActUndoArray->nCurUndoAction-1].pAction : NULL;
 629 
		m_pData->pActUndoArray->aUndoActions[m_pData->pActUndoArray->nCurUndoAction-1].pAction : NULL;
630 
	if ( bTryMerge && ( !pMergeWithAction || !pMergeWithAction->Merge( pAction ) ) )
 630 
	if ( bTryMerge && ( pMergeWithAction && pMergeWithAction->Merge( pAction ) ) )
631 
    {
 631 
    {
632 
        i_guard.markForDeletion( pAction );
 632 
        i_guard.markForDeletion( pAction );
633 
        return false;
 633 
        return false;

Return to issue 119400