forgot these

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

diff --git a/src/tabular-old.C b/src/tabular-old.C
index 52866d5dc3a7327fa455e3a2ae9b9fb7636842a8..3e06db9a68b5a9111f0e9fd5a3318bc1753023a9 100644 (file)
--- a/src/tabular-old.C
+++ b/src/tabular-old.C
@@ -13,8 +13,11 @@
 #include <config.h>
 
 #include "tabular.h"
+#include "buffer.h"
 #include "debug.h"
+
 #include "support/lstrings.h"
+#include "support/textutils.h"
 
 using std::istream;
 using std::getline;
@@ -59,12 +62,12 @@ bool getTokenValue(string const & str, char const * token, int & num)
     pos += strlen(token) + 1;
     ch = str[pos];
     if ((ch != '"') && (ch != '\'')) { // only read till next space
-       if (!isdigit(ch))
+       if (!IsDigit(ch))
            return false;
        ret += ch;
     }
     ++pos;
-    while ((pos < str.length() - 1) && isdigit(str[pos]))
+    while ((pos < str.length() - 1) && IsDigit(str[pos]))
        ret += str[pos++];
 
     num = strToInt(ret);
@@ -112,12 +115,12 @@ bool getTokenValue(string const & str, char const * token, bool & flag)
     pos += strlen(token) + 1;
     ch = str[pos];
     if ((ch != '"') && (ch != '\'')) { // only read till next space
-       if (!isdigit(ch))
+       if (!IsDigit(ch))
            return false;
        ret += ch;
     }
     ++pos;
-    while ((pos < str.length() - 1) && isdigit(str[pos]))
+    while ((pos < str.length() - 1) && IsDigit(str[pos]))
        ret += str[pos++];
 
     flag = strToInt(ret);
@@ -158,7 +161,7 @@ void LyXTabular::ReadOld(Buffer const * buf, istream & is,
        return;
     if (!getTokenValue(line, "columns", columns_arg))
        return;
-    Init(rows_arg, columns_arg);
+    Init(buf->params, rows_arg, columns_arg);
     l_getline(is, line);
     if (!prefixIs(line, "<Features ")) {
        lyxerr << "Wrong tabular format (expected <Feture ...> got" <<