tex2lyx/text.cpp: take care of the brace pair after comment environments that are...

[lyx.git] / src / tex2lyx / table.cpp

diff --git a/src/tex2lyx/table.cpp b/src/tex2lyx/table.cpp
index 35de97af6a5ef8ad0d9c5082ff9c8a3fb0c92dff..587f81290ed47440689d4839453b608b8ea43530 100644 (file)
--- a/src/tex2lyx/table.cpp
+++ b/src/tex2lyx/table.cpp
@@ -16,6 +16,7 @@
 
 #include "tex2lyx.h"
 
+#include "support/assert.h"
 #include "support/convert.h"
 #include "support/lstrings.h"
 
@@ -24,20 +25,12 @@
 #include <vector>
 #include <map>
 
+using namespace std;
 
 namespace lyx {
 
-using std::cerr;
-using std::endl;
-using std::istringstream;
-using std::ostream;
-using std::ostringstream;
-using std::string;
-using std::vector;
-
-
 // filled in preamble.cpp
-std::map<char, int> special_columns;
+map<char, int> special_columns;
 
 
 namespace {
@@ -87,7 +80,7 @@ public:
        /// These are for longtabulars only
        /// row type (head, foot, firsthead etc.)
        LTRowType type;
-       /// row for a pagebreak
+       /// row for a newpage
        bool newpage;
 };
 
@@ -471,7 +464,7 @@ void fix_colalign(vector<ColInfo> & colinfo)
 bool parse_hlines(Parser & p, Token const & t, string & hlines,
                  bool is_long_tabular)
 {
-       BOOST_ASSERT(t.cat() == catEscape);
+       LASSERT(t.cat() == catEscape, return false);
 
        if (t.cs() == "hline")
                hlines += "\\hline";