InsetTabular.cpp: fix #7007

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36401 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index f01bdb50027fd262f163dfcbb34381827637ff3e..e14a688e045ed336645e8fea146d1819c6722797 100644 (file)
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -1027,19 +1027,22 @@ void Tabular::setAlignment(idx_type cell, LyXAlignment align,
                              bool onlycolumn)
 {
        col_type const col = cellColumn(cell);
+       // set alignment for the whole row of the selection is only
+       // withing one column and it is no multicolumn cell
        if (onlycolumn || !isMultiColumn(cell)) {
-               column_info[col].alignment = align;
-               docstring & dpoint = column_info[col].decimal_point;
-               if (align == LYX_ALIGN_DECIMAL && dpoint.empty())
-                       dpoint = from_utf8(lyxrc.default_decimal_point);
-       }
-       if (!onlycolumn) {
                for (row_type r = 0; r < nrows(); ++r) {
                        if (!isMultiRow(cellIndex(r, col))) {
                                cell_info[r][col].alignment = align;
                                cell_info[r][col].inset->setContentAlignment(align);
                        }
                }
+               column_info[col].alignment = align;
+               docstring & dpoint = column_info[col].decimal_point;
+               if (align == LYX_ALIGN_DECIMAL && dpoint.empty())
+                       dpoint = from_utf8(lyxrc.default_decimal_point);
+       } else { 
+               cellInfo(cell).alignment = align; 
+               cellInset(cell).get()->setContentAlignment(align); 
        }
 }