tostr and lyxstring::find fixes

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

diff --git a/ChangeLog b/ChangeLog
index 1a97629bb07018b1c28e2ba78a6199a47f6cac92..8eed1ef404c76be34f09aac44eb572182d5f69d1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+1999-10-28  Lars Gullik Bjønnes  <larsbj@lyx.org>
+
+       * src/support/lstrings.C (tostr(char)): fix it to handle param as
+       a character not as a small integer. 
+
+       * src/support/lyxstring.C (find): removed Assert and added i >=
+       rep->sz to the first if.
+
 1999-10-27  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
        * src/LyXAction.C (LookupFunc): added a workaround for sun

diff --git a/src/support/lstrings.C b/src/support/lstrings.C
index 5089a1d8c3b326f0a77bb5a0b31e09f0246d7ffa..eb98f513d803a406ecbdf4e0d83d061e6d8147fe 100644 (file)
--- a/src/support/lstrings.C
+++ b/src/support/lstrings.C
@@ -86,7 +86,7 @@ string tostr(unsigned int ui)
 
 string tostr(char c)
 {
-  return tostr(long(c));
+       return string(1, c);
 }
 
 string tostr(bool b)

diff --git a/src/support/lyxstring.C b/src/support/lyxstring.C
index 32ab71c6a8b3a39dbeef231cc845311abaecb929..49e15874e7360ce7097f12e1408383b66d54da8a 100644 (file)
--- a/src/support/lyxstring.C
+++ b/src/support/lyxstring.C
@@ -864,9 +864,8 @@ void lyxstring::insert(iterator p, iterator first, iterator last)
 
 lyxstring::size_type lyxstring::find(lyxstring const & a, size_type i) const
 {
-       if (!rep->sz) return npos;
+       if (!rep->sz || i >= rep->sz) return npos;
        
-       Assert(i < rep->sz);
        TestlyxstringInvariant(this);
 
        for (size_type t = i; rep->sz - t >= a.length(); ++t) {