bug + spped fixes + small stuff

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

diff --git a/src/mathed/math_fboxinset.C b/src/mathed/math_fboxinset.C
index 3383a3f97c0bc14370936d2dedb61462f0037aac..7411545fb4351bd63c363f3bbe4b82df7c5d6cf0 100644 (file)
--- a/src/mathed/math_fboxinset.C
+++ b/src/mathed/math_fboxinset.C
@@ -1,12 +1,24 @@
+/**
+ * \file math_fboxinset.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_fboxinset.h"
-#include "math_support.h"
+#include "math_data.h"
 #include "math_mathmlstream.h"
-#include "math_streamstr.h"
 #include "math_parser.h"
+#include "math_streamstr.h"
+#include "LColor.h"
 #include "frontends/Painter.h"
 
+using std::auto_ptr;
 
 
 MathFboxInset::MathFboxInset(latexkeys const * key)
@@ -14,9 +26,9 @@ MathFboxInset::MathFboxInset(latexkeys const * key)
 {}
 
 
-MathInset * MathFboxInset::clone() const
+auto_ptr<InsetBase> MathFboxInset::clone() const
 {
-       return new MathFboxInset(*this);
+       return auto_ptr<InsetBase>(new MathFboxInset(*this));
 }
 
 
@@ -32,12 +44,12 @@ void MathFboxInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        if (key_->name == "fbox") {
                FontSetChanger dummy(mi.base, "textnormal");
-               cell(0).metrics(mi, dim_);
+               cell(0).metrics(mi, dim);
        } else {
-               cell(0).metrics(mi, dim_);
+               cell(0).metrics(mi, dim);
        }
-       metricsMarkers(5); // 5 pixels margin
-       dim = dim_;
+       metricsMarkers(dim, 5); // 5 pixels margin
+       dim_ = dim;
 }