Fix crash when running lyx -dbg insets -e ...

[lyx.git] / src / texrow.C

diff --git a/src/texrow.C b/src/texrow.C
index c223cb6b4133564a71c135c9d8565bf639f3bd07..ba2a065f930056751a85a640b107dcba24ef35d9 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,10 +17,11 @@
 #endif
 
 #include "texrow.h"
-#include "lyxparagraph.h"
+#include "paragraph.h"
 #include "debug.h"
 
 using std::find_if;
+using std::endl;
 
 // Delete linked list
 void TexRow::reset()
@@ -33,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;
@@ -81,15 +82,15 @@ bool TexRow::getIdFromRow(int row, int & id, int & pos) const
                // same id (and where the pos is larger)
                // to avoid putting errorinsets at the
                // same pos.
-               for(; kit != end; ++kit) {
+               for (; kit != end; ++kit) {
                        if (&(*kit) != &(*cit)
-                           && (*kit).id() == (*cit).id()
-                           && (*kit).pos() >= (*cit).pos())
-                               (*kit).pos((*kit).pos() + 1);
+                           && 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;
@@ -107,17 +108,19 @@ 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 << "TeXRow::increasePos: ideally this "
+       for (; kit != end; ++kit) {
+               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 << "TexRow::increasePos: this should happen "
+               if (id == kit->id()
+                   && pos == kit->pos()) {
+                       lyxerr[Debug::INFO]
+                               << "TexRow::increasePos: this should happen "
                                "maximum one time for each run of "
                                "increasePos!" << endl;
                }