remove broken xpm

[lyx.git] / src / tabular.C

diff --git a/src/tabular.C b/src/tabular.C
index eae53660711a8fe4c323e176fa63c252b4d111f5..68696aadd9d5457263079e8d33861969064b21eb 100644 (file)
--- a/src/tabular.C
+++ b/src/tabular.C
@@ -35,7 +35,7 @@
 #include "frontends/Alert.h"
 #include "gettext.h"
 #include "tabular_funcs.h"
-#include "lyxtextclasslist.h"
+#include "lyxlex.h"
 
 #include <algorithm>
 #include <cstdlib>
@@ -472,7 +472,7 @@ bool LyXTabular::LeftLine(int cell, bool onlycolumn) const
 #ifdef SPECIAL_COLUM_HANDLING
                if (cellinfo_of_cell(cell)->align_special.empty())
                        return cellinfo_of_cell(cell)->left_line;
-               return prefixIs(frontStrip(cellinfo_of_cell(cell)->align_special), "|");
+               return prefixIs(ltrim(cellinfo_of_cell(cell)->align_special), "|");
 #else
                return cellinfo_of_cell(cell)->left_line;
 #endif
@@ -480,7 +480,7 @@ bool LyXTabular::LeftLine(int cell, bool onlycolumn) const
 #ifdef SPECIAL_COLUM_HANDLING
        if (column_info[column_of_cell(cell)].align_special.empty())
                return column_info[column_of_cell(cell)].left_line;
-       return prefixIs(frontStrip(column_info[column_of_cell(cell)].align_special), "|");
+       return prefixIs(ltrim(column_info[column_of_cell(cell)].align_special), "|");
 #else
        return column_info[column_of_cell(cell)].left_line;
 #endif
@@ -495,7 +495,7 @@ bool LyXTabular::RightLine(int cell, bool onlycolumn) const
 #ifdef SPECIAL_COLUM_HANDLING
                if (cellinfo_of_cell(cell)->align_special.empty())
                        return cellinfo_of_cell(cell)->right_line;
-               return suffixIs(strip(cellinfo_of_cell(cell)->align_special), "|");
+               return suffixIs(rtrim(cellinfo_of_cell(cell)->align_special), "|");
 #else
                return cellinfo_of_cell(cell)->right_line;
 #endif
@@ -503,7 +503,7 @@ bool LyXTabular::RightLine(int cell, bool onlycolumn) const
 #ifdef SPECIAL_COLUM_HANDLING
        if (column_info[column_of_cell(cell)].align_special.empty())
                return column_info[right_column_of_cell(cell)].right_line;
-       return suffixIs(strip(column_info[column_of_cell(cell)].align_special), "|");
+       return suffixIs(rtrim(column_info[column_of_cell(cell)].align_special), "|");
 #else
        return column_info[right_column_of_cell(cell)].right_line;
 #endif
@@ -1449,7 +1449,7 @@ void LyXTabular::OldFormatRead(BufferParams const & bp,
        Paragraph * par = new Paragraph;
        Paragraph * return_par = 0;
 
-       par->layout(textclasslist[bp.textclass].defaultLayout());
+       par->layout(bp.getLyXTextClass().defaultLayout());
 
        string tmptok;
        int pos = 0;
@@ -1468,19 +1468,8 @@ void LyXTabular::OldFormatRead(BufferParams const & bp,
                        || token == "\\end_deeper")
                {
                        lex.pushToken(token);
-#ifndef NO_COMPABILITY
-                       // Here we need to insert the inset_ert_contents into the last
-                       // cell of the tabular.
-                       owner_->bufferOwner()->insertErtContents(par, pos);
-#endif
                        break;
                }
-#ifndef NO_COMPABILITY
-               if (token == "\\newline")
-                       // Here we need to insert the inset_ert_contents into the last
-                       // cell of the tabular.
-                       owner_->bufferOwner()->insertErtContents(par, pos, false);
-#endif
                if (owner_->bufferOwner()->parseSingleLyXformat2Token(lex, par,
                                                                                                                          return_par,
                                                                                                                          token, pos,
@@ -2208,7 +2197,7 @@ int LyXTabular::TeXRow(ostream & os, int const i, Buffer const * buf,
                InsetText * inset = GetCellInset(cell);
 
                bool rtl = inset->paragraph()->isRightToLeftPar(buf->params) &&
-                       inset->paragraph()->size() > 0 && GetPWidth(cell).zero();
+                       !inset->paragraph()->empty() && GetPWidth(cell).zero();
 
                if (rtl)
                        os << "\\R{";