From: Uwe Stöhr <uwestoehr@web.de>
Date: Sun, 25 May 2008 21:14:36 +0000 (+0000)
Subject: InsetTabular.cpp: fix the logic when \linebreaks are allowed in table cells, fixes... 
X-Git-Tag: 1.6.10~4677
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=06e0a5df206f5ca99950fcf17a7b85e663a24101;p=features.git

InsetTabular.cpp: fix the logic when \linebreaks are allowed in table cells, fixes http://bugzilla.lyx.org/show_bug.cgi?id=4839

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

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index aa7b83c063..e49c2a7a6d 100644
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -1568,10 +1568,12 @@ void Tabular::setUsebox(idx_type cell, BoxType type)
 }
 
 
+// FIXME: Remove this routine because we cannot insert \parboxes when the user
+// adds line breaks, see bug 4886.
 Tabular::BoxType Tabular::getUsebox(idx_type cell) const
 {
-	if (column_info[cellColumn(cell)].p_width.zero() &&
-		!(isMultiColumn(cell) && !cellInfo(cell).p_width.zero()))
+	if ((!column_info[cellColumn(cell)].p_width.zero() && !isMultiColumn(cell)) ||
+		(isMultiColumn(cell) && !cellInfo(cell).p_width.zero()))
 		return BOX_NONE;
 	if (cellInfo(cell).usebox > 1)
 		return cellInfo(cell).usebox;