anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Try to please windows compiler"

Browse Source 
This reverts commit a8b0e64094.
This commit is contained in:
Jean-Marc Lasgouttes 2018-09-18 23:06:36 +02:00
parent 305d449a47
commit 0920872ebd
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/insets/InsetTabular.cpp
View File

@ -6572,12 +6572,12 @@ void InsetTabular::getSelection(Cursor & cur,
cs = tabular.cellColumn(beg.idx());
ce = tabular.cellColumn(end.idx());
if (cs > ce)
std::swap(cs, ce);
swap(cs, ce);
rs = tabular.cellRow(beg.idx());
re = tabular.cellRow(end.idx());
if (rs > re)
std::swap(rs, re);
swap(rs, re);
}

16
src/mathed/InsetMathHull.cpp
View File

@ -1295,8 +1295,8 @@ void InsetMathHull::addRow(row_type row)
if (type_ == hullMultline) {
if (row + 1 == nrows()) {
numbered_[row] = NONUMBER;
std::swap(label, label_[row]);
std::swap(number, numbers_[row]);
swap(label, label_[row]);
swap(number, numbers_[row]);
} else
numbered = false;
}
@ -1314,9 +1314,9 @@ void InsetMathHull::swapRow(row_type row)
return;
if (row + 1 == nrows())
--row;
std::swap(numbered_[row], numbered_[row + 1]);
std::swap(numbers_[row], numbers_[row + 1]);
std::swap(label_[row], label_[row + 1]);
swap(numbered_[row], numbered_[row + 1]);
swap(numbers_[row], numbers_[row + 1]);
swap(label_[row], label_[row + 1]);
InsetMathGrid::swapRow(row);
}
@ -1326,9 +1326,9 @@ void InsetMathHull::delRow(row_type row)
if (nrows() <= 1 || !rowChangeOK())
return;
if (row + 1 == nrows() && type_ == hullMultline) {
std::swap(numbered_[row - 1], numbered_[row]);
std::swap(numbers_[row - 1], numbers_[row]);
std::swap(label_[row - 1], label_[row]);
swap(numbered_[row - 1], numbered_[row]);
swap(numbers_[row - 1], numbers_[row]);
swap(label_[row - 1], label_[row]);
InsetMathGrid::delRow(row);
return;
}