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

Added a flag suppressing node content conversion when saving to XML.

Browse Source 
This helps improve the extremely poor performance of XML saving if
you have, for example, hex data that does not need conversion.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2010-10-05 06:17:22 +00:00
parent 6ffb5e91ea
commit 30f6914ba1
3 changed files with 45 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/xml/xml.cpp
View File

@@ -54,7 +54,8 @@ wxXmlNode::wxXmlNode(wxXmlNode *parent,wxXmlNodeType type,
: m_type(type), m_name(name), m_content(content),
m_attrs(attrs), m_parent(parent),
m_children(NULL), m_next(next),
m_lineNo(lineNo)
m_lineNo(lineNo),
m_noConversion(false)
{
if (m_parent)
{
@@ -74,7 +75,7 @@ wxXmlNode::wxXmlNode(wxXmlNodeType type, const wxString& name,
: m_type(type), m_name(name), m_content(content),
m_attrs(NULL), m_parent(NULL),
m_children(NULL), m_next(NULL),
m_lineNo(lineNo)
m_lineNo(lineNo), m_noConversion(false)
{}
wxXmlNode::wxXmlNode(const wxXmlNode& node)
@@ -115,6 +116,7 @@ void wxXmlNode::DoCopy(const wxXmlNode& node)
m_name = node.m_name;
m_content = node.m_content;
m_lineNo = node.m_lineNo;
m_noConversion = node.m_noConversion;
m_children = NULL;
wxXmlNode *n = node.m_children;
@@ -796,7 +798,14 @@ bool OutputString(wxOutputStream& stream,
wxUnusedVar(convMem);
if ( !convFile )
convFile = &wxConvUTF8;
#if 1
// JACS test
const wxWX2MBbuf buf(str.mb_str(*convFile));
if (!buf.length())
return false;
stream.Write((const char*)buf, strlen((const char*)buf));
#else
const wxScopedCharBuffer buf(str.mb_str(*convFile));
if ( !buf.length() )
{
@@ -806,6 +815,8 @@ bool OutputString(wxOutputStream& stream,
}
stream.Write(buf, buf.length());
#endif
#else // !wxUSE_UNICODE
if ( convFile && convMem )
{
@@ -913,7 +924,13 @@ bool OutputNode(wxOutputStream& stream,
break;
case wxXML_TEXT_NODE:
rc = OutputEscapedString(stream, node->GetContent(),
if (node->GetNoConversion())
{
stream.Write(node->GetContent().c_str(), node->GetContent().Length());
rc = true;
}
else
rc = OutputEscapedString(stream, node->GetContent(),
convMem, convFile,
Escape_Text);
break;