Painter and scrollbar API patches

[lyx.git] / src / tabular.C

diff --git a/src/tabular.C b/src/tabular.C
index 7f05319dbdf454f72bca1bde9462e9287e1c771e..f8631459c2e8e841bdccb5b5c24c72fd01d4f2c1 100644 (file)
--- a/src/tabular.C
+++ b/src/tabular.C
@@ -25,7 +25,7 @@
 #include "layout.h"
 #include "buffer.h"
 #include "BufferView.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
 #include "LaTeXFeatures.h"
 #include "insets/insettabular.h"
 #include "insets/insettext.h"
@@ -40,6 +40,7 @@
 #include <algorithm>
 #include <cstdlib>
 
+using std::abs;
 using std::ostream;
 using std::istream;
 using std::getline;
@@ -1461,7 +1462,8 @@ void LyXTabular::OldFormatRead(BufferParams const & bp,
                if (token.empty())
                        continue;
                if (token == "\\layout"
-                       || token == "\\end_float"
+                       || token == "\\end_float" // this should not exist anymore
+                       || token == "\\end_inset" // as it is substituted by this
                        || token == "\\end_deeper")
                {
                        lex.pushToken(token);
@@ -2410,7 +2412,7 @@ int LyXTabular::docBook(Buffer const * buf, ostream & os) const
                                ret += docbookRow(buf, os, i);
                        }
                }
-               os << "<thead>\n";
+               os << "</thead>\n";
                ++ret;
        }
        // output footer info