Further cleanup of InsetFlex, InsetCollapsable and InsetLayout:

[lyx.git] / src / factory.cpp

diff --git a/src/factory.cpp b/src/factory.cpp
index 1785887207d487941f7c7c09d305fa188ef5fa56..f38cb450d0cd1fd66b156eace57999715a3c8059 100644 (file)
--- a/src/factory.cpp
+++ b/src/factory.cpp
@@ -104,8 +104,8 @@ Inset * createInset(BufferView * bv, FuncRequest const & cmd)
 
                case LFUN_FLEX_INSERT: {
                        string s = cmd.getArg(0);
-                       TextClass tclass = params.getTextClass();
-                       InsetLayout il = tclass.insetlayout(from_utf8(s));
+                       TextClass const & tclass = params.getTextClass();
+                       InsetLayout const & il = tclass.insetlayout(from_utf8(s));
                        return new InsetFlex(params, il);
                }
 
@@ -392,7 +392,7 @@ Inset * readInset(Lexer & lex, Buffer const & buf)
 
        auto_ptr<Inset> inset;
 
-       TextClass tclass = buf.params().getTextClass();
+       TextClass const & tclass = buf.params().getTextClass();
 
        lex.next();
        string tmptok = lex.getString();
@@ -487,7 +487,7 @@ Inset * readInset(Lexer & lex, Buffer const & buf)
                } else if (tmptok == "Flex") {
                        lex.next();
                        string s = lex.getString();
-                       InsetLayout il = tclass.insetlayout(from_utf8(s));
+                       InsetLayout const & il = tclass.insetlayout(from_utf8(s));
                        inset.reset(new InsetFlex(buf.params(), il));
                } else if (tmptok == "Branch") {
                        inset.reset(new InsetBranch(buf.params(),
@@ -542,18 +542,6 @@ Inset * readInset(Lexer & lex, Buffer const & buf)
                }
 
                inset->read(buf, lex);
-
-// FIXME: hack..
-               if (inset->lyxCode() == MATHMACRO_CODE) {
-                       MathMacroTemplate const * tmpl =
-                               static_cast<MathMacroTemplate*>(inset.get());
-                       MacroTable::globalMacros().insert
-                               (tmpl->name(), tmpl->asMacroData());
-                       LYXERR(Debug::DEBUG)
-                               << BOOST_CURRENT_FUNCTION
-                               << ": creating local macro " << to_utf8(tmpl->name())
-                               << endl;
-               }
        }
 
        return inset.release();