some cascading name changes

[features.git] / src / tabular.C

diff --git a/src/tabular.C b/src/tabular.C
index 5744600ad5db0dcd3d488f9b3f89b1d1087e0481..02cbc7544ad35ad5fe5ceb34bb6877d7202e9021 100644 (file)
--- a/src/tabular.C
+++ b/src/tabular.C
@@ -2541,11 +2541,25 @@ void LyXTabular::Validate(LaTeXFeatures & features) const
 }
 
 
+#ifndef NEW_INSETS
+LyXTabular::BoxType LyXTabular::UseParbox(int cell) const
+{
+    LyXParagraph * par = GetCellInset(cell)->par;
+
+    for (; par; par = par->next_) {
+       for (int i = 0; i < par->Last(); ++i) {
+           if (par->GetChar(i) == LyXParagraph::META_NEWLINE)
+               return BOX_PARBOX;
+       }
+    }
+    return BOX_NONE;
+}
+#else
 LyXTabular::BoxType LyXTabular::UseParbox(int cell) const
 {
     LyXParagraph * par = GetCellInset(cell)->par;
 
-    for (; par; par = par->next) {
+    for (; par; par = par->next()) {
        for (int i = 0; i < par->Last(); ++i) {
            if (par->GetChar(i) == LyXParagraph::META_NEWLINE)
                return BOX_PARBOX;
@@ -2553,3 +2567,4 @@ LyXTabular::BoxType LyXTabular::UseParbox(int cell) const
     }
     return BOX_NONE;
 }
+#endif