From 6097aeb4085ba589c0aec17f902fc217bb9223d3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andr=C3=A9=20P=C3=B6nitz?= <poenitz@gmx.net>
Date: Thu, 12 Jun 2003 14:29:45 +0000
Subject: [PATCH] merge the two parts of Tabular::read()

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7166 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/tabular.C | 39 +++++++++++++++++----------------------
 src/tabular.h |  4 ----
 2 files changed, 17 insertions(+), 26 deletions(-)

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, "<lyxtabular ")
-		&& !prefixIs(line, "<LyXTabular ")) {
-		lyx::Assert(false);
-		return;
-	}
-
-	int version;
-	if (!getTokenValue(line, "version", version))
-		return;
-	lyx::Assert(version >= 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, "<lyxtabular ")
+		&& !prefixIs(line, "<LyXTabular ")) {
+		lyx::Assert(false);
+		return;
+	}
+
+	int version;
+	if (!getTokenValue(line, "version", version))
+		return;
+	lyx::Assert(version >= 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<columnstruct> column_vector;
 
-	///
-	void read(Buffer const * buf, std::istream & is,
-	          LyXLex & lex, string const & l, int const version);
-	///
 	///
 	int rows_;
 	///
-- 
2.39.2