several smallish changes/bugfixes/left overs from Porto

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

diff --git a/src/mathed/math_arrayinset.C b/src/mathed/math_arrayinset.C
index 6aaa618d451f5a8ecd96d4491ade78b91178d35c..d785b4cede6cb2707d87007380641cd5d78c058f 100644 (file)
--- a/src/mathed/math_arrayinset.C
+++ b/src/mathed/math_arrayinset.C
@@ -40,9 +40,8 @@ MathArrayInset::MathArrayInset(string const & name, string const & str)
 {
        vector< vector<string> > dat;
        istringstream is(str.c_str());
-       while (is) {
-               string line;
-               getline(is, line);
+       string line;
+       while (getline(is, line)) {
                istringstream ls(line.c_str());
                typedef istream_iterator<string> iter;
                vector<string> v = vector<string>(iter(ls), iter());
@@ -66,12 +65,12 @@ MathInset * MathArrayInset::clone() const
 }
 
 
-void MathArrayInset::metrics(MathMetricsInfo const & st) const
+void MathArrayInset::metrics(MathMetricsInfo & mi) const
 {
-       MathMetricsInfo mi = st;
-       if (mi.style == LM_ST_DISPLAY)
-               mi.style = LM_ST_TEXT;
-       MathGridInset::metrics(mi);
+       MathMetricsInfo m = mi;
+       if (m.base.style == LM_ST_DISPLAY)
+               m.base.style = LM_ST_TEXT;
+       MathGridInset::metrics(m);
 }