From: André Pönitz <poenitz@gmx.net>
Date: Wed, 30 Apr 2003 10:53:28 +0000 (+0000)
Subject: fix a regression after the recent grid handling changes
X-Git-Tag: 1.6.10~16885
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=66651dd33209e184d7a436364398c8ace704bfb5;p=features.git

fix a regression after the recent grid handling changes


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

diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog
index b465c713f2..39a8ae9ef4 100644
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -1,4 +1,8 @@
 
+2003-04-30  André Pönitz <poenitz@gmx.net>
+
+	* math_gridinset.C: fix transition to new Col/Row/CellInfo scheme
+
 2003-04-14  Angus Leeming  <leeming@lyx.org>
 
 	* math_fboxinset.C:
diff --git a/src/mathed/math_gridinset.C b/src/mathed/math_gridinset.C
index 8f1a72a1e1..6725c71cac 100644
--- a/src/mathed/math_gridinset.C
+++ b/src/mathed/math_gridinset.C
@@ -193,7 +193,7 @@ string MathGridInset::halign() const
 		res += string(colinfo_[col].lines_, '|');
 		res += colinfo_[col].align;
 	}
-	return res + string(colinfo_[ncols()].lines_, '|');
+	return res; 
 }
 
 
@@ -422,8 +422,6 @@ void MathGridInset::metricsT(TextMetricsInfo const & mi) const
 		rowinfo_[row].descent_ = desc;
 	}
 	//rowinfo_[0].ascent_       += hlinesep() * rowinfo_[0].lines_;
-	rowinfo_[nrows()].ascent_  = 0;
-	rowinfo_[nrows()].descent_ = 0;
 
 	// compute vertical offsets
 	rowinfo_[0].offset_ = 0;
@@ -460,7 +458,6 @@ void MathGridInset::metricsT(TextMetricsInfo const & mi) const
 			wid = max(wid, cell(index(row, col)).width());
 		colinfo_[col].width_ = wid;
 	}
-	colinfo_[ncols()].width_  = 0;
 
 	// compute horizontal offsets
 	colinfo_[0].offset_ = border();