revert Buffer LyxText->InsetText commit

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

diff --git a/src/mathed/math_arrayinset.C b/src/mathed/math_arrayinset.C
index 67b5a5fb63d3fa007055b5eb11b6de609fd22e27..5794ee791354f4dce9325385e3fb74559ceb0054 100644 (file)
--- a/src/mathed/math_arrayinset.C
+++ b/src/mathed/math_arrayinset.C
@@ -19,11 +19,13 @@
 
 #include <iterator>
 
-using std::vector;
-using std::istringstream;
 using std::getline;
-using std::istream_iterator;
+
+using std::string;
 using std::auto_ptr;
+using std::istringstream;
+using std::istream_iterator;
+using std::vector;
 
 
 MathArrayInset::MathArrayInset(string const & name, int m, int n)
@@ -47,10 +49,10 @@ MathArrayInset::MathArrayInset(string const & name, string const & str)
        : MathGridInset(1, 1), name_(name)
 {
        vector< vector<string> > dat;
-       istringstream is(STRCONV(str));
+       istringstream is(str);
        string line;
        while (getline(is, line)) {
-               istringstream ls(STRCONV(line));
+               istringstream ls(line);
                typedef istream_iterator<string> iter;
                vector<string> v = vector<string>(iter(ls), iter());
                if (v.size())
@@ -77,7 +79,7 @@ void MathArrayInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        ArrayChanger dummy(mi.base);
        MathGridInset::metrics(mi);
-       metricsMarkers2();
+       metricsMarkers2(dim_);
        dim = dim_;
 }