diff --git a/src/mathed/InsetMathArray.cpp b/src/mathed/InsetMathArray.cpp index 4c4a6905fa..544d6a47d1 100644 --- a/src/mathed/InsetMathArray.cpp +++ b/src/mathed/InsetMathArray.cpp @@ -64,7 +64,7 @@ InsetMathArray::InsetMathArray(docstring const & name, docstring const & str) } for (row_type row = 1; row < dat.size(); ++row) - appendRow(0); + addRow(0); for (col_type col = 1; col < dat[0].size(); ++col) addCol(0); for (row_type row = 0; row < dat.size(); ++row) diff --git a/src/mathed/InsetMathGrid.cpp b/src/mathed/InsetMathGrid.cpp index b82d2c61fe..74cb45edb7 100644 --- a/src/mathed/InsetMathGrid.cpp +++ b/src/mathed/InsetMathGrid.cpp @@ -679,7 +679,7 @@ docstring InsetMathGrid::eocString(col_type col, col_type lastcol) const } -void InsetMathGrid::appendRow(row_type row) +void InsetMathGrid::addRow(row_type row) { rowinfo_.insert(rowinfo_.begin() + row + 1, RowInfo()); cells_.insert @@ -717,7 +717,7 @@ void InsetMathGrid::delRow(row_type row) void InsetMathGrid::copyRow(row_type row) { - appendRow(row); + addRow(row); for (col_type col = 0; col < ncols(); ++col) cells_[(row + 1) * ncols() + col] = cells_[row * ncols() + col]; } @@ -1122,7 +1122,7 @@ void InsetMathGrid::doDispatch(Cursor & cur, FuncRequest & cmd) case LFUN_BREAK_LINE: { recordUndoInset(cur); row_type const r = cur.row(); - appendRow(r); + addRow(r); // split line for (col_type c = col(cur.idx()) + 1; c < ncols(); ++c) @@ -1160,7 +1160,7 @@ void InsetMathGrid::doDispatch(Cursor & cur, FuncRequest & cmd) halign('c', cur.col()); else if (s == "append-row") for (int i = 0, n = extractInt(is); i < n; ++i) - appendRow(cur.row()); + addRow(cur.row()); else if (s == "delete-row") { cur.clearSelection(); // bug 4323 for (int i = 0, n = extractInt(is); i < n; ++i) { @@ -1197,7 +1197,7 @@ void InsetMathGrid::doDispatch(Cursor & cur, FuncRequest & cmd) row_type const r = cur.row(); col_type const c = cur.col(); for (int i = 0, n = extractInt(is); i < n; ++i) - addCol(cur.col() + 1); + addCol(cur.col()); cur.idx() = index(r, c); } else if (s == "delete-column") { diff --git a/src/mathed/InsetMathGrid.h b/src/mathed/InsetMathGrid.h index 4cf9cf00ac..6d80ad6a4e 100644 --- a/src/mathed/InsetMathGrid.h +++ b/src/mathed/InsetMathGrid.h @@ -169,15 +169,15 @@ public: /// pulls cell after pressing erase void idxGlue(idx_type idx); - /// add a row, one row down - virtual void appendRow(row_type r); + /// add a row + virtual void addRow(row_type r); /// delete a row virtual void delRow(row_type r); /// copy a row virtual void copyRow(row_type r); /// swap two rows virtual void swapRow(row_type r); - /// add a column, here + /// add a column virtual void addCol(col_type c); /// delete a column virtual void delCol(col_type c); diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp index d683859099..f63d308fec 100644 --- a/src/mathed/InsetMathHull.cpp +++ b/src/mathed/InsetMathHull.cpp @@ -630,7 +630,7 @@ void InsetMathHull::addRow(row_type row) return; nonum_.insert(nonum_.begin() + row + 1, !numberedType()); label_.insert(label_.begin() + row + 1, docstring()); - InsetMathGrid::appendRow(row); + InsetMathGrid::addRow(row); } @@ -1031,7 +1031,7 @@ void InsetMathHull::doExtern(Cursor & cur, FuncRequest & func) #ifdef WITH_WARNINGS #warning temporarily disabled #endif - appendRow(cur.row()); + addRow(cur.row()); ++cur.idx(); ++cur.idx(); cur.cell() = eq; diff --git a/src/mathed/MathParser.cpp b/src/mathed/MathParser.cpp index e5a937e708..60861297fc 100644 --- a/src/mathed/MathParser.cpp +++ b/src/mathed/MathParser.cpp @@ -116,7 +116,7 @@ bool addRow(InsetMathGrid & grid, InsetMathGrid::row_type & cellrow, ++cellrow; if (cellrow == grid.nrows()) { //lyxerr << "adding row " << cellrow << endl; - grid.appendRow(cellrow - 1); + grid.addRow(cellrow - 1); if (cellrow == grid.nrows()) { // We can't add a row to this grid, so let's // append the content of this cell to the previous