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
This commit is contained in:
Uwe Stöhr 2010-10-30 18:11:37 +00:00
parent eef6b32eff
commit eb0c10b6b4

View File

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