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

Preserve multirow/-column content on deletion of subrows/columns (#11380)

Browse Source
This commit is contained in:
Daniel Ramoeller 2021-01-30 17:03:33 +01:00 committed by Juergen Spitzmueller
parent c567c78e90
commit d008ca2539
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/insets/InsetTabular.cpp
View File

@ -811,7 +811,7 @@ void Tabular::deleteRow(row_type const row, bool const force)
if (row + 1 < nrows() &&
cell_info[row][c].multirow == CELL_BEGIN_OF_MULTIROW &&
cell_info[row + 1][c].multirow == CELL_PART_OF_MULTIROW) {
cell_info[row + 1][c].multirow = CELL_BEGIN_OF_MULTIROW;
cell_info[row + 1][c] = cell_info[row][c];
}
}
if (ct)
@ -973,7 +973,7 @@ void Tabular::deleteColumn(col_type const col, bool const force)
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][col + 1] = cell_info[r][col];
}
if (!ct)
cell_info[r].erase(cell_info[r].begin() + col);