rpms/openoffice.org/FC-6 openoffice.org-2.1.0.ooo69010.sd.undocrash.patch, NONE, 1.1 openoffice.org.spec, 1.915, 1.916

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv22243

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.1.0.ooo69010.sd.undocrash.patch 
Log Message:
add openoffice.org-2.1.0.ooo69010.sd.undocrash.patch

openoffice.org-2.1.0.ooo69010.sd.undocrash.patch:
 outlview.cxx |   20 +++++++++-----------
 1 files changed, 9 insertions(+), 11 deletions(-)

--- NEW FILE openoffice.org-2.1.0.ooo69010.sd.undocrash.patch ---
Index: outlview.cxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/view/outlview.cxx,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- openoffice.org.orig/sd/source/ui/view/outlview.cxx	16 Sep 2006 19:41:44 -0000	1.42
+++ openoffice.org/sd/source/ui/view/outlview.cxx	1 Nov 2006 10:15:41 -0000	1.43
@@ -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();
 					}
 	


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-6/openoffice.org.spec,v
retrieving revision 1.915
retrieving revision 1.916
diff -u -r1.915 -r1.916
--- openoffice.org.spec	12 Dec 2006 16:23:51 -0000	1.915
+++ openoffice.org.spec	18 Dec 2006 13:22:22 -0000	1.916
@@ -1,6 +1,6 @@
 %define oootag OOD680
 %define ooomilestone 5
-%define rh_rpm_release 5.9
+%define rh_rpm_release 5.10
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -150,6 +150,7 @@
 Patch82: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
 Patch83: openoffice.org-2.1.0.ooo70042.wmfoverflow.svtools.patch
 Patch84: openoffice.org-2.1.0.ooo72505.vcl.wrongrole.patch
+Patch85: openoffice.org-2.1.0.ooo69010.sd.undocrash.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -1034,6 +1035,7 @@
 %patch82 -p1 -b .rh217269.officecfg.nosequencecheck.patch
 %patch83 -p1 -b .ooo70042.wmfoverflow.svtools.patch
 %patch84 -p1 -b .ooo72505.vcl.wrongrole.patch
+%patch85 -p1 -b .ooo69010.sd.undocrash.patch
 
 tar xzf %{SOURCE1}
 
@@ -2559,6 +2561,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Mon Dec 18 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.5.10
+- Resolves: rhbz#219252 add openoffice.org-2.1.0.ooo69010.sd.undocrash.patch 
+
 * Tue Dec 12 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.5.9
 - Resolves: rhbz#219161 openoffice.org-2.1.0.ooo72505.vcl.wrongrole.patch