InsetTabular.cpp: multirows inherit the width and the alignment from the column;...

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 1a12c60b8593779ef3c73b5933db33ca5b137308..53dbdf85ab86ee589467a4cd72fd68a53f96c070 100644 (file)
--- 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;
                }
 }