Attachment 153357 Details for Bug 237649 – likely patch for this

[patch] likely patch for this

undo.patch (text/plain), 2.41 KB, created by Caolan McNamara on 2007-04-24 14:47:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Caolan McNamara

Created: 2007-04-24 14:47:35 UTC

Size: 2.41 KB

patch

obsolete

>Index: source/ui/view/outlview.cxx
>===================================================================
>RCS file: /cvs/graphics/sd/source/ui/view/outlview.cxx,v
>retrieving revision 1.42
>retrieving revision 1.42.38.1
>diff -u -r1.42 -r1.42.38.1
>--- source/ui/view/outlview.cxx	16 Sep 2006 19:41:44 -0000	1.42
>+++ source/ui/view/outlview.cxx	25 Oct 2006 16:55:58 -0000	1.42.38.1
>@@ -1856,6 +1856,7 @@
> 					// the top EditUndo of the previous undo list
> 
> 					// first remove the merged undo action
>+					DBG_ASSERT( pListAction->aUndoActions[nEditPos] == pEditUndo, "sd::OutlineView::TryToMergeUndoActions(), wrong edit pos!" );
> 					pListAction->aUndoActions.Remove(nEditPos);
> 					delete pEditUndo;
> 
>@@ -1882,15 +1883,14 @@
> 
> 							if( pSourceList && pDestinationList )
> 							{
>-								const USHORT nCount = pSourceList->aUndoActions.Count();
>-								nAction = 0;
>+								USHORT nCount = pSourceList->aUndoActions.Count();
> 								USHORT nDestAction = pDestinationList->aUndoActions.Count();
>-								while( nAction < nCount )
>+								while( nCount-- )
> 								{
>-									const SfxUndoAction* pTemp = pSourceList->aUndoActions.GetObject(nAction++);
>+									const SfxUndoAction* pTemp = pSourceList->aUndoActions.GetObject(0);
>+									pSourceList->aUndoActions.Remove(0);
> 									pDestinationList->aUndoActions.Insert( pTemp, nDestAction++ );
> 								}
>-								pSourceList->aUndoActions.Remove( nCount - 1 );
> 								pDestinationList->nCurUndoAction = pDestinationList->aUndoActions.Count();
> 
> 								pListAction->aUndoActions.Remove(0);
>@@ -1906,17 +1906,15 @@
> 						// now we have to move all remaining doc undo actions from the top undo
> 						// list to the previous undo list and remove the top undo list
> 
>-						const USHORT nCount = pListAction->aUndoActions.Count();
>-						nAction = 0;
>+						USHORT nCount = pListAction->aUndoActions.Count();
> 						USHORT nDestAction = pPrevListAction->aUndoActions.Count();
>-						while( nAction < nCount )
>+						while( nCount-- )
> 						{
>-							const SfxUndoAction* pTemp = pListAction->aUndoActions.GetObject(nAction++);
>+							const SfxUndoAction* pTemp = pListAction->aUndoActions.GetObject(0);
>+							pListAction->aUndoActions.Remove(0);
> 							if( pTemp )
> 								pPrevListAction->aUndoActions.Insert( pTemp, nDestAction++ );
> 						}
>-
>-						pListAction->aUndoActions.Remove( nCount - 1 );
> 						pPrevListAction->nCurUndoAction = pPrevListAction->aUndoActions.Count();
> 					}
>

Actions: View | Diff

Attachments on bug 237649: 153357 | 154734 | 155596