Andreas' patch to prevent crash on click on previewd inset

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

diff --git a/src/mathed/math_sizeinset.C b/src/mathed/math_sizeinset.C
index cf9a261f093d77b3885c7419aa8010d18a9e5a27..099e421694406a9cd9f88930cd9581e0db0b6363 100644 (file)
--- a/src/mathed/math_sizeinset.C
+++ b/src/mathed/math_sizeinset.C
@@ -1,31 +1,44 @@
+/**
+ * \file math_sizeinset.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
 #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 "math_support.h"
-#include "support/LOstream.h"
 
+#include "support/convert.h"
+#include "support/std_ostream.h"
+
+using std::auto_ptr;
 
-using std::atoi;
 
 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)))
 {}
 
 
-MathInset * MathSizeInset::clone() const
+auto_ptr<InsetBase> MathSizeInset::doClone() const
 {
-       return new MathSizeInset(*this);
+       return auto_ptr<InsetBase>(new MathSizeInset(*this));
 }
 
 
-void MathSizeInset::metrics(MetricsInfo & mi) const
+void MathSizeInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        StyleChanger dummy(mi.base, style_);
-       dim_ = cell(0).metrics(mi);
-       metricsMarkers2();
+       cell(0).metrics(mi, dim);
+       metricsMarkers(dim);
+       dim_ = dim;
 }
 
 
@@ -33,7 +46,7 @@ void MathSizeInset::draw(PainterInfo & pi, int x, int y) const
 {
        StyleChanger dummy(pi.base, style_);
        cell(0).draw(pi, x + 1, y);
-       drawMarkers2(pi, x, y);
+       drawMarkers(pi, x, y);
 }