J�rgen Spitzm�ller's tweak of the Paragraph dialog.

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

diff --git a/src/tabular-old.C b/src/tabular-old.C
index b769acc2296cb0103ab58a7764b710c802a76664..782d8e71d46fa6488635495ff0bba8bbb55d59eb 100644 (file)
--- a/src/tabular-old.C
+++ b/src/tabular-old.C
@@ -20,12 +20,15 @@ using std::istream;
 using std::getline;
 using std::endl;
 
+#ifndef CXX_GLOBAL_CSTD
+using std::strlen;
+#endif
 
 namespace {
 
-bool getTokenValue(string const & str, const char * token, string & ret)
+bool getTokenValue(string const & str, char const * token, string & ret)
 {
-    size_t token_length = std::strlen(token);
+    size_t token_length = strlen(token);
     string::size_type pos = str.find(token);
 
     if (pos == string::npos || pos + token_length + 1 >= str.length()
@@ -45,15 +48,15 @@ bool getTokenValue(string const & str, const char * token, string & ret)
 }
 
 
-bool getTokenValue(string const & str, const char * token, int & num)
+bool getTokenValue(string const & str, char const * token, int & num)
 {
     string::size_type pos = str.find(token);
-    char ch = str[pos + std::strlen(token)];
+    char ch = str[pos + strlen(token)];
 
     if ((pos == string::npos) || (ch != '='))
        return false;
     string ret;
-    pos += std::strlen(token) + 1;
+    pos += strlen(token) + 1;
     ch = str[pos];
     if ((ch != '"') && (ch != '\'')) { // only read till next space
        if (!isdigit(ch))
@@ -69,7 +72,7 @@ bool getTokenValue(string const & str, const char * token, int & num)
 }
 
 
-bool getTokenValue(string const & str, const char * token, LyXAlignment & num)
+bool getTokenValue(string const & str, char const * token, LyXAlignment & num)
 {
     int tmp;
     bool const ret = getTokenValue(str, token, tmp);
@@ -78,7 +81,7 @@ bool getTokenValue(string const & str, const char * token, LyXAlignment & num)
 }
 
 
-bool getTokenValue(string const & str, const char * token,
+bool getTokenValue(string const & str, char const * token,
                   LyXTabular::VAlignment & num)
 {
     int tmp;
@@ -88,7 +91,7 @@ bool getTokenValue(string const & str, const char * token,
 }
 
 
-bool getTokenValue(string const & str, const char * token,
+bool getTokenValue(string const & str, char const * token,
                   LyXTabular::BoxType & num)
 {
     int tmp;
@@ -98,15 +101,15 @@ bool getTokenValue(string const & str, const char * token,
 }
 
 
-bool getTokenValue(string const & str, const char * token, bool & flag)
+bool getTokenValue(string const & str, char const * token, bool & flag)
 {
     string::size_type pos = str.find(token);
-    char ch = str[pos + std::strlen(token)];
+    char ch = str[pos + strlen(token)];
 
     if ((pos == string::npos) || (ch != '='))
        return false;
     string ret;
-    pos += std::strlen(token) + 1;
+    pos += strlen(token) + 1;
     ch = str[pos];
     if ((ch != '"') && (ch != '\'')) { // only read till next space
        if (!isdigit(ch))
@@ -126,7 +129,7 @@ inline
 void l_getline(istream & is, string & str)
 {
 #ifdef WITH_WARNINGS
-#warning old l_getline
+//#warning old l_getline
 #endif
     getline(is, str);
     while(str.empty())
@@ -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>") {