Make Helge happy: no more crash on arrow up/down in math macro

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

diff --git a/src/mathed/math_commentinset.C b/src/mathed/math_commentinset.C
index 7c7400e3a1617a3acc75214819a127e8615887c2..790871ccbe1204683796be45d5e66d7bf47b6699 100644 (file)
--- a/src/mathed/math_commentinset.C
+++ b/src/mathed/math_commentinset.C
@@ -1,12 +1,23 @@
-#include <config.h>
+/**
+ * \file math_commentinset.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_commentinset.h"
+#include "math_data.h"
 #include "math_mathmlstream.h"
-#include "LaTeXFeatures.h"
-#include "support/LOstream.h"
-#include "textpainter.h"
+#include "math_support.h"
+#include "support/std_ostream.h"
 
+using std::string;
+using std::auto_ptr;
 
 
 MathCommentInset::MathCommentInset()
@@ -17,21 +28,21 @@ MathCommentInset::MathCommentInset()
 MathCommentInset::MathCommentInset(string const & str)
        : MathNestInset(1)
 {
-       cell(0) = asArray(str);
+       asArray(str, cell(0));
 }
 
 
-MathInset * MathCommentInset::clone() const
+auto_ptr<InsetBase> MathCommentInset::doClone() const
 {
-       return new MathCommentInset(*this);
+       return auto_ptr<InsetBase>(new MathCommentInset(*this));
 }
 
 
-Dimension MathCommentInset::metrics(MetricsInfo & mi) const
+void MathCommentInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       cell(0).metrics(mi);
-       metricsMarkers();
-       return dim_;
+       cell(0).metrics(mi, dim);
+       metricsMarkers(dim);
+       dim_ = dim;
 }