Fix consecutive merging of tabular cells

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 d98618c7db
commit c271973b85
2 changed files with 5 additions and 2 deletions

View File

@ -1693,7 +1693,8 @@ Tabular::idx_type Tabular::setMultiColumn(idx_type cell, idx_type number,
cs.alignment = column_info[col].alignment;
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);
cs1.multicolumn = CELL_PART_OF_MULTICOLUMN;
cs.inset->appendParagraphs(cs1.inset->paragraphs());

View File

@ -135,7 +135,9 @@ What's new
- Record undo properly when changing multiple paragraphs parameters
(bug 9437).
- Do not offer unsupported macros like \biggg in autocompletion
- Do not offer unsupported macros like \biggg in autocompletion.
- Fix consecutive merging of tabular cells.
* INTERNALS