From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Fri, 10 Nov 2006 23:31:21 +0000 (+0000)
Subject: 	* dociterator.C (forwardPar): remove debug code.
X-Git-Tag: 1.6.10~11943
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=1248ce1acb03697b776f6593f6db3273b3f5059d;p=features.git

	* dociterator.C (forwardPar): remove debug code.
	(forwardInset): speed up (like forwardPar).



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15848 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/dociterator.C b/src/dociterator.C
index 47e7526e5e..4d93aa7a01 100644
--- a/src/dociterator.C
+++ b/src/dociterator.C
@@ -414,10 +414,6 @@ void DocIterator::forwardPar()
 {
 	forwardPos();
 
-#if 0
-	DocIterator cmp(*this);
-#endif
-
 	while (!empty() && (!inTexted() || pos() != 0)) {
 		if (inTexted()) {
 			pos_type const lastp = lastpos();
@@ -428,12 +424,6 @@ void DocIterator::forwardPar()
 		}
 		forwardPos();
 	}
-
-#if 0
-	while (!cmp.empty() && (!cmp.inTexted() || cmp.pos() != 0))
-		cmp.forwardPos();
-	BOOST_ASSERT(cmp == *this);
-#endif
 }
 
 
@@ -448,8 +438,19 @@ void DocIterator::forwardChar()
 void DocIterator::forwardInset()
 {
 	forwardPos();
-	while (!empty() && (pos() == lastpos() || nextInset() == 0))
+
+	while (!empty() && !nextInset()) {
+		if (inTexted()) {
+			pos_type const lastp = lastpos();
+			Paragraph const & par = paragraph();
+			pos_type & pos = top().pos();
+			while (pos < lastp && !par.isInset(pos))
+				++pos;
+			if (pos < lastp)
+				break;
+		}
 		forwardPos();
+	}
 }