X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftexrow.C;h=c67c88392e8fd7cf000439c2f6888098f7dc7fb0;hb=8d1c58af82d1fc356f470dff97878ab7c3e8a2fe;hp=1968d5cd83f2c1b8eca3b3915ea2603772fb29bb;hpb=83acbbd5237373926c629855379e1df9a04209b2;p=lyx.git

diff --git a/src/texrow.C b/src/texrow.C
index 1968d5cd83..c67c88392e 100644
--- a/src/texrow.C
+++ b/src/texrow.C
@@ -17,7 +17,7 @@
 #endif
 
 #include "texrow.h"
-#include "lyxparagraph.h"
+#include "paragraph.h"
 #include "debug.h"
 
 using std::find_if;
@@ -34,7 +34,7 @@ void TexRow::reset()
 
 
 // Defines paragraph and position for the beginning of this row
-void TexRow::start(LyXParagraph * par, int pos)
+void TexRow::start(Paragraph * par, int pos)
 {
 	lastpar = par;
 	lastpos = pos;
@@ -75,22 +75,8 @@ bool TexRow::getIdFromRow(int row, int & id, int & pos) const
 		find_if(rowlist.begin(), rowlist.end(), same_rownumber(vt));
 	
 	if (cit != rowlist.end()) {
-#if 0
-		RowList::iterator kit = rowlist.begin();
-		RowList::iterator end = rowlist.end();
-		// Increase the pos of all rows with the
-		// same id (and where the pos is larger)
-		// to avoid putting errorinsets at the
-		// same pos.
-		for (; kit != end; ++kit) {
-			if (&(*kit) != &(*cit)
-			    && (*kit).id() == (*cit).id()
-			    && (*kit).pos() >= (*cit).pos())
-				(*kit).pos((*kit).pos() + 1);
-		}
-#endif
-		id = (*cit).id();
-		pos = (*cit).pos();
+		id = cit->id();
+		pos = cit->pos();
 		return true;
 	}
 	id = -1;
@@ -109,17 +95,17 @@ void TexRow::increasePos(int id, int pos) const
 	RowList::iterator kit = rowlist.begin();
 	RowList::iterator end = rowlist.end();
 	for (; kit != end; ++kit) {
-		if (id == (*kit).id()
-		    && pos < (*kit).pos()) {
-			(*kit).pos((*kit).pos() + 1);
-			lyxerr.debug()
+		if (id == kit->id()
+		    && pos < kit->pos()) {
+			kit->pos(kit->pos() + 1);
+			lyxerr[Debug::INFO]
 				<< "TeXRow::increasePos: ideally this "
 				"should never happen..." << endl;
 		}
 		// When verified to work this clause should be deleted.
-		if (id == (*kit).id()
-		    && pos == (*kit).pos()) {
-			lyxerr.debug()
+		if (id == kit->id()
+		    && pos == kit->pos()) {
+			lyxerr[Debug::INFO]
 				<< "TexRow::increasePos: this should happen "
 				"maximum one time for each run of "
 				"increasePos!" << endl;