insetquote fix; getStatus tweaks

[lyx.git] / src / texrow.C

diff --git a/src/texrow.C b/src/texrow.C
index 61f0a7b0ac520cb5f03bbbd111b3c470db29abd0..c67c88392e8fd7cf000439c2f6888098f7dc7fb0 100644 (file)
--- a/src/texrow.C
+++ b/src/texrow.C
@@ -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,16 +95,16 @@ 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);
+               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()) {
+               if (id == kit->id()
+                   && pos == kit->pos()) {
                        lyxerr[Debug::INFO]
                                << "TexRow::increasePos: this should happen "
                                "maximum one time for each run of "