From eb0c10b6b484b7afbc0fbaaa8505d1ebe988ca6a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Sat, 30 Oct 2010 18:11:37 +0000 Subject: [PATCH] InsetTabular.cpp: multirows inherit the width and the alignment from the column; this fixes #6958 partly git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35932 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/insets/InsetTabular.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp index 1a12c60b85..53dbdf85ab 100644 --- a/src/insets/InsetTabular.cpp +++ b/src/insets/InsetTabular.cpp @@ -849,14 +849,16 @@ void Tabular::updateIndexes() idx_type i = 0; for (row_type row = 0; row < nrows(); ++row) for (col_type column = 0; column < ncols(); ++column) { - if (isPartOfMultiColumn(row, column) - || isPartOfMultiRow(row, column)) + if (isPartOfMultiColumn(row, column)) continue; - rowofcell[i] = row; - columnofcell[i] = column; setFixedWidth(row, column); cell_info[row][column].inset->setContentAlignment( getAlignment(cellIndex(row, column))); + if (!isPartOfMultiRow(row, column)) { + columnofcell[i] = column; + rowofcell[i] = row; + } else + continue; ++i; } } -- 2.39.2