X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FMathMacroArgument.cpp;h=33e29ed1660e3dbc1b0a7215c2b6b596340e8a93;hb=11a6b3c4c7a031fd3776f53c9c43f62116933cea;hp=d1735f1544b834405e691d51e966b9ff6502dd41;hpb=32871c1284f15265f652ff01c438e539a7c8181f;p=lyx.git

diff --git a/src/mathed/MathMacroArgument.cpp b/src/mathed/MathMacroArgument.cpp
index d1735f1544..33e29ed166 100644
--- a/src/mathed/MathMacroArgument.cpp
+++ b/src/mathed/MathMacroArgument.cpp
@@ -14,25 +14,20 @@
 #include "MathMacroArgument.h"
 #include "MathStream.h"
 #include "MathSupport.h"
-#include "debug.h"
 
+#include "support/debug.h"
 
-namespace lyx {
-
-using std::endl;
-using std::auto_ptr;
-using std::size_t;
-using std::vector;
 
+namespace lyx {
 
 MathMacroArgument::MathMacroArgument(size_t n)
 	: number_(n)
 {
 	if (n < 1 || n > 9) {
-		lyxerr << "MathMacroArgument::MathMacroArgument: wrong Argument id: "
-			<< n << endl;
+		LYXERR0("MathMacroArgument::MathMacroArgument: wrong Argument id: " << n);
 	}
-	// The profiler tells us not to use 
+
+	// The profiler tells us not to use
 	// str_ = '#' + convert<docstring>(n);
 	// so we do the conversion of n to ASCII manually.
 	// This works because 1 <= n <= 9.
@@ -42,9 +37,20 @@ MathMacroArgument::MathMacroArgument(size_t n)
 }
 
 
-auto_ptr<Inset> MathMacroArgument::doClone() const
+Inset * MathMacroArgument::clone() const
+{
+	return new MathMacroArgument(*this);
+}
+
+
+void MathMacroArgument::setNumber(size_t n)
 {
-	return auto_ptr<Inset>(new MathMacroArgument(*this));
+	if (n < 1 || n > 9) {
+		LYXERR0("MathMacroArgument::setNumber: wrong Argument id: " << n);
+	}
+
+	number_ = n;
+	str_[1] = '0' + n;
 }
 
 
@@ -54,13 +60,9 @@ void MathMacroArgument::write(WriteStream & os) const
 }
 
 
-bool MathMacroArgument::metrics(MetricsInfo & mi, Dimension & dim) const
+void MathMacroArgument::metrics(MetricsInfo & mi, Dimension & dim) const
 {
 	mathed_string_dim(mi.base.font, str_, dim);
-	if (dim_ == dim)
-		return false;
-	dim_ = dim;
-	return true;
 }