diff --git a/src/tabular.C b/src/tabular.C index 7f68de627c..0bba523a1d 100644 --- a/src/tabular.C +++ b/src/tabular.C @@ -1083,25 +1083,6 @@ void LyXTabular::write(Buffer const * buf, ostream & os) const } -void LyXTabular::read(Buffer const * buf, LyXLex & lex) -{ - string line; - istream & is = lex.getStream(); - - l_getline(is, line); - if (!prefixIs(line, "= 2); - read(buf, is, lex, line, version); -} - void LyXTabular::setHeaderFooterRows(int hr, int fhr, int fr, int lfr) { // set header info @@ -1179,10 +1160,24 @@ void LyXTabular::setHeaderFooterRows(int hr, int fhr, int fr, int lfr) } } -void LyXTabular::read(Buffer const * buf, istream & is, - LyXLex & lex, string const & l, int const version) + +void LyXTabular::read(Buffer const * buf, LyXLex & lex) { - string line(l); + string line; + istream & is = lex.getStream(); + + l_getline(is, line); + if (!prefixIs(line, "= 2); + int rows_arg; if (!getTokenValue(line, "rows", rows_arg)) return; diff --git a/src/tabular.h b/src/tabular.h index b2915a575f..cc562164b3 100644 --- a/src/tabular.h +++ b/src/tabular.h @@ -478,10 +478,6 @@ private: /// typedef std::vector column_vector; - /// - void read(Buffer const * buf, std::istream & is, - LyXLex & lex, string const & l, int const version); - /// /// int rows_; ///