From: Martin Vermeer Date: Mon, 5 Nov 2007 20:54:28 +0000 (+0000) Subject: Revert 4323/2 fix addRow -> appendRow part X-Git-Tag: 1.6.10~7472 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=1c05c37696e0e9f04e3942e714d3280bbf895b20;p=lyx.git Revert 4323/2 fix addRow -> appendRow part git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21451 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/src/mathed/InsetMathArray.cpp b/src/mathed/InsetMathArray.cpp index 31b5f4f9b3..8ce2b8f676 100644 --- a/src/mathed/InsetMathArray.cpp +++ b/src/mathed/InsetMathArray.cpp @@ -63,7 +63,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 dbc79f5902..5c7d1d1fb7 100644 --- a/src/mathed/InsetMathGrid.cpp +++ b/src/mathed/InsetMathGrid.cpp @@ -677,7 +677,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 @@ -715,7 +715,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]; } @@ -1121,7 +1121,7 @@ void InsetMathGrid::doDispatch(Cursor & cur, FuncRequest & cmd) case LFUN_BREAK_LINE: { cur.recordUndoInset(); row_type const r = cur.row(); - appendRow(r); + addRow(r); // split line for (col_type c = col(cur.idx()) + 1; c < ncols(); ++c) @@ -1159,7 +1159,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) { diff --git a/src/mathed/InsetMathGrid.h b/src/mathed/InsetMathGrid.h index e49aa500fe..7663d3ec2c 100644 --- a/src/mathed/InsetMathGrid.h +++ b/src/mathed/InsetMathGrid.h @@ -168,7 +168,7 @@ public: void idxGlue(idx_type idx); /// add a row, one row down - virtual void appendRow(row_type r); + virtual void addRow(row_type r); /// delete a row virtual void delRow(row_type r); /// copy a row diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp index daa89e1bb1..31befd95e4 100644 --- a/src/mathed/InsetMathHull.cpp +++ b/src/mathed/InsetMathHull.cpp @@ -622,7 +622,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); } @@ -1019,7 +1019,7 @@ void InsetMathHull::doExtern(Cursor & cur, FuncRequest & func) MathData ar = cur.cell(); lyxerr << "use cell: " << ar << endl; // FIXME: temporarily disabled - 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 84ed4d2e43..fedb313445 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