From a3392f4088a423fdf288cabe3a787848b68998ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Spitzm=C3=BCller?= <spitz@lyx.org>
Date: Fri, 12 Sep 2008 17:25:11 +0000
Subject: [PATCH] =?UTF-8?q?I=89/1=C0H=8B\$=08H=8Bl$=10L=8Bd$=18L=8Bl$=20L?=
 =?UTF-8?q?=8Bt$(L=8B|$0H=83=C48=C3M=85=F6=B8=0C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26376 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/insets/InsetTabular.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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