X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FDocIterator.cpp;h=6e3775b4e36e8886a53123ddda16948d4a767e06;hb=26910d5ec49395d1372dd5b9259f1bf6ed23de0a;hp=5cd1c0eac3c0e84f199e6ce12cce830c4b14bc73;hpb=6ec1683aeecf701edf5d79f449e2e749e93d4342;p=lyx.git

diff --git a/src/DocIterator.cpp b/src/DocIterator.cpp
index 5cd1c0eac3..6e3775b4e3 100644
--- a/src/DocIterator.cpp
+++ b/src/DocIterator.cpp
@@ -27,6 +27,8 @@
 #include "insets/InsetTabular.h"
 
 #include "support/debug.h"
+#include "support/ExceptionMessage.h"
+#include "support/gettext.h"
 #include "support/lassert.h"
 #include "support/lstrings.h"
 
@@ -42,6 +44,7 @@ DocIterator::DocIterator()
 	: boundary_(false), inset_(0), buffer_(0)
 {}
 
+
 // We could be able to get rid of this if only every BufferView were
 // associated to a buffer on construction.
 DocIterator::DocIterator(Buffer * buf)
@@ -79,7 +82,7 @@ DocIterator DocIterator::clone(Buffer * buffer) const
 	DocIterator dit(buffer);
 	size_t const n = slices_.size();
 	for (size_t i = 0 ; i != n; ++i) {
-		LASSERT(inset, /**/);
+		LBUFERR(inset);
 		dit.push_back(slices_[i]);
 		dit.top().inset_ = inset;
 		if (i + 1 != n)
@@ -142,7 +145,7 @@ Inset * DocIterator::prevInset() const
 
 Inset * DocIterator::realInset() const
 {
-	LASSERT(inTexted(), /**/);
+	LASSERT(inTexted(), return 0);
 	// if we are in a tabular, we need the cell
 	if (inset().lyxCode() == TABULAR_CODE) {
 		InsetTabular * tabular = inset().asInsetTabular();
@@ -171,23 +174,24 @@ MathAtom & DocIterator::nextAtom() const
 
 Text * DocIterator::text() const
 {
-	LASSERT(!empty(), /**/);
+	LASSERT(!empty(), return 0);
 	return top().text();
 }
 
 
 Paragraph & DocIterator::paragraph() const
 {
-	if (!inTexted())
+	if (!inTexted()) {
 		LYXERR0(*this);
-	LASSERT(inTexted(), /**/);
+		LBUFERR(false);
+	}
 	return top().paragraph();
 }
 
 
 Paragraph & DocIterator::innerParagraph() const
 {
-	LASSERT(!empty(), /**/);
+	LBUFERR(!empty());
 	return innerTextSlice().paragraph();
 }
 
@@ -206,7 +210,7 @@ FontSpan DocIterator::locateWord(word_location const loc) const
 	
 CursorSlice const & DocIterator::innerTextSlice() const
 {
-	LASSERT(!empty(), /**/);
+	LBUFERR(!empty());
 	// go up until first non-0 text is hit
 	// (innermost text is 0 in mathed)
 	for (int i = depth() - 1; i >= 0; --i)
@@ -215,9 +219,10 @@ CursorSlice const & DocIterator::innerTextSlice() const
 
 	// This case is in principe not possible. We _must_
 	// be inside a Text.
-	LASSERT(false, /**/);
-	static CursorSlice dummy;
-	return dummy;
+	LBUFERR(false);
+	// Squash warning
+	static const CursorSlice c;
+	return c;
 }
 
 
@@ -281,7 +286,7 @@ MathData & DocIterator::cell() const
 
 Text * DocIterator::innerText() const
 {
-	LASSERT(!empty(), /**/);
+	LASSERT(!empty(), return 0);
 	return innerTextSlice().text();
 }
 
@@ -463,7 +468,7 @@ void DocIterator::updateInsets(Inset * inset)
 	size_t const n = slices_.size();
 	slices_.resize(0);
 	for (size_t i = 0 ; i < n; ++i) {
-		LASSERT(inset, /**/);
+		LBUFERR(inset);
 		push_back(dit[i]);
 		top().inset_ = inset;
 		if (i + 1 != n)
@@ -532,12 +537,14 @@ bool DocIterator::fixIfBroken()
 
 void DocIterator::sanitize()
 {
-	// this function re-creates the cache of inset pointers
-	//lyxerr << "converting:\n" << *this << endl;
+	// keep a copy of the slices
+	vector<CursorSlice> const sl = slices_;
+	slices_.clear();
 	if (buffer_)
 		inset_ = &buffer_->inset();
 	Inset * inset = inset_;
-	for (size_t i = 0, n = slices_.size(); i != n; ++i) {
+	// re-add the slices one by one, and adjust the inset pointer.
+	for (size_t i = 0, n = sl.size(); i != n; ++i) {
 		if (inset == 0) {
 			// FIXME
 			LYXERR0(" Should not happen, but does e.g. after "
@@ -548,14 +555,13 @@ void DocIterator::sanitize()
 			fixIfBroken();
 			break;
 		}
-		slices_[i].inset_ = inset;
+		push_back(sl[i]);
+		top().inset_ = inset;
 		if (fixIfBroken())
 			break;
 		if (i + 1 != n)
-			inset = slices_[i].inset().inMathed() ? slices_[i].cell()[slices_[i].pos()].nucleus() 
-				: slices_[i].paragraph().getInset(pos());
+			inset = nextInset();
 	}
-	//lyxerr << "convert:\n" << *this << " to:\n" << dit << endl;
 }
 
 
@@ -626,7 +632,7 @@ StableDocIterator::StableDocIterator(DocIterator const & dit)
 
 DocIterator StableDocIterator::asDocIterator(Buffer * buf) const
 {
-	DocIterator dit = DocIterator(buf);
+	DocIterator dit(buf);
 	dit.slices_ = data_;
 	dit.sanitize();
 	return dit;