get rid of broken_header.h and some unneeded tests

[lyx.git] / src / factory.C

diff --git a/src/factory.C b/src/factory.C
index 727939de48b7877834502a7c2ab17ba9234d64d4..03a285a3c3e0e007b6eea7644f1f28878602148c 100644 (file)
--- a/src/factory.C
+++ b/src/factory.C
@@ -53,17 +53,18 @@
 #include "insets/insetvspace.h"
 #include "insets/insetwrap.h"
 
-#include "mathed/formulamacro.h"
+#include "mathed/math_macrotemplate.h"
 #include "mathed/math_hullinset.h"
 
 #include "frontends/Dialogs.h"
 #include "frontends/LyXView.h"
 
 #include "support/lstrings.h"
-#include "support/std_sstream.h"
 
 #include <boost/assert.hpp>
 
+#include <sstream>
+
 using lyx::support::compare_ascii_no_case;
 
 using std::auto_ptr;
@@ -185,9 +186,8 @@ InsetBase * createInset(BufferView * bv, FuncRequest const & cmd)
                UpdatableInset * up = bv->cursor().inset().asUpdatableInset();
                if (!up) {
                        auto_ptr<InsetCaption> inset(new InsetCaption(params));
-                       inset->setOwner(up);
                        inset->setAutoBreakRows(true);
-                       inset->setDrawFrame(InsetText::LOCKED);
+                       inset->setDrawFrame(true);
                        inset->setFrameColor(LColor::captionframe);
                        return inset.release();
                }
@@ -342,7 +342,7 @@ InsetBase * readInset(LyXLex & lex, Buffer const & buf)
        auto_ptr<InsetBase> inset;
 
        LyXTextClass tclass = buf.params().getLyXTextClass();
-               
+
        lex.next();
        string tmptok = lex.getString();
 
@@ -404,7 +404,7 @@ InsetBase * readInset(LyXLex & lex, Buffer const & buf)
                } else if (tmptok == "External") {
                        inset.reset(new InsetExternal);
                } else if (tmptok == "FormulaMacro") {
-                       inset.reset(new InsetFormulaMacro);
+                       inset.reset(new MathMacroTemplate);
                } else if (tmptok == "Formula") {
                        inset.reset(new MathHullInset);
                } else if (tmptok == "Graphics") {
@@ -470,6 +470,17 @@ InsetBase * readInset(LyXLex & lex, Buffer const & buf)
                }
 
                inset->read(buf, lex);
+
+#ifdef WITH_WARNINGS
+#warning hack..
+#endif
+               if (inset->lyxCode() == InsetBase::MATHMACRO_CODE) {
+                       MathMacroTemplate const * tmpl =
+                               static_cast<MathMacroTemplate*>(inset.get());
+                       MacroTable::globalMacros().insert
+                               (tmpl->name(), tmpl->asMacroData());
+                       lyxerr << "creating local macro " << tmpl->name() << endl;
+               }
        }
 
        return inset.release();