DeXml issue...

git-svn-id: svn://ultimatepp.org/upp/trunk@923 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2009-03-07 12:16:20 +00:00
parent fff598768c
commit e315c7e30d

View file

@ -15,7 +15,7 @@ String DeXml(const char *s, byte charset)
else if(*s == '&') result.Cat("&");
else if(*s == '\'') result.Cat("'");
else if(*s == '\"') result.Cat(""");
else if((byte)*s < ' ') result.Cat(NFormat("&#x%02x;", (byte)*s));
else if((byte)*s < ' ' && *s != '\n') result.Cat(NFormat("&#x%02x;", (byte)*s));
else if(!(*s & 0x80) || charset == CHARSET_UTF8) result.Cat(*s);
else result.Cat(ToUtf8(ToUnicode(*s, charset)));
return result;