* gcc does not like missing characters in keywords

[lyx.git] / src / DocIterator.cpp

diff --git a/src/DocIterator.cpp b/src/DocIterator.cpp
index 3ab86af6449eefa3ef8dcb09471092a643af82f5..7b7a59d2014d0d4fc86c1e776c5069d86314f355 100644 (file)
--- a/src/DocIterator.cpp
+++ b/src/DocIterator.cpp
@@ -15,8 +15,9 @@
 #include "DocIterator.h"
 
 #include "debug.h"
-#include "Text.h"
+#include "InsetList.h"
 #include "Paragraph.h"
+#include "Text.h"
 
 #include "mathed/MathData.h"
 #include "mathed/InsetMath.h"
@@ -78,7 +79,7 @@ Inset * DocIterator::prevInset() const
        BOOST_ASSERT(!empty());
        if (pos() == 0)
                return 0;
-       if (inMathed())
+       if (inMathed()) {
                if (cell().empty())
                        // FIXME: this should not happen but it does.
                        // See bug 3189
@@ -86,6 +87,7 @@ Inset * DocIterator::prevInset() const
                        return 0;
                else
                        return prevAtom().nucleus();
+       }
        return paragraph().isInset(pos() - 1) ? paragraph().getInset(pos() - 1) : 0;
 }
 
@@ -94,7 +96,7 @@ Inset * DocIterator::realInset() const
 {
        BOOST_ASSERT(inTexted());
        // if we are in a tabular, we need the cell
-       if (inset().lyxCode() == Inset::TABULAR_CODE) {
+       if (inset().lyxCode() == TABULAR_CODE) {
                InsetTabular & tabular = static_cast<InsetTabular&>(inset());
                return tabular.cell(idx()).get();
        }
@@ -136,18 +138,26 @@ Paragraph & DocIterator::paragraph() const
 
 
 Paragraph & DocIterator::innerParagraph() const
+{
+       BOOST_ASSERT(!empty());
+       return innerTextSlice().paragraph();
+}
+
+
+CursorSlice const & DocIterator::innerTextSlice() const
 {
        BOOST_ASSERT(!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].paragraph();
+                       return slices_[i];
 
        // This case is in principe not possible. We _must_
-       // be inside a Paragraph.
+       // be inside a Text.
        BOOST_ASSERT(false);
-       return paragraph();
+       static CursorSlice dummy;
+       return dummy;
 }
 
 
@@ -294,7 +304,7 @@ void DocIterator::forwardPar()
                        pos_type const lastp = lastpos();
                        Paragraph const & par = paragraph();
                        pos_type & pos = top().pos();
-                       if (par.insetlist.empty())
+                       if (par.insetList().empty())
                                pos = lastp;
                        else
                                while (pos < lastp && !par.isInset(pos))
@@ -305,18 +315,6 @@ void DocIterator::forwardPar()
 }
 
 
-void DocIterator::forwardIdx()
-{
-       CursorSlice & tip = top();
-
-       //prevent endless loops
-       BOOST_ASSERT(tip.idx() < tip.nargs());
-       ++tip.idx();
-       tip.pit() = 0;
-       tip.pos() = 0;
-}
-
-
 void DocIterator::forwardChar()
 {
        forwardPos();