mathed48.diff

[lyx.git] / src / mathed / math_parser.C

diff --git a/src/mathed/math_parser.C b/src/mathed/math_parser.C
index 9886fe7895dbcf4a65b957f8d1deb09dcaa0e9fb..ea084cc4943b44672e5dc3c7416c978679ada311 100644 (file)
--- a/src/mathed/math_parser.C
+++ b/src/mathed/math_parser.C
@@ -424,7 +424,7 @@ void mathed_parse(MathedArray & array, unsigned flags = 0,
        int acc_brace = 0;
        int acc_braces[8];
        MathParInset * mt = (mtx) ? *mtx : 0;
-       MathedRowSt * crow = (mt) ? mt->getRowSt() : 0;
+       MathedRowSt * crow = (mt) ? mt->getRowSt().data_ : 0;
        
        ++plevel;
        MathedIter data(&array);
@@ -603,8 +603,8 @@ void mathed_parse(MathedArray & array, unsigned flags = 0,
                        if (mt && (flags & FLAG_END)) {
                                if (mt->Permit(LMPF_ALLOW_CR)) {
                                        if (crow) {
-                                               crow->setNext(new MathedRowSt(mt->GetColumns() + 1)); // this leaks
-                                               crow = crow->getNext();
+                                               crow->next_ = new MathedRowSt(mt->GetColumns() + 1);
+                                               crow = crow->next_;
                                        }
                                        data.insert('K', LM_TC_CR);
                                } else 
@@ -763,16 +763,13 @@ void mathed_parse(MathedArray & array, unsigned flags = 0,
                
                case LM_TK_PMOD:
                case LM_TK_FUNC:
-               {
-#warning This must leak. (Lgb)
-                       // if (accent) this must leak... (Lgb)
-                       MathedInset * bg = new MathFuncInset(yylval.l->name); 
                        if (accent) {
                                data.insert(t, LM_TC_CONST);
-                       } else
+                       } else {
+                               MathedInset * bg = new MathFuncInset(yylval.l->name); 
                                data.insertInset(bg, LM_TC_INSET);
+                       }
                        break;
-               }
                
                case LM_TK_FUNCLIM:
                        data.insertInset(new MathFuncInset(yylval.l->name, LM_OT_FUNCLIM),
@@ -872,7 +869,7 @@ void mathed_parse(MathedArray & array, unsigned flags = 0,
                                        }
                                        mt->SetStyle(size);
                                        mt->SetType(mathed_env);
-                                       crow = mt->getRowSt();
+                                       crow = mt->getRowSt().data_;
                                }
                                
                                lyxerr[Debug::MATHED] << "MATH BEGIN[" << mathed_env << "]" << endl;