mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-29 02:40:05 +00:00
Code Activity

Fixes for mac screen-saver disabling and XML extended utf-8 character parsing.

Browse source
This commit is contained in:
Julian Storer 2011-06-28 18:00:57 +01:00
parent 18c9aa8e62
commit 640ad3ac7b
7 changed files with 58 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/text/juce_XmlDocument.cpp
View file

@ -179,11 +179,15 @@ String XmlDocument::getFileContents (const String& filename) const
juce_wchar XmlDocument::readNextChar() noexcept
{
if (*input != 0)
return *input++;
const juce_wchar c = input.getAndAdvance();
outOfData = true;
return 0;
if (c == 0)
{
outOfData = true;
--input;
}
return c;
}
int XmlDocument::findNextTokenLength() noexcept
@ -315,15 +319,16 @@ void XmlDocument::readQuotedString (String& result)
if (c == quote)
break;
--input;
if (c == '&')
{
--input;
readEntity (result);
}
else
{
--input;
const String::CharPointerType start (input);
int numChars = 0;
for (;;)
{
@ -331,14 +336,13 @@ void XmlDocument::readQuotedString (String& result)
if (character == quote)
{
result.appendCharPointer (start, (int) (input.getAddress() - start.getAddress()));
result.appendCharPointer (start, numChars);
++input;
return;
}
else if (character == '&')
{
result.appendCharPointer (start, (int) (input.getAddress() - start.getAddress()));
result.appendCharPointer (start, numChars);
break;
}
else if (character == 0)
@ -349,6 +353,7 @@ void XmlDocument::readQuotedString (String& result)
}
++input;
++numChars;
}
}
}