last commit was incomplete... not sure how I managed this..

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

diff --git a/src/mathed/InsetMath.cpp b/src/mathed/InsetMath.cpp
index 64db5a21809d540012d0a50e35633ff91efc6ae5..855b4902e97d02f69b1faeb828beec585f245da0 100644 (file)
--- a/src/mathed/InsetMath.cpp
+++ b/src/mathed/InsetMath.cpp
@@ -28,17 +28,17 @@ namespace lyx {
 
 
 
-MathArray & InsetMath::cell(idx_type)
+MathData & InsetMath::cell(idx_type)
 {
-       static MathArray dummyCell;
+       static MathData dummyCell;
        lyxerr << BOOST_CURRENT_FUNCTION << ": I don't have any cell" << endl;
        return dummyCell;
 }
 
 
-MathArray const & InsetMath::cell(idx_type) const
+MathData const & InsetMath::cell(idx_type) const
 {
-       static MathArray dummyCell;
+       static MathData dummyCell;
        lyxerr << BOOST_CURRENT_FUNCTION << ": I don't have any cell" << endl;
        return dummyCell;
 }
@@ -57,21 +57,16 @@ void InsetMath::dump() const
 
 void InsetMath::metricsT(TextMetricsInfo const &, Dimension &) const
 {
-#ifdef WITH_WARNINGS
        lyxerr << "InsetMath::metricsT(Text) called directly!" << endl;
-#endif
 }
 
 
 void InsetMath::drawT(TextPainter &, int, int) const
 {
-#ifdef WITH_WARNINGS
        lyxerr << "InsetMath::drawT(Text) called directly!" << endl;
-#endif
 }
 
 
-
 void InsetMath::write(WriteStream & os) const
 {
        docstring const s = name();
@@ -84,7 +79,7 @@ void InsetMath::write(WriteStream & os) const
 
 
 int InsetMath::plaintext(Buffer const &, odocstream &,
-                         OutputParams const &) const
+                        OutputParams const &) const
 {
        // all math plain text output shall take place in InsetMathHull
        BOOST_ASSERT(false);
@@ -128,8 +123,8 @@ void InsetMath::mathematica(MathematicaStream & os) const
 
 void InsetMath::mathmlize(MathStream & os) const
 {
-        NormalStream ns(os.os());
-        normalize(ns);
+       NormalStream ns(os.os());
+       normalize(ns);
 }
 
 
@@ -139,12 +134,6 @@ HullType InsetMath::getType() const
 }
 
 
-docstring InsetMath::name() const
-{
-       return from_ascii("unknown");
-}
-
-
 std::ostream & operator<<(std::ostream & os, MathAtom const & at)
 {
        odocstringstream oss;