anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 21:21:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix a lyxstring bug and ws change

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3916 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2002-04-06 12:42:42 +00:00
parent 96baa149c3
commit 3bf37285fb
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/support/filetools.C
View File

@ -1007,9 +1007,10 @@ string const GetExtension(string const & name)
/// return the "extension" which belongs to the contents.
/// for no knowing contents return the extension. Without
/// an extension and unknown contents we return "user"
string const getExtFromContents(string const & filename) {
if (filename.empty() || !IsFileReadable(filename))
string const getExtFromContents(string const & filename)
{
// paranoia check
if (filename.empty() || !IsFileReadable(filename))
return string();
ifstream ifs(filename.c_str());

9
src/support/lyxstring.C
View File

@ -663,10 +663,13 @@ lyxstring & lyxstring::assign(const_iterator first, const_iterator last)
lyxstring::const_reference lyxstring::operator[](size_type pos) const
{
#if 0
// This is actually what the standard requires,
lyx::Assert(pos <= rep->sz); // OURS!
static char helper = '\0';
return pos == rep->sz ? helper : rep->s[pos];
#else
// but we use this one since it is stricter
// and more according to the real intent of std::string.
lyx::Assert(pos < rep->sz); // OURS!
return rep->s[pos];
#endif
@ -1731,7 +1734,7 @@ void swap(lyxstring & str1, lyxstring & str2)
istream & operator>>(istream & is, lyxstring & s)
{
#if 1
#if 0
// very bad solution
char * nome = new char[1024];
is >> nome;
@ -1740,7 +1743,7 @@ istream & operator>>(istream & is, lyxstring & s)
if (!tmp.empty()) s = tmp;
#else
// better solution
int w = is.widdth(0);
int w = is.width(0);
s.clear();
char c = 0;
while (is.get(c)) {
@ -1748,7 +1751,7 @@ istream & operator>>(istream & is, lyxstring & s)
s += c;
if (--w == 1) break;
}
if (s.empty()) is.setstate(ios::failbit);
if (s.empty()) is.setstate(std::ios::failbit);
#endif
return is;
}