From: Uwe Stöhr <uwestoehr@web.de>
Date: Sat, 30 Oct 2010 18:11:37 +0000 (+0000)
Subject: InsetTabular.cpp: multirows inherit the width and the alignment from the column;... 
X-Git-Tag: 2.0.0~2168
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=eb0c10b6b484b7afbc0fbaaa8505d1ebe988ca6a;p=features.git

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
---

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;
 		}
 }