fix merged build

[lyx.git] / src / DocIterator.cpp

diff --git a/src/DocIterator.cpp b/src/DocIterator.cpp
index 51433d47814b617463aa30273e78d02b75c2a7f6..ecf121582886c6a70ac810491d8570c3a7eb25fc 100644 (file)
--- a/src/DocIterator.cpp
+++ b/src/DocIterator.cpp
@@ -92,7 +92,8 @@ Inset * DocIterator::nextInset() const
        if (pos() == lastpos())
                return 0;
        if (pos() > lastpos()) {
-               LYXERR0("Should not happen, but it does. ");
+               LYXERR0("Should not happen, but it does: pos() = "
+                       << pos() << ", lastpos() = " << lastpos());
                return 0;
        }
        if (inMathed())
@@ -249,12 +250,7 @@ MathData & DocIterator::cell() const
 Text * DocIterator::innerText() const
 {
        LASSERT(!empty(), /**/);
-       // go up until first non-0 text is hit
-       // (innermost text is 0 in mathed)
-       for (int i = depth() - 1; i >= 0; --i)
-               if (slices_[i].text())
-                       return slices_[i].text();
-       return 0;
+       return innerTextSlice().text();
 }
 
 
@@ -315,7 +311,7 @@ void DocIterator::forwardPosIgnoreCollapsed()
        // FIXME: the check for asInsetMath() shouldn't be necessary
        // but math insets do not return a sensible editable() state yet.
        if (nextinset && !nextinset->asInsetMath()
-           && nextinset->editable() != Inset::HIGHLY_EDITABLE) {
+           && !nextinset->editable()) {
                ++top().pos();
                return;
        }
@@ -610,16 +606,4 @@ bool operator==(StableDocIterator const & dit1, StableDocIterator const & dit2)
 }
 
 
-bool isLetter(DocIterator const & dit)
-{
-       return dit.inTexted()
-               && dit.inset().allowSpellCheck()
-               && dit.pos() != dit.lastpos()
-               && (dit.paragraph().isLetter(dit.pos())
-                   // We want to pass the ' and escape chars to ispell
-                   || contains(from_utf8(lyxrc.spellchecker_esc_chars + '\''),
-                               dit.paragraph().getChar(dit.pos())))
-               && !dit.paragraph().isDeleted(dit.pos());
-}
-
 } // namespace lyx