URL: http://www.lyx.org/trac/changeset/28407
Log:
Fix bug 5750: http://bugzilla.lyx.org/show_bug.cgi?id=5750.
Wrong width display of multicolumn cells.
When changing a custom width cell into a multicolumn, the isFixedWidth bool
should be set to false. Now, the function setFixedWidth could only set
isFixedWidth to true when needed.
Modified:
lyx-devel/trunk/src/insets/InsetTabular.cpp
Modified: lyx-devel/trunk/src/insets/InsetTabular.cpp
URL:
http://www.lyx.org/trac/file/lyx-devel/trunk/src/insets/InsetTabular.cpp?rev=28407
==============================================================================
--- lyx-devel/trunk/src/insets/InsetTabular.cpp (original)
+++ lyx-devel/trunk/src/insets/InsetTabular.cpp Mon Feb 9 10:02:50 2009
@@ -1022,12 +1022,10 @@
bool Tabular::setFixedWidth(row_type r, col_type c) {
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;
- }
- return false;
+ bool const fixed_width = (!column_info[c].p_width.zero() && !multicol)
+ || (multicol && !cell_info[r][c].p_width.zero());
+ cell_info[r][c].inset->toggleFixedWidth(fixed_width);
+ return fixed_width;
}
Also for branch ?
Vincent
