Minor code shuffle.

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

diff --git a/src/tabular-old.C b/src/tabular-old.C
index 7ec6fbd2d0ce5d5b80b7d932025d35a5db55e5c6..ec9c0fe9bc2495f9b8d457097ed45efbec610500 100644 (file)
--- a/src/tabular-old.C
+++ b/src/tabular-old.C
@@ -3,7 +3,7 @@
  * 
  *           LyX, The Document Processor
  *      
- *           Copyright 2000 The LyX Team.
+ *           Copyright 2000-2001 The LyX Team.
  *
  *           @author: Jürgen Vigna
  *
@@ -20,6 +20,9 @@ using std::istream;
 using std::getline;
 using std::endl;
 
+#ifndef CXX_GLOBAL_CSTD
+using std::strlen;
+#endif
 
 namespace {
 
@@ -28,8 +31,8 @@ bool getTokenValue(string const & str, const char * token, string & ret)
     size_t token_length = strlen(token);
     string::size_type pos = str.find(token);
 
-    if (pos == string::npos || pos+token_length+1 >= str.length()
-       || str[pos+token_length] != '=')
+    if (pos == string::npos || pos + token_length + 1 >= str.length()
+       || str[pos + token_length] != '=')
        return false;
     ret.erase();
     pos += token_length + 1;
@@ -203,7 +206,7 @@ void LyXTabular::ReadOld(Buffer const * buf, istream & is,
            getTokenValue(line, "special", cell_info[i][j].align_special);
            l_getline(is, line);
            if (prefixIs(line, "\\begin_inset")) {
-               cell_info[i][j].inset.Read(buf, lex);
+               cell_info[i][j].inset.read(buf, lex);
                l_getline(is, line);
            }
            if (line != "</Cell>") {