Author: vfr
Date: Wed Jan 5 13:56:54 2011
New Revision: 37112
URL: http://www.lyx.org/trac/changeset/37112
Log:
branch: Fix bug #7106: iterator out of range while copying multi-row math.
see r37108.
Modified:
lyx-devel/branches/BRANCH_1_6_X/src/mathed/InsetMathGrid.cpp
lyx-devel/branches/BRANCH_1_6_X/status.16x
Modified: lyx-devel/branches/BRANCH_1_6_X/src/mathed/InsetMathGrid.cpp
==============================================================================
--- lyx-devel/branches/BRANCH_1_6_X/src/mathed/InsetMathGrid.cpp Wed Jan
5 01:59:39 2011 (r37111)
+++ lyx-devel/branches/BRANCH_1_6_X/src/mathed/InsetMathGrid.cpp Wed Jan
5 13:56:54 2011 (r37112)
@@ -65,9 +65,9 @@
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();
}
Modified: lyx-devel/branches/BRANCH_1_6_X/status.16x
==============================================================================
--- lyx-devel/branches/BRANCH_1_6_X/status.16x Wed Jan 5 01:59:39 2011
(r37111)
+++ lyx-devel/branches/BRANCH_1_6_X/status.16x Wed Jan 5 13:56:54 2011
(r37112)
@@ -88,6 +88,8 @@
- 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).
