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

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

diff --git a/src/mathed/InsetMathSize.cpp b/src/mathed/InsetMathSize.cpp
index 91709a9532f86d4c65a3381c6c97c374cb45d235..c014d90adfea13057dcfdc4ec1bbe95764cf3599 100644 (file)
--- a/src/mathed/InsetMathSize.cpp
+++ b/src/mathed/InsetMathSize.cpp
@@ -11,39 +11,34 @@
 #include <config.h>
 
 #include "InsetMathSize.h"
-#include "MathArray.h"
+
+#include "MathData.h"
 #include "MathParser.h"
 #include "MathStream.h"
 
 #include "support/convert.h"
-#include "support/std_ostream.h"
-
 
-namespace lyx {
+#include <ostream>
 
-using std::auto_ptr;
 
+namespace lyx {
 
 InsetMathSize::InsetMathSize(latexkeys const * l)
        : InsetMathNest(1), key_(l), style_(Styles(convert<int>(l->extra)))
 {}
 
 
-auto_ptr<InsetBase> InsetMathSize::doClone() const
+Inset * InsetMathSize::clone() const
 {
-       return auto_ptr<InsetBase>(new InsetMathSize(*this));
+       return new InsetMathSize(*this);
 }
 
 
-bool InsetMathSize::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetMathSize::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        StyleChanger dummy(mi.base, style_);
        cell(0).metrics(mi, dim);
        metricsMarkers(dim);
-       if (dim_ == dim)
-               return false;
-       dim_ = dim;
-       return true;
 }