Fix paragraph spacing

[lyx.git] / src / texrow.C

diff --git a/src/texrow.C b/src/texrow.C
index a0cce0a298926326ce08431d9599a86bf264760a..c67c88392e8fd7cf000439c2f6888098f7dc7fb0 100644 (file)
--- a/src/texrow.C
+++ b/src/texrow.C
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *      
  *         Copyright 1995 Matthias Ettrich
- *          Copyright 1995-2000 The LyX Team.
+ *          Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
@@ -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;