From: Vincent van Ravesteijn <vfr@lyx.org>
Date: Fri, 19 Nov 2010 03:31:13 +0000 (+0000)
Subject: Fix bug #7007: Horizontal table alignment display broken.
X-Git-Tag: 2.0.0~1772
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=a3c01d2e25f27e630b52529925eadfb5e1d76886;p=features.git

Fix bug #7007: Horizontal table alignment display broken.

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

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index fc3afb3c3f..f01bdb5002 100644
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -1032,9 +1032,14 @@ void Tabular::setAlignment(idx_type cell, LyXAlignment 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);
+	}
+	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);
+			}
+		}
 	}
 }