revert last patch. there's something wrong, possibly unrelated to this

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

diff --git a/src/mathed/InsetMathPar.cpp b/src/mathed/InsetMathPar.cpp
index 2de8a19f55488724c05c36e7b47250c1b18538a7..f06ac89dc09c719b03fd0eae380606eb43e8641a 100644 (file)
--- a/src/mathed/InsetMathPar.cpp
+++ b/src/mathed/InsetMathPar.cpp
@@ -11,9 +11,11 @@
 #include <config.h>
 
 #include "InsetMathPar.h"
+
 #include "MathData.h"
 #include "MathStream.h"
-#include "support/std_ostream.h"
+
+#include <ostream>
 
 
 namespace lyx {
@@ -24,15 +26,10 @@ InsetMathPar::InsetMathPar(MathData const & ar)
 }
 
 
-bool InsetMathPar::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetMathPar::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       dim = dim_;
        FontSetChanger dummy1(mi.base, "textnormal");
-       InsetMathGrid::metrics(mi);
-       if (dim_ == dim)
-               return false;
-       dim = dim_;
-       return true;
+       InsetMathGrid::metrics(mi, dim);
 }