ws changes only

[lyx.git] / src / lyxrow_funcs.C

diff --git a/src/lyxrow_funcs.C b/src/lyxrow_funcs.C
index 54cbdc3251cbbb74bd041a2ff883e7cf14a6ad07..a8a28e5172e847dd3f045eb7f0ab2d54c70a0aa4 100644 (file)
--- a/src/lyxrow_funcs.C
+++ b/src/lyxrow_funcs.C
@@ -12,18 +12,15 @@
 #include <config.h>
 
 #include "lyxrow_funcs.h"
+#include "debug.h"
+#include "lyxlayout.h"
+#include "lyxrow.h"
 #include "lyxtext.h"
 #include "paragraph.h"
-#include "lyxlayout.h"
-#include "debug.h"
-
-#include "support/LAssert.h"
 
 #include <boost/next_prior.hpp>
-#include <algorithm>
 
 using lyx::pos_type;
-using lyx::support::Assert;
 
 using std::max;
 using std::min;
@@ -38,7 +35,7 @@ bool isParEnd(Paragraph const & par, RowList::iterator rit)
                lyxerr << "broken row 1: end: " << rit->end() << " next: "
                        << boost::next(rit)->pos() << endl;
                lyxerr << endl;
-               Assert(false);
+               BOOST_ASSERT(false);
        }
 #endif
        return boost::next(rit) == par.rows.end();
@@ -58,7 +55,7 @@ pos_type lastPos(Paragraph const & par, RowList::iterator rit)
                lyxerr << "broken row 2: end: " << rit->end() << " next: "
                        << boost::next(rit)->pos() << endl;
                lyxerr << endl;
-               Assert(false);
+               BOOST_ASSERT(false);
        }
        return boost::next(rit)->pos() - 1;
 }