Andreas' patch to prevent crash on click on previewd inset

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

diff --git a/src/mathed/formulamacro.C b/src/mathed/formulamacro.C
index adbd153a8984e8c27e1cef524e38c1cf6d221bc8..092ccb976eb3031acee6743d07d7f5ecf7f72366 100644 (file)
--- a/src/mathed/formulamacro.C
+++ b/src/mathed/formulamacro.C
@@ -28,7 +28,8 @@
 #include "frontends/font_metrics.h"
 
 #include "support/lstrings.h"
-#include "support/std_sstream.h"
+
+#include <sstream>
 
 using lyx::support::bformat;
 
@@ -68,7 +69,7 @@ auto_ptr<InsetBase> InsetFormulaMacro::clone() const
 
 void InsetFormulaMacro::write(Buffer const &, ostream & os) const
 {
-       os << "FormulaMacro ";
+       os << "FormulaMacro\n";
        WriteStream wi(os, false, false);
        tmpl()->write(wi);
 }
@@ -77,7 +78,7 @@ void InsetFormulaMacro::write(Buffer const &, ostream & os) const
 int InsetFormulaMacro::latex(Buffer const &, ostream & os,
                             OutputParams const & runparams) const
 {
-       lyxerr << "InsetFormulaMacro::latex" << endl;
+       //lyxerr << "InsetFormulaMacro::latex" << endl;
        WriteStream wi(os, runparams.moving_arg, true);
        tmpl()->write(wi);
        return 2;
@@ -129,6 +130,7 @@ string InsetFormulaMacro::prefix() const
 
 void InsetFormulaMacro::metrics(MetricsInfo & mi, Dimension & dim) const
 {
+       //lyxerr << "InsetFormulaMacro: " << this << " -- " << &tmpl() << endl;
        tmpl()->metrics(mi, dim);
        dim.asc += 5;
        dim.des += 5;
@@ -143,7 +145,7 @@ void InsetFormulaMacro::draw(PainterInfo & p, int x, int y) const
        LyXFont font = p.base.font;
        font.setColor(LColor::math);
 
-       PainterInfo pi(p.base.bv);
+       PainterInfo pi(p.base.bv, p.pain);
        pi.base.style = LM_ST_TEXT;
        pi.base.font  = font;