"fix" bug #3332 (plain text export depends on the menu language)

[lyx.git] / src / mathed / MathFactory.cpp

diff --git a/src/mathed/MathFactory.cpp b/src/mathed/MathFactory.cpp
index ad7b86d31cd9c2081bfaa733d23a208527252017..7f8c2192241bebdce37212be6a22554888834e2a 100644 (file)
--- a/src/mathed/MathFactory.cpp
+++ b/src/mathed/MathFactory.cpp
@@ -50,7 +50,7 @@
 #include "InsetMathXArrow.h"
 #include "InsetMathXYMatrix.h"
 #include "MathMacroArgument.h"
-#include "MathMacroTable.h"
+#include "MacroTable.h"
 #include "MathParser.h"
 #include "MathSupport.h"
 
@@ -87,7 +87,7 @@ WordList theWordList;
 
 bool math_font_available(docstring & name)
 {
-       LyXFont f;
+       Font f;
        augmentFont(f, name);
 
        // Do we have the font proper?
@@ -265,7 +265,7 @@ MathAtom createInsetMath(docstring const & s)
                docstring const & inset = l->inset;
                //lyxerr << " found inset: '" << inset << '\'' << endl;
                if (inset == "ref")
-                       return MathAtom(new RefInset(l->name));
+                       return MathAtom(new InsetMathRef(l->name));
                if (inset == "overset")
                        return MathAtom(new InsetMathOverset);
                if (inset == "underset")
@@ -318,7 +318,7 @@ MathAtom createInsetMath(docstring const & s)
                return MathAtom(new InsetMathKern);
        if (s.substr(0, 8) == "xymatrix") {
                char spacing_code = '\0';
-               LyXLength spacing;
+               Length spacing;
                size_t const len = s.length();
                size_t i = 8;
                if (i < len && s[i] == '@') {
@@ -338,7 +338,7 @@ MathAtom createInsetMath(docstring const & s)
                        }
                        if (i < len && s[i] == '=') {
                                ++i;
-                               spacing = LyXLength(to_ascii(s.substr(i)));
+                               spacing = Length(to_ascii(s.substr(i)));
                        }
                }
                return MathAtom(new InsetMathXYMatrix(spacing, spacing_code));