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 2f25b6a937a7b349d9764ebd84ee0dd16eb81f8c..5794ee791354f4dce9325385e3fb74559ceb0054 100644 (file)
--- a/src/mathed/math_arrayinset.C
+++ b/src/mathed/math_arrayinset.C
@@ -21,6 +21,7 @@
 
 using std::getline;
 
+using std::string;
 using std::auto_ptr;
 using std::istringstream;
 using std::istream_iterator;
@@ -48,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())
@@ -78,7 +79,7 @@ void MathArrayInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        ArrayChanger dummy(mi.base);
        MathGridInset::metrics(mi);
-       metricsMarkers2();
+       metricsMarkers2(dim_);
        dim = dim_;
 }