* Inset:

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

diff --git a/src/mathed/InsetMathColor.cpp b/src/mathed/InsetMathColor.cpp
index 5e0fed7b776ce2e397464f4d0d0894d668fd8b1a..eb5ed56ca5f81bd1bd05921e168ddbb9e1de6bd3 100644 (file)
--- a/src/mathed/InsetMathColor.cpp
+++ b/src/mathed/InsetMathColor.cpp
@@ -11,7 +11,7 @@
 #include <config.h>
 
 #include "InsetMathColor.h"
-#include "MathArray.h"
+#include "MathData.h"
 #include "MathStream.h"
 #include "MathSupport.h"
 #include "LaTeXFeatures.h"
@@ -21,10 +21,7 @@
 
 namespace lyx {
 
-using std::auto_ptr;
-using std::string;
-
-InsetMathColor::InsetMathColor(bool oldstyle, LColor_color const & color)
+InsetMathColor::InsetMathColor(bool oldstyle, Color_color const & color)
        : InsetMathNest(1), oldstyle_(oldstyle),
          color_(from_utf8(lcolor.getLaTeXName(color)))
 {}
@@ -35,26 +32,23 @@ InsetMathColor::InsetMathColor(bool oldstyle, docstring const & color)
 {}
 
 
-auto_ptr<InsetBase> InsetMathColor::doClone() const
+Inset * InsetMathColor::clone() const
 {
-       return auto_ptr<InsetBase>(new InsetMathColor(*this));
+       return new InsetMathColor(*this);
 }
 
 
-bool InsetMathColor::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetMathColor::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        cell(0).metrics(mi, dim);
        metricsMarkers(dim);
-       if (dim_ == dim)
-               return false;
        dim_ = dim;
-       return true;
 }
 
 
 void InsetMathColor::draw(PainterInfo & pi, int x, int y) const
 {
-       LColor_color origcol = pi.base.font.color();
+       Color_color origcol = pi.base.font.color();
        pi.base.font.setColor(lcolor.getFromLaTeXName(to_utf8(color_)));
        cell(0).draw(pi, x + 1, y);
        pi.base.font.setColor(origcol);