X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FDocIterator.cpp;h=57286d9a6cbac47bd7cb11d551aa822720a528bb;hb=4089ff1ec36292a37866c81d844e9ebd6dffd850;hp=9783db14a10d9562df0444c144ced76037b4f87b;hpb=e93444e7e9d6f1aeabd356d414d4e5af3cea8569;p=lyx.git diff --git a/src/DocIterator.cpp b/src/DocIterator.cpp index 9783db14a1..57286d9a6c 100644 --- a/src/DocIterator.cpp +++ b/src/DocIterator.cpp @@ -226,6 +226,15 @@ CursorSlice const & DocIterator::innerTextSlice() const } +DocIterator DocIterator::getInnerText() const +{ + DocIterator texted = *this; + while (!texted.inTexted()) + texted.pop_back(); + return texted; +} + + pit_type DocIterator::lastpit() const { return inMathed() ? 0 : text()->paragraphs().size() - 1; @@ -590,8 +599,7 @@ void DocIterator::sanitize() fixIfBroken(); break; } - if ((inset->inMathed() && !inset->isActive()) - || (!inset->inMathed() && !inset->editable())) { + if (!inset->isActive()) { LYXERR0("Inset found on cursor stack is not active."); fixIfBroken(); break; @@ -663,9 +671,9 @@ ostream & operator<<(ostream & os, DocIterator const & dit) /////////////////////////////////////////////////////// -StableDocIterator::StableDocIterator(DocIterator const & dit) +StableDocIterator::StableDocIterator(DocIterator const & dit) : + data_(dit.internalData()) { - data_ = dit.internalData(); for (size_t i = 0, n = data_.size(); i != n; ++i) data_[i].inset_ = 0; }