I\89/1ÀH\8b\$\bH\8bl$\10L\8bd$\18L\8bl$ L\8bt$(L\8b|$0H\83Ä8ÃM\85ö¸\f

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 ab86aed56d35602566f2db09165336eeb94b64ed..deface7ce1d12db4b8ba29087fd6c0069f8fa342 100644 (file)
--- 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;
        }