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 4fef89efe3925a0ec2b617c28bfe811c9ceb3364..f06ac89dc09c719b03fd0eae380606eb43e8641a 100644 (file)
--- a/src/mathed/InsetMathPar.cpp
+++ b/src/mathed/InsetMathPar.cpp
@@ -11,16 +11,14 @@
 #include <config.h>
 
 #include "InsetMathPar.h"
+
 #include "MathData.h"
 #include "MathStream.h"
-#include "support/std_ostream.h"
-
 
-namespace lyx {
+#include <ostream>
 
 
-using std::auto_ptr;
-
+namespace lyx {
 
 InsetMathPar::InsetMathPar(MathData const & ar)
 {
@@ -28,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);
 }
 
 
@@ -60,9 +53,9 @@ void InsetMathPar::infoize(odocstream & os) const
 }
 
 
-auto_ptr<InsetBase> InsetMathPar::doClone() const
+Inset * InsetMathPar::clone() const
 {
-       return auto_ptr<InsetBase>(new InsetMathPar(*this));
+       return new InsetMathPar(*this);
 }