ws changes mostly

[lyx.git] / src / dociterator.C

diff --git a/src/dociterator.C b/src/dociterator.C
index 2e89e4503a84905c2e1b257a6a16f06cbe7b51b5..fe01067aba2016dd186431a6aa70d6f3b90a98f5 100644 (file)
--- a/src/dociterator.C
+++ b/src/dociterator.C
@@ -123,7 +123,13 @@ MathAtom & DocIterator::nextAtom()
 }
 
 
-LyXText * DocIterator::text() const
+LyXText * DocIterator::text()
+{
+       BOOST_ASSERT(!empty());
+       return top().text();
+}
+
+LyXText const * DocIterator::text() const
 {
        BOOST_ASSERT(!empty());
        return top().text();
@@ -146,12 +152,14 @@ Paragraph const & DocIterator::paragraph() const
 
 Row & DocIterator::textRow()
 {
+       BOOST_ASSERT(!paragraph().rows().empty());
        return paragraph().getRow(pos());
 }
 
 
 Row const & DocIterator::textRow() const
 {
+       BOOST_ASSERT(!paragraph().rows().empty());
        return paragraph().getRow(pos());
 }
 
@@ -233,7 +241,18 @@ bool DocIterator::inTexted() const
 }
 
 
-LyXText * DocIterator::innerText() const
+LyXText * DocIterator::innerText()
+{
+       BOOST_ASSERT(!empty());
+       // go up until first non-0 text is hit
+       // (innermost text is 0 in mathed)
+       for (int i = size() - 1; i >= 0; --i)
+               if (operator[](i).text())
+                       return operator[](i).text();
+       return 0;
+}
+
+LyXText const * DocIterator::innerText() const
 {
        BOOST_ASSERT(!empty());
        // go up until first non-0 text is hit