commit d008ca2539158ab5ddcc9b5887d8517c300c42c1
Author: Daniel Ramoeller <[email protected]>
Date: Sat Jan 30 17:03:33 2021 +0100
Preserve multirow/-column content on deletion of subrows/columns (#11380)
---
src/insets/InsetTabular.cpp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index a959a56..bf67e2a 100644
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -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);
--
lyx-cvs mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-cvs
