the convert patch

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

diff --git a/src/mathed/math_sizeinset.C b/src/mathed/math_sizeinset.C
index 0e9e4cca067914ea64eb3332eb997154f4fde267..099e421694406a9cd9f88930cd9581e0db0b6363 100644 (file)
--- a/src/mathed/math_sizeinset.C
+++ b/src/mathed/math_sizeinset.C
@@ -11,21 +11,23 @@
 #include <config.h>
 
 #include "math_sizeinset.h"
-#include "math_parser.h"
+#include "math_data.h"
 #include "math_mathmlstream.h"
+#include "math_parser.h"
 #include "math_streamstr.h"
-#include "support/LOstream.h"
 
-using std::atoi;
+#include "support/convert.h"
+#include "support/std_ostream.h"
+
 using std::auto_ptr;
 
 
 MathSizeInset::MathSizeInset(latexkeys const * l)
-       : MathNestInset(1), key_(l), style_(Styles(atoi(l->extra.c_str())))
+       : MathNestInset(1), key_(l), style_(Styles(convert<int>(l->extra)))
 {}
 
 
-auto_ptr<InsetBase> MathSizeInset::clone() const
+auto_ptr<InsetBase> MathSizeInset::doClone() const
 {
        return auto_ptr<InsetBase>(new MathSizeInset(*this));
 }
@@ -34,9 +36,9 @@ auto_ptr<InsetBase> MathSizeInset::clone() const
 void MathSizeInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        StyleChanger dummy(mi.base, style_);
-       cell(0).metrics(mi, dim_);
-       metricsMarkers();
-       dim = dim_;
+       cell(0).metrics(mi, dim);
+       metricsMarkers(dim);
+       dim_ = dim;
 }