From 8a5f90a96cb674de37dd4c7b939185d315f947a3 Mon Sep 17 00:00:00 2001
From: Martin Vermeer <martin.vermeer@hut.fi>
Date: Tue, 14 Aug 2007 08:42:22 +0000
Subject: [PATCH] Partially revert bug 580 fix

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_5_X@19550 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/insets/InsetTabular.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index 0983f3d971..2504f97f6d 100644
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -773,6 +773,10 @@ void Tabular::set_row_column_number_info()
 			if (cell_info[row][column].multicolumn
 				!= Tabular::CELL_PART_OF_MULTICOLUMN)
 				++numberofcells;
+			// Shouldn't happen after above fix - MV
+			BOOST_ASSERT(numberofcells == 0);
+			cell_info[row][column].cellno =
+				numberofcells - 1;
 		}
 	}