fix pullArg when pressing <Delete> at the end of an cell

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

diff --git a/src/mathed/math_macroarg.C b/src/mathed/math_macroarg.C
index 343ef599423590e9804aa2ab855067f68ba3c480..c64f750c77dab189abf72ca85c5f4da5a6715cdb 100644 (file)
--- a/src/mathed/math_macroarg.C
+++ b/src/mathed/math_macroarg.C
@@ -1,5 +1,3 @@
-#include <config.h>
-
 #ifdef __GNUG__
 #pragma implementation
 #endif
@@ -8,7 +6,6 @@
 #include "math_macro.h"
 #include "math_defs.h"
 #include "mathed/support.h"
-#include "support/LAssert.h"
 #include "debug.h"
 
 
@@ -19,12 +16,11 @@ MathMacroArgument::MathMacroArgument(int n)
        if (n < 1 || n > 9) {
                lyxerr << "MathMacroArgument::MathMacroArgument: wrong Argument id: "
                        << n << std::endl;
-               lyx::Assert(0);
        }
 }
 
 
-MathInset * MathMacroArgument::Clone() const
+MathInset * MathMacroArgument::clone() const
 {
        return new MathMacroArgument(*this);
 }
@@ -38,7 +34,7 @@ void MathMacroArgument::draw(Painter & pain, int x, int y)
 }
 
 
-void MathMacroArgument::Metrics(MathStyles st)
+void MathMacroArgument::Metrics(MathStyles st, int, int)
 {
        char str[] = "#0";
        str[1] += number_; 
@@ -59,8 +55,8 @@ void MathMacroArgument::WriteNormal(std::ostream & os) const
 }
 
 
-void MathMacroArgument::substitute(MathArray & arr, MathMacro const & m) const
+void MathMacroArgument::substitute(MathArray & array, MathMacro const & m) const
 {
-       arr.push_back(m.cell(number_ - 1));
+       array.push_back(m.cell(number_ - 1));
 }