anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-10 18:58:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert 4323/2 fix addRow -> appendRow part

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21451 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Martin Vermeer 2007-11-05 20:54:28 +00:00
parent 5216137bdb
commit 1c05c37696
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mathed/InsetMathArray.cpp
View File

@ -63,7 +63,7 @@ InsetMathArray::InsetMathArray(docstring const & name, docstring const & str)
} }
for (row_type row = 1; row < dat.size(); ++row) for (row_type row = 1; row < dat.size(); ++row)
appendRow(0); addRow(0);
for (col_type col = 1; col < dat[0].size(); ++col) for (col_type col = 1; col < dat[0].size(); ++col)
addCol(0); addCol(0);
for (row_type row = 0; row < dat.size(); ++row) for (row_type row = 0; row < dat.size(); ++row)

8
src/mathed/InsetMathGrid.cpp
View File

@ -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()); rowinfo_.insert(rowinfo_.begin() + row + 1, RowInfo());
cells_.insert cells_.insert
@ -715,7 +715,7 @@ void InsetMathGrid::delRow(row_type row)
void InsetMathGrid::copyRow(row_type row) void InsetMathGrid::copyRow(row_type row)
{ {
appendRow(row); addRow(row);
for (col_type col = 0; col < ncols(); ++col) for (col_type col = 0; col < ncols(); ++col)
cells_[(row + 1) * ncols() + col] = cells_[row * 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: { case LFUN_BREAK_LINE: {
cur.recordUndoInset(); cur.recordUndoInset();
row_type const r = cur.row(); row_type const r = cur.row();
appendRow(r); addRow(r);
// split line // split line
for (col_type c = col(cur.idx()) + 1; c < ncols(); ++c) 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()); halign('c', cur.col());
else if (s == "append-row") else if (s == "append-row")
for (int i = 0, n = extractInt(is); i < n; ++i) for (int i = 0, n = extractInt(is); i < n; ++i)
appendRow(cur.row()); addRow(cur.row());
else if (s == "delete-row") { else if (s == "delete-row") {
cur.clearSelection(); // bug 4323 cur.clearSelection(); // bug 4323
for (int i = 0, n = extractInt(is); i < n; ++i) { for (int i = 0, n = extractInt(is); i < n; ++i) {

2
src/mathed/InsetMathGrid.h
View File

@ -168,7 +168,7 @@ public:
void idxGlue(idx_type idx); void idxGlue(idx_type idx);
/// add a row, one row down /// add a row, one row down
virtual void appendRow(row_type r); virtual void addRow(row_type r);
/// delete a row /// delete a row
virtual void delRow(row_type r); virtual void delRow(row_type r);
/// copy a row /// copy a row

4
src/mathed/InsetMathHull.cpp
View File

@ -622,7 +622,7 @@ void InsetMathHull::addRow(row_type row)
return; return;
nonum_.insert(nonum_.begin() + row + 1, !numberedType()); nonum_.insert(nonum_.begin() + row + 1, !numberedType());
label_.insert(label_.begin() + row + 1, docstring()); 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(); MathData ar = cur.cell();
lyxerr << "use cell: " << ar << endl; lyxerr << "use cell: " << ar << endl;
// FIXME: temporarily disabled // FIXME: temporarily disabled
appendRow(cur.row()); addRow(cur.row());
++cur.idx(); ++cur.idx();
++cur.idx(); ++cur.idx();
cur.cell() = eq; cur.cell() = eq;

2
src/mathed/MathParser.cpp
View File

@ -116,7 +116,7 @@ bool addRow(InsetMathGrid & grid, InsetMathGrid::row_type & cellrow,
++cellrow; ++cellrow;
if (cellrow == grid.nrows()) { if (cellrow == grid.nrows()) {
//lyxerr << "adding row " << cellrow << endl; //lyxerr << "adding row " << cellrow << endl;
grid.appendRow(cellrow - 1); grid.addRow(cellrow - 1);
if (cellrow == grid.nrows()) { if (cellrow == grid.nrows()) {
// We can't add a row to this grid, so let's // We can't add a row to this grid, so let's
// append the content of this cell to the previous // append the content of this cell to the previous