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

Implement (basic) ct for tabular-feature delete-row and delete-column

Browse Source 
Fixes part of #8469

For a proper fix that works with change-reject as well as with hide
changes in output, we need to implement
ct information in tabular's row and column.
This commit is contained in:
Juergen Spitzmueller 2019-12-29 14:09:52 +01:00
parent b37b39365f
commit 8a17cc01e0
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/insets/InsetTabular.cpp
View File

@ -745,6 +745,9 @@ void Tabular::deleteRow(row_type const row)
return;
for (col_type c = 0; c < ncols(); ++c) {
// mark track changes
if (buffer().params().track_changes)
cell_info[row][c].inset->setChange(Change(Change::DELETED));
// Care about multirow cells
if (row + 1 < nrows() &&
cell_info[row][c].multirow == CELL_BEGIN_OF_MULTIROW &&
@ -752,8 +755,10 @@ void Tabular::deleteRow(row_type const row)
cell_info[row + 1][c].multirow = CELL_BEGIN_OF_MULTIROW;
}
}
row_info.erase(row_info.begin() + row);
cell_info.erase(cell_info.begin() + row);
if (!buffer().params().track_changes) {
row_info.erase(row_info.begin() + row);
cell_info.erase(cell_info.begin() + row);
}
updateIndexes();
}
@ -859,15 +864,20 @@ void Tabular::deleteColumn(col_type const col)
return;
for (row_type r = 0; r < nrows(); ++r) {
// mark track changes
if (buffer().params().track_changes)
cell_info[r][col].inset->setChange(Change(Change::DELETED));
// Care about multicolumn cells
if (col + 1 < ncols() &&
cell_info[r][col].multicolumn == CELL_BEGIN_OF_MULTICOLUMN &&
cell_info[r][col + 1].multicolumn == CELL_PART_OF_MULTICOLUMN) {
cell_info[r][col + 1].multicolumn = CELL_BEGIN_OF_MULTICOLUMN;
}
cell_info[r].erase(cell_info[r].begin() + col);
if (!buffer().params().track_changes)
cell_info[r].erase(cell_info[r].begin() + col);
}
column_info.erase(column_info.begin() + col);
if (!buffer().params().track_changes)
column_info.erase(column_info.begin() + col);
updateIndexes();
}