From 653e054c066047cb7f77322a3d359e956916517b Mon Sep 17 00:00:00 2001
From: Vincent van Ravesteijn <vfr@lyx.org>
Date: Wed, 5 Jan 2011 12:56:54 +0000
Subject: [PATCH] branch: Fix bug #7106: iterator out of range while copying
 multi-row math.

see r37108.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@37112 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/mathed/InsetMathGrid.cpp | 4 ++--
 status.16x                   | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/mathed/InsetMathGrid.cpp b/src/mathed/InsetMathGrid.cpp
index 49d6ab74ac..86964698f1 100644
--- a/src/mathed/InsetMathGrid.cpp
+++ b/src/mathed/InsetMathGrid.cpp
@@ -65,9 +65,9 @@ static int extractInt(istream & is)
 static void resetGrid(InsetMathGrid & grid)
 {
 	while (grid.ncols() > 1)
-		grid.delCol(grid.ncols());
+		grid.delCol(grid.ncols() - 1);
 	while (grid.nrows() > 1)
-		grid.delRow(grid.nrows());
+		grid.delRow(grid.nrows() - 1);
 	grid.cell(0).erase(0, grid.cell(0).size());
 	grid.setDefaults();
 }
diff --git a/status.16x b/status.16x
index b5dd5cfbbe..ba8b038161 100644
--- a/status.16x
+++ b/status.16x
@@ -88,6 +88,8 @@ What's new
 - Fix crash when inserting quotes with a selection spanning multiple
   paragraphs (bug 7200).
 
+- Fix assertion when pasting a column in a math matrix (bug 7106).
+
 - Remove traces of long removed index settings dialog. This fixes a crash
   when issueing the non-functional lfuns "dialog-show index" and
   "dialog-show-new-inset index" (bug 7180).