From c6fa2fa10eeede779780e5d38b6e2f5b2d8f4982 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Mon, 1 Nov 2010 04:30:06 +0000 Subject: [PATCH] InsetTabular.cpp: fix #7000 git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35957 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/insets/InsetTabular.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp index 4109f8471d..28be8e9aab 100644 --- a/src/insets/InsetTabular.cpp +++ b/src/insets/InsetTabular.cpp @@ -1657,8 +1657,17 @@ void Tabular::unsetMultiColumn(idx_type cell) row_type const row = cellRow(cell); col_type const col = cellColumn(cell); row_type const span = columnSpan(cell); - for (col_type c = 0; c < span; ++c) + for (col_type c = 0; c < span; ++c) { + // in the table dialog the lines are set in every case + // when unsetting a multicolumn this leads to an additional right + // line for every cell that was part of the former multicolumn cell, + // except if the cell is in the last column + // therefore remove this line + if (cell_info[row][col + c].multicolumn = CELL_BEGIN_OF_MULTICOLUMN + && (col + c) < (col + span - 1)) + cell_info[row][col + c].right_line = false; cell_info[row][col + c].multicolumn = CELL_NORMAL; + } updateIndexes(); } -- 2.39.2