From: Jürgen Spitzmüller <spitz@lyx.org>
Date: Fri, 12 Sep 2008 17:25:11 +0000 (+0000)
Subject: I‰/1ÀH‹\$H‹l$L‹d$L‹l$ L‹t$(L‹|$0HƒÄ8ÃM…ö¸
X-Git-Tag: 1.6.10~3482
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=a3392f4088a423fdf288cabe3a787848b68998ad;p=features.git

I‰/1ÀH‹\$H‹l$L‹d$L‹l$ L‹t$(L‹|$0HƒÄ8ÃM…ö¸

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

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index ab86aed56d..deface7ce1 100644
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -1011,9 +1011,9 @@ void Tabular::setColumnPWidth(Cursor & cur, idx_type cell,
 
 bool Tabular::setFixedWidth(row_type r, col_type c)
 {
-	if (!column_info[c].p_width.zero() ||
-				(cell_info[r][c].multicolumn != CELL_NORMAL && 
-				!cell_info[r][c].p_width.zero())) {
+	bool const multicol = cell_info[r][c].multicolumn != CELL_NORMAL;
+	if ((!column_info[c].p_width.zero() && !multicol)
+	    || (multicol && !cell_info[r][c].p_width.zero())) {
 		cell_info[r][c].inset->toggleFixedWidth(true);
 		return true;
 	}