further code uglification to make Jean-Marc's compiler happy

[lyx.git] / src / mathed / math_arrayinset.C

diff --git a/src/mathed/math_arrayinset.C b/src/mathed/math_arrayinset.C
index 83577735db2a36e8e8d01bb94ff7e5a2187d9726..8e49f00026bf3dabfa2debaeca619fa944f7e68f 100644 (file)
--- a/src/mathed/math_arrayinset.C
+++ b/src/mathed/math_arrayinset.C
@@ -7,7 +7,7 @@
 
 
 MathArrayInset::MathArrayInset(int m, int n)
-       : MathGridInset(m, n, "array", LM_OT_MATRIX)
+       : MathGridInset(m, n)
 {}
 
 
@@ -17,7 +17,7 @@ MathInset * MathArrayInset::clone() const
 }
 
 
-void MathArrayInset::Write(std::ostream & os, bool fragile) const
+void MathArrayInset::write(std::ostream & os, bool fragile) const
 {
        if (fragile)
                os << "\\protect";
@@ -27,13 +27,20 @@ void MathArrayInset::Write(std::ostream & os, bool fragile) const
                os << '[' << char(v_align_) << ']';
 
        os << '{';
-       for (int col = 0; col < ncols(); ++col)
-               os << colinfo_[col].h_align_;
+       for (unsigned int col = 0; col < ncols(); ++col)
+               os << colinfo_[col].align_;
        os << "}\n";
 
-       MathGridInset::Write(os, fragile);
+       MathGridInset::write(os, fragile);
 
        if (fragile)
                os << "\\protect";
        os << "\\end{array}\n";
 }
+
+
+void MathArrayInset::metrics(MathStyles st) const
+{
+       MathGridInset::metrics(st == LM_ST_DISPLAY ? LM_ST_TEXT : st);
+}
+