Natbib authoryear uses (Ref1; Ref2) by default.

[lyx.git] / src / mathed / InsetMathArray.cpp

diff --git a/src/mathed/InsetMathArray.cpp b/src/mathed/InsetMathArray.cpp
index f8cc87e7726f92e6e64a24fbd1b75cf9cd0a8e95..821f4605e8f119a5fa74210d319ad9e9d06f4887 100644 (file)
--- a/src/mathed/InsetMathArray.cpp
+++ b/src/mathed/InsetMathArray.cpp
@@ -28,19 +28,21 @@ using namespace std;
 namespace lyx {
 
 
-InsetMathArray::InsetMathArray(docstring const & name, int m, int n)
-       : InsetMathGrid(m, n), name_(name)
+InsetMathArray::InsetMathArray(Buffer * buf, docstring const & name, int m,
+               int n)
+       : InsetMathGrid(buf, m, n), name_(name)
 {}
 
 
-InsetMathArray::InsetMathArray(docstring const & name, int m, int n,
-               char valign, docstring const & halign)
-       : InsetMathGrid(m, n, valign, halign), name_(name)
+InsetMathArray::InsetMathArray(Buffer * buf, docstring const & name, int m,
+               int n, char valign, docstring const & halign)
+       : InsetMathGrid(buf, m, n, valign, halign), name_(name)
 {}
 
 
-InsetMathArray::InsetMathArray(docstring const & name, docstring const & str)
-       : InsetMathGrid(1, 1), name_(name)
+InsetMathArray::InsetMathArray(Buffer * buf, docstring const & name,
+               docstring const & str)
+       : InsetMathGrid(buf, 1, 1), name_(name)
 {
        vector< vector<string> > dat;
        istringstream is(to_utf8(str));
@@ -49,7 +51,7 @@ InsetMathArray::InsetMathArray(docstring const & name, docstring const & str)
                istringstream ls(line);
                typedef istream_iterator<string> iter;
                vector<string> v = vector<string>(iter(ls), iter());
-               if (v.size())
+               if (!v.empty())
                        dat.push_back(v);
        }
 
@@ -60,8 +62,7 @@ InsetMathArray::InsetMathArray(docstring const & name, docstring const & str)
        for (row_type row = 0; row < dat.size(); ++row)
                for (col_type col = 0; col < dat[0].size(); ++col)
                        mathed_parse_cell(cell(index(row, col)),
-                                         from_utf8(dat[row][col]),
-                                         Parse::NORMAL, &buffer());
+                                         from_utf8(dat[row][col]), Parse::NORMAL);
 }