split LyXText::rowlist_ into individual Paragraph::rows_ chunks

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

diff --git a/src/mathed/math_tabularinset.C b/src/mathed/math_tabularinset.C
index 2fd1b697b08ad0a0dff30cb15ee2b076bb45c233..e3170770d4d734cad22d333a7f8346f47704c75c 100644 (file)
--- a/src/mathed/math_tabularinset.C
+++ b/src/mathed/math_tabularinset.C
@@ -4,7 +4,7 @@
 #include "math_tabularinset.h"
 #include "math_parser.h"
 #include "math_mathmlstream.h"
-#include "math_metricsinfo.h"
+#include "metricsinfo.h"
 #include "math_streamstr.h"
 #include "Lsstream.h"
 
@@ -14,6 +14,7 @@ using std::vector;
 using std::istringstream;
 using std::getline;
 using std::istream_iterator;
+using std::auto_ptr;
 
 
 MathTabularInset::MathTabularInset(string const & name, int m, int n)
@@ -33,22 +34,22 @@ MathTabularInset::MathTabularInset(string const & name, char valign,
 {}
 
 
-MathInset * MathTabularInset::clone() const
+auto_ptr<InsetBase> MathTabularInset::clone() const
 {
-       return new MathTabularInset(*this);
+       return auto_ptr<InsetBase>(new MathTabularInset(*this));
 }
 
 
-void MathTabularInset::metrics(MathMetricsInfo & mi) const
+void MathTabularInset::metrics(MetricsInfo & mi, Dimension & /*dim*/) const
 {
-       MathFontSetChanger dummy(mi.base, "textnormal");
-       MathGridInset::metrics(mi);
+       FontSetChanger dummy(mi.base, "textnormal");
+       return MathGridInset::metrics(mi);
 }
 
 
-void MathTabularInset::draw(MathPainterInfo & pi, int x, int y) const
+void MathTabularInset::draw(PainterInfo & pi, int x, int y) const
 {
-       MathFontSetChanger dummy(pi.base, "textnormal");
+       FontSetChanger dummy(pi.base, "textnormal");
        MathGridInset::draw(pi, x, y);
 }