anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-13 09:15:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reverting crashing patch for 4323

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_5_X@21438 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Martin Vermeer 2007-11-05 14:10:10 +00:00
parent 2b310c8157
commit 5c7dd90532
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mathed/InsetMathArray.cpp
View File

@ -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)

10
src/mathed/InsetMathGrid.cpp
View File

@ -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") {

6
src/mathed/InsetMathGrid.h
View File

@ -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);

4
src/mathed/InsetMathHull.cpp
View File

@ -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;

2
src/mathed/MathParser.cpp
View File

@ -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