mathed49.diff

[features.git] / src / mathed / math_xiter.C

diff --git a/src/mathed/math_xiter.C b/src/mathed/math_xiter.C
index 9e54961bf77068f63ac31b54f5cb7590b8bcde3e..d2204c111370d59d62dbf50f7ca23a30de1d7a76 100644 (file)
--- a/src/mathed/math_xiter.C
+++ b/src/mathed/math_xiter.C
@@ -164,14 +164,8 @@ void MathedXIter::Merge(MathedArray const & a)
        while (pos < pos2 && OK()) {
                if (IsCR()) {
                        if (p_ && p_->Permit(LMPF_ALLOW_CR)) {
-                               MathedRowContainer::iterator r( new MathedRowSt(ncols + 1) );
-                               if (crow_) {
-                                       r.st_->next_ = crow_.st_->next_;
-                                       crow_.st_->next_ = r.st_;
-                               } else {
-                                       r.st_->next_ = 0;
-                               }
-                               crow_ = r;
+                               container().insert_after(crow_, MathedRowSt(ncols + 1));
+                               ++crow_;
                        } else {
                                Delete();
                                --pos2;
@@ -378,15 +372,9 @@ void MathedXIter::addRow()
                
                return;
        }
+
        // Create new item for the structure    
-       MathedRowContainer::iterator r( new MathedRowSt(ncols + 1) );
-       if (crow_) {
-               r.st_->next_ = crow_.st_->next_;
-               crow_.st_->next_ = r.st_;
-       } else {
-               crow_ = r;
-               r.st_->next_ = 0;
-       }    
+       container().insert_after(crow_, MathedRowSt(ncols + 1));
        // Fill missed tabs in current row
        while (col < ncols - 1) 
                insert('T', LM_TC_TAB); 
@@ -595,19 +583,16 @@ MathedRowSt * MathedXIter::adjustVerticalSt()
 {
        GoBegin();
        if (!crow_) {
-//     lyxerr << " CRW" << ncols << " ";
                crow_.st_ = new MathedRowSt(ncols + 1); // this leaks
        }
-//    lyxerr<< " CRW[" << crow_ << "] ";
        MathedRowSt * mrow = crow_.st_;
        while (OK()) {
                if (IsCR()) {
-                       if (col >= ncols) ncols = col + 1; 
+                       if (col >= ncols)
+                               ncols = col + 1; 
                        MathedRowSt * r = new MathedRowSt(ncols + 1); // this leaks
-//         r->next = crow_->next;
                        crow_.st_->next_ = r;
                        crow_.st_ = r;
-//         lyxerr << " CX[" << crow_ << "]";
                }   
                Next(); 
        }