reverse last change

[lyx.git] / src / tabular-old.C

diff --git a/src/tabular-old.C b/src/tabular-old.C
index 3e06db9a68b5a9111f0e9fd5a3318bc1753023a9..b3906c8c58bfaa9d1f730adfd0f25b0621c56efc 100644 (file)
--- a/src/tabular-old.C
+++ b/src/tabular-old.C
@@ -1,13 +1,13 @@
 /* This file is part of
- * ====================================================== 
- * 
+ * ======================================================
+ *
  *           LyX, The Document Processor
- *      
+ *
  *           Copyright 2000-2001 The LyX Team.
  *
  *           @author: Jürgen Vigna
  *
- * ====================================================== 
+ * ======================================================
  */
 
 #include <config.h>
@@ -19,6 +19,7 @@
 #include "support/lstrings.h"
 #include "support/textutils.h"
 
+using std::abs;
 using std::istream;
 using std::getline;
 using std::endl;
@@ -134,7 +135,7 @@ bool getTokenValue(string const & str, const char * token, LyXLength & len)
        if (!getTokenValue(str, token, tmp))
                return false;
        return isValidLength(tmp, &len);
-}    
+}
 
 
 inline
@@ -164,8 +165,8 @@ void LyXTabular::ReadOld(Buffer const * buf, istream & is,
     Init(buf->params, rows_arg, columns_arg);
     l_getline(is, line);
     if (!prefixIs(line, "<Features ")) {
-       lyxerr << "Wrong tabular format (expected <Feture ...> got" <<
-           line << ")" << endl;
+       lyxerr << "Wrong tabular format (expected <Feture ...> got"
+              << line << ')' << endl;
        return;
     }
     getTokenValue(line, "islongtable", is_long_tabular);
@@ -183,8 +184,8 @@ void LyXTabular::ReadOld(Buffer const * buf, istream & is,
     for (int i = 0; i < rows_; ++i) {
        l_getline(is, line);
        if (!prefixIs(line, "<Row ")) {
-           lyxerr << "Wrong tabular format (expected <Row ...> got" <<
-               line << ")" << endl;
+           lyxerr << "Wrong tabular format (expected <Row ...> got"
+                  << line << ')' << endl;
            return;
        }
        getTokenValue(line, "topline", row_info[i].top_line);
@@ -193,8 +194,8 @@ void LyXTabular::ReadOld(Buffer const * buf, istream & is,
        for (int j = 0; j < columns_; ++j) {
            l_getline(is,line);
            if (!prefixIs(line,"<Column")) {
-               lyxerr << "Wrong tabular format (expected <Column ...> got" <<
-                   line << ")" << endl;
+               lyxerr << "Wrong tabular format (expected <Column ...> got"
+                      << line << ')' << endl;
                return;
            }
            if (!i) {
@@ -207,8 +208,8 @@ void LyXTabular::ReadOld(Buffer const * buf, istream & is,
            }
            l_getline(is, line);
            if (!prefixIs(line, "<Cell")) {
-               lyxerr << "Wrong tabular format (expected <Cell ...> got" <<
-                   line << ")" << endl;
+               lyxerr << "Wrong tabular format (expected <Cell ...> got"
+                      << line << ')' << endl;
                return;
            }
            getTokenValue(line, "multicolumn", cell_info[i][j].multicolumn);
@@ -228,21 +229,21 @@ void LyXTabular::ReadOld(Buffer const * buf, istream & is,
                l_getline(is, line);
            }
            if (line != "</Cell>") {
-               lyxerr << "Wrong tabular format (expected </Cell> got" <<
-                   line << ")" << endl;
+               lyxerr << "Wrong tabular format (expected </Cell> got"
+                      << line << ')' << endl;
                return;
            }
            l_getline(is, line);
            if (line != "</Column>") {
-               lyxerr << "Wrong tabular format (expected </Column> got" <<
-                   line << ")" << endl;
+               lyxerr << "Wrong tabular format (expected </Column> got"
+                      << line << ')' << endl;
                return;
            }
        }
        l_getline(is, line);
        if (line != "</Row>") {
-           lyxerr << "Wrong tabular format (expected </Row> got" <<
-               line << ")" << endl;
+           lyxerr << "Wrong tabular format (expected </Row> got"
+                  << line << ')' << endl;
            return;
        }
     }