... and RELEASE-NOTES

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

diff --git a/src/mathed/MathMacroTemplate.cpp b/src/mathed/MathMacroTemplate.cpp
index 8516c39b0a4e4dbc8f6f3d4e1e81855cdc712fe0..5fbba55656435865580fb19febf85b52c6d1845b 100644 (file)
--- a/src/mathed/MathMacroTemplate.cpp
+++ b/src/mathed/MathMacroTemplate.cpp
@@ -543,7 +543,7 @@ void MathMacroTemplate::createLook(int args) const
 
 void MathMacroTemplate::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       Changer dummy1 = mi.base.changeFontSet(from_ascii("mathnormal"));
+       Changer dummy1 = mi.base.changeFontSet("mathnormal");
        Changer dummy2 = mi.base.changeStyle(LM_ST_TEXT);
 
        // valid macro?
@@ -587,7 +587,7 @@ void MathMacroTemplate::draw(PainterInfo & pi, int x, int y) const
 {
        // FIXME: Calling Changer on the same object repeatedly is inefficient.
        Changer dummy0 = pi.base.font.changeColor(Color_math);
-       Changer dummy1 = pi.base.changeFontSet(from_ascii("mathnormal"));
+       Changer dummy1 = pi.base.changeFontSet("mathnormal");
        Changer dummy2 = pi.base.changeStyle(LM_ST_TEXT);
 
        setPosCache(pi, x, y);
@@ -1172,8 +1172,7 @@ void MathMacroTemplate::read(Lexer & lex)
 void MathMacroTemplate::write(ostream & os) const
 {
        odocstringstream oss;
-       TexRow texrow(false);
-       otexrowstream ots(oss,texrow);
+       otexrowstream ots(oss);
        WriteStream wi(ots, false, false, WriteStream::wsDefault);
        oss << "FormulaMacro\n";
        write(wi);