minimal effort implementation of:

[lyx.git] / src / bufferview_funcs.C

diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C
index 4dcf38d8225f0ffd2da6f57302a1cf5c97997bf5..2125c5706b5eae0b73e56904c3b762aa0d0bd700 100644 (file)
--- a/src/bufferview_funcs.C
+++ b/src/bufferview_funcs.C
@@ -163,8 +163,7 @@ Point coordOffset(DocIterator const & dit, bool boundary)
                CursorSlice const & sl = dit[i];
                int xx = 0;
                int yy = 0;
-               if (sl.inset().editable() == InsetBase::HIGHLY_EDITABLE)
-                       sl.inset().cursorPos(sl, boundary && ((i+1) == dit.depth()), xx, yy);
+               sl.inset().cursorPos(sl, boundary && ((i+1) == dit.depth()), xx, yy);
                x += xx;
                y += yy;
                //lyxerr << "LCursor::getPos, i: "
@@ -202,8 +201,12 @@ Point coordOffset(DocIterator const & dit, bool boundary)
 Point getPos(DocIterator const & dit, bool boundary)
 {
        CursorSlice const & bot = dit.bottom();
-       CoordCache::InnerParPosCache const & cache =
-               theCoords.getParPos().find(bot.text())->second;
+       CoordCache::ParPosCache::const_iterator cache_it = 
+               theCoords.getParPos().find(bot.text());
+       if (cache_it == theCoords.getParPos().end())
+               return Point(-1, -1);
+
+       CoordCache::InnerParPosCache const & cache = cache_it->second;
        CoordCache::InnerParPosCache::const_iterator it = cache.find(bot.pit());
        if (it == cache.end()) {
                //lyxerr << "cursor out of view" << std::endl;
@@ -260,6 +263,8 @@ bool findInset(DocIterator & dit, vector<InsetBase_code> const & codes,
        string contents;
        DocIterator tmpdit = dit;
        tmpdit.forwardInset();
+       if (!tmpdit)
+               return false;
 
        if (same_content) {
                InsetBase const * inset = tmpdit.nextInset();
@@ -278,7 +283,7 @@ bool findInset(DocIterator & dit, vector<InsetBase_code> const & codes,
                } else
                        return false;
        }
-       
+
        dit = tmpdit;
        return true;
 }