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

Fix consecutive merging of tabular cells

Browse Source 
This is a bug reported and fixed by Edwin Leuven.

Here is how Edwin described it in his inimitable minimalist style:
  first i merge the top-left two cells in a small, say 3x3, table

  if i then merge this multicolumn cell with the remaining cell in the first row
  my table ends up all bonkers
This commit is contained in:
Jean-Marc Lasgouttes 2015-03-24 10:50:51 +01:00
parent babe5e05f8
commit 1780cb4896
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/insets/InsetTabular.cpp
View File

@ -1688,7 +1688,8 @@ Tabular::idx_type Tabular::setMultiColumn(idx_type cell, idx_type number,
cs.alignment = column_info[col].alignment; cs.alignment = column_info[col].alignment;
setRightLine(cell, right_border); setRightLine(cell, right_border);
for (idx_type i = 1; i < number; ++i) { idx_type lastcell = cellIndex(row, col + number - 1);
for (idx_type i = 1; i < lastcell - cell + 1; ++i) {
CellData & cs1 = cellInfo(cell + i); CellData & cs1 = cellInfo(cell + i);
cs1.multicolumn = CELL_PART_OF_MULTICOLUMN; cs1.multicolumn = CELL_PART_OF_MULTICOLUMN;
cs.inset->appendParagraphs(cs1.inset->paragraphs()); cs.inset->appendParagraphs(cs1.inset->paragraphs());