#include <config.h>
#include "InsetMathTabular.h"
-#include "MathArray.h"
+
+#include "MathData.h"
#include "MathStream.h"
#include "MathStream.h"
#include "support/lstrings.h"
-#include "support/std_ostream.h"
-#include <iterator>
+#include <ostream>
namespace lyx {
-
-using std::string;
-using std::auto_ptr;
-
-
InsetMathTabular::InsetMathTabular(docstring const & name, int m, int n)
: InsetMathGrid(m, n), name_(name)
{}
{}
-auto_ptr<InsetBase> InsetMathTabular::doClone() const
+Inset * InsetMathTabular::clone() const
{
- return auto_ptr<InsetBase>(new InsetMathTabular(*this));
+ return new InsetMathTabular(*this);
}
-bool InsetMathTabular::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetMathTabular::metrics(MetricsInfo & mi, Dimension & dim) const
{
FontSetChanger dummy(mi.base, "textnormal");
InsetMathGrid::metrics(mi, dim);
dim.wid += 6;
- if (dim_ == dim)
- return false;
- dim_ = dim;
- return true;
+}
+
+
+Dimension const InsetMathTabular::dimension(BufferView const & bv) const
+{
+ Dimension dim = InsetMathGrid::dimension(bv);
+ dim.wid += 6;
+ return dim;
}