X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FMathMacroArgument.cpp;h=33e29ed1660e3dbc1b0a7215c2b6b596340e8a93;hb=11a6b3c4c7a031fd3776f53c9c43f62116933cea;hp=01f9a1c9b5a805bf4723722c1470fc5c387d5539;hpb=8a45e185dc2a2ed756176be9229702c524a36872;p=lyx.git diff --git a/src/mathed/MathMacroArgument.cpp b/src/mathed/MathMacroArgument.cpp index 01f9a1c9b5..33e29ed166 100644 --- a/src/mathed/MathMacroArgument.cpp +++ b/src/mathed/MathMacroArgument.cpp @@ -14,22 +14,19 @@ #include "MathMacroArgument.h" #include "MathStream.h" #include "MathSupport.h" -#include "debug.h" +#include "support/debug.h" -namespace lyx { - -using std::endl; -using std::size_t; +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 // str_ = '#' + convert(n); // so we do the conversion of n to ASCII manually. @@ -46,19 +43,26 @@ Inset * MathMacroArgument::clone() const } +void MathMacroArgument::setNumber(size_t n) +{ + if (n < 1 || n > 9) { + LYXERR0("MathMacroArgument::setNumber: wrong Argument id: " << n); + } + + number_ = n; + str_[1] = '0' + n; +} + + void MathMacroArgument::write(WriteStream & os) const { os << str_; } -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; }