From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Tue, 19 Oct 1999 16:11:58 +0000 (+0000)
Subject: Fix math macro bug, caused by the evil string::operator+=(int)
X-Git-Tag: 1.6.10~22599
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=ba452ec219cd57b230b3a45dfb96f785d1b34edb;p=features.git

Fix math macro bug, caused by the evil string::operator+=(int)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@212 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/ChangeLog b/ChangeLog
index b80bba59d9..4277986e59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 1999-10-19  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
+	* src/mathed/math_macro.C (MathMacroArgument::Write,
+	MathMacroTemplate::WriteDef): add tostr() around macro arg numbers
+	when writing them out.
+
+	* src/LString.C: remove, since it is not used anymore.
+	
+	* src/support/lyxstring.C: condition the content to
+	USE_INCLUDED_STRING macro.
+
 	* src/mathed/math_symbols.C, src/support/lstrings.C,
 	src/support/lyxstring.C: add `using' directive to specify what
 	we need in <algorithm>. I do not think that we need to
diff --git a/src/mathed/math_macro.C b/src/mathed/math_macro.C
index 895c2bf95f..f8aab67183 100644
--- a/src/mathed/math_macro.C
+++ b/src/mathed/math_macro.C
@@ -256,7 +256,7 @@ void MathMacroArgument::Write(string &file)
 	MathParInset::Write(file);
     } else {
 	file += '#';
-	file += number;
+	file += tostr(number);
 	file += ' ';
     }
 }
@@ -388,7 +388,7 @@ void MathMacroTemplate::WriteDef(string &file)
       
     if (nargs > 0 ) {
       file += '[';
-      file += nargs;
+      file += tostr(nargs);
       file += ']';
     }