Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed CDATA processing to convert the content to output charset, it should be treated just like text in this respect

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46078 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-05-16 22:35:17 +00:00
parent 12058e0cb5
commit d6cb12871f
1 changed files with 2 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/xml/xml.cpp
View File

@@ -458,7 +458,6 @@ struct wxXmlParsingContext
wxXmlNode *lastAsText; wxXmlNode *lastAsText;
wxString encoding; wxString encoding;
wxString version; wxString version;
bool bLastCdata;
bool removeWhiteOnlyNodes; bool removeWhiteOnlyNodes;
}; };
@@ -495,17 +494,9 @@ static void TextHnd(void *userData, const char *s, int len)
wxString str = CharToString(ctx->conv, s, len); wxString str = CharToString(ctx->conv, s, len);
if (ctx->lastAsText) if (ctx->lastAsText)
{
if ( ctx->bLastCdata )
{
ctx->lastAsText->SetContent(ctx->lastAsText->GetContent() +
CharToString(NULL, s, len));
}
else
{ {
ctx->lastAsText->SetContent(ctx->lastAsText->GetContent() + str); ctx->lastAsText->SetContent(ctx->lastAsText->GetContent() + str);
} }
}
else else
{ {
bool whiteOnly = false; bool whiteOnly = false;
@@ -524,19 +515,10 @@ static void StartCdataHnd(void *userData)
{ {
wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData; wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData;
ctx->bLastCdata = true;
ctx->lastAsText = new wxXmlNode(wxXML_CDATA_SECTION_NODE, wxT("cdata"),wxT("")); ctx->lastAsText = new wxXmlNode(wxXML_CDATA_SECTION_NODE, wxT("cdata"),wxT(""));
ctx->node->AddChild(ctx->lastAsText); ctx->node->AddChild(ctx->lastAsText);
} }
static void EndCdataHnd(void *userData)
{
wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData;
ctx->bLastCdata = false;
}
static void CommentHnd(void *userData, const char *data) static void CommentHnd(void *userData, const char *data)
{ {
wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData; wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData;
@@ -625,12 +607,11 @@ bool wxXmlDocument::Load(wxInputStream& stream, const wxString& encoding, int fl
ctx.conv = new wxCSConv(encoding); ctx.conv = new wxCSConv(encoding);
#endif #endif
ctx.removeWhiteOnlyNodes = (flags & wxXMLDOC_KEEP_WHITESPACE_NODES) == 0; ctx.removeWhiteOnlyNodes = (flags & wxXMLDOC_KEEP_WHITESPACE_NODES) == 0;
ctx.bLastCdata = false;
XML_SetUserData(parser, (void*)&ctx); XML_SetUserData(parser, (void*)&ctx);
XML_SetElementHandler(parser, StartElementHnd, EndElementHnd); XML_SetElementHandler(parser, StartElementHnd, EndElementHnd);
XML_SetCharacterDataHandler(parser, TextHnd); XML_SetCharacterDataHandler(parser, TextHnd);
XML_SetCdataSectionHandler(parser, StartCdataHnd, EndCdataHnd ); XML_SetStartCdataSectionHandler(parser, StartCdataHnd);
XML_SetCommentHandler(parser, CommentHnd); XML_SetCommentHandler(parser, CommentHnd);
XML_SetDefaultHandler(parser, DefaultHnd); XML_SetDefaultHandler(parser, DefaultHnd);
XML_SetUnknownEncodingHandler(parser, UnknownEncodingHnd, NULL); XML_SetUnknownEncodingHandler(parser, UnknownEncodingHnd, NULL);