Fix #1736

[lyx.git] / src / cursor.C

diff --git a/src/cursor.C b/src/cursor.C
index 63194839f781c9190e9f527f99779b457a6458a6..e84d6c27ec312f9b1a4f89de63bf345cf5573b76 100644 (file)
--- a/src/cursor.C
+++ b/src/cursor.C
@@ -44,6 +44,7 @@
 #include "frontends/LyXView.h"
 
 #include <boost/assert.hpp>
+#include <boost/bind.hpp>
 #include <boost/current_function.hpp>
 
 #include <sstream>
@@ -61,8 +62,8 @@ using std::swap;
 
 namespace {
 
-       bool positionable
-               (DocIterator const & cursor, DocIterator const & anchor)
+       bool
+       positionable(DocIterator const & cursor, DocIterator const & anchor)
        {
                // avoid deeper nested insets when selecting
                if (cursor.size() > anchor.size())
@@ -237,9 +238,21 @@ bool LCursor::getStatus(FuncRequest const & cmd, FuncStatus & status)
        bool res = false;
        for ( ; size(); pop()) {
                //lyxerr << "\nLCursor::getStatus: cmd: " << cmd << endl << *this << endl;
-               BOOST_ASSERT(pos() <= lastpos());
-               BOOST_ASSERT(idx() <= lastidx());
-               BOOST_ASSERT(par() <= lastpar());
+               if (idx() > lastidx()) {
+                       lyxerr << "wrong idx " << idx() << ", max is " << lastidx()
+                               << ". Trying to correct this."  << endl;
+                       idx() = lastidx();
+               }
+               if (par() > lastpar()) {
+                       lyxerr << "wrong par " << par() << ", max is " << lastpar()
+                               << ". Trying to correct this."  << endl;
+                       par() = lastpar();
+               }
+               if (pos() > lastpos()) {
+                       lyxerr << "wrong pos " << pos() << ", max is " << lastpos()
+                               << ". Trying to correct this."  << endl;
+                       pos() = lastpos();
+               }
 
                // The inset's getStatus() will return 'true' if it made
                // a definitive decision on whether it want to handle the
@@ -612,9 +625,9 @@ void LCursor::plainInsert(MathAtom const & t)
 
 void LCursor::insert(string const & str)
 {
-       //lyxerr << "LCursor::insert str '" << str << "'" << endl;
-       for (string::const_iterator it = str.begin(); it != str.end(); ++it)
-               insert(*it);
+       for_each(str.begin(), str.end(),
+                boost::bind(static_cast<void(LCursor::*)(char)>
+                            (&LCursor::insert), this, _1));
 }