Fix to bug 2362: Deleting superscript also deletes subscript.

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

diff --git a/src/mathed/math_macroarg.C b/src/mathed/math_macroarg.C
index 655ff52932a50b0a160045c15928d5937c96056f..d4b7adf986cd0dca92b9ab8669874e06b1b6e796 100644 (file)
--- a/src/mathed/math_macroarg.C
+++ b/src/mathed/math_macroarg.C
@@ -19,10 +19,11 @@
 
 using std::endl;
 using std::auto_ptr;
+using std::size_t;
 
 
-MathMacroArgument::MathMacroArgument(int n)
-       : MathNestInset(1), number_(n), expanded_(false)
+MathMacroArgument::MathMacroArgument(size_t n)
+       : number_(n)
 {
        if (n < 1 || n > 9) {
                lyxerr << "MathMacroArgument::MathMacroArgument: wrong Argument id: "
@@ -34,7 +35,7 @@ MathMacroArgument::MathMacroArgument(int n)
 }
 
 
-auto_ptr<InsetBase> MathMacroArgument::clone() const
+auto_ptr<InsetBase> MathMacroArgument::doClone() const
 {
        return auto_ptr<InsetBase>(new MathMacroArgument(*this));
 }
@@ -48,20 +49,14 @@ void MathMacroArgument::write(WriteStream & os) const
 
 void MathMacroArgument::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       if (expanded_)
-               cell(0).metrics(mi, dim_);
-       else
-               mathed_string_dim(mi.base.font, str_, dim_);
+       mathed_string_dim(mi.base.font, str_, dim_);
        dim = dim_;
 }
 
 
 void MathMacroArgument::draw(PainterInfo & pi, int x, int y) const
 {
-       if (expanded_)
-               cell(0).draw(pi, x, y);
-       else
-               drawStrRed(pi, x, y, str_);
+       drawStrRed(pi, x, y, str_);
        setPosCache(pi, x, y);
 }
 
@@ -70,10 +65,3 @@ void MathMacroArgument::normalize(NormalStream & os) const
 {
        os << "[macroarg " << str_ << "] ";
 }
-
-
-void MathMacroArgument::substitute(MathMacro const & m)
-{
-       cell(0) = m.cell(number_ - 1);
-       expanded_ = true;
-}