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

XML import corrections

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2011-01-15 13:20:00 +00:00
parent 23bdfeee49
commit 2865d42dd6
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/richtext/richtextxml.cpp
View File

@@ -169,9 +169,9 @@ wxRichTextObject* wxRichTextXMLHandler::CreateObjectForXMLName(wxRichTextObject*
else if (name == wxT("textbox")) else if (name == wxT("textbox"))
return new wxRichTextBox; return new wxRichTextBox;
else if (name == wxT("cell")) else if (name == wxT("cell"))
return new wxRichTextBox; return new wxRichTextCell;
else if (name == wxT("table")) else if (name == wxT("table"))
return new wxRichTextBox; return new wxRichTextTable;
else else
return NULL; return NULL;
} }
@@ -411,6 +411,7 @@ wxXmlNode* wxRichTextXMLHandler::FindNode(wxXmlNode* node, const wxString& name)
{ {
if (child->GetName() == name) if (child->GetName() == name)
return child; return child;
child = child->GetNext();
} }
return NULL; return NULL;
} }
@@ -1945,7 +1946,7 @@ bool wxRichTextObject::ImportFromXML(wxRichTextBuffer* WXUNUSED(buffer), wxXmlNo
handler->ImportProperties(this, node); handler->ImportProperties(this, node);
handler->ImportStyle(GetAttributes(), node, UsesParagraphAttributes()); handler->ImportStyle(GetAttributes(), node, UsesParagraphAttributes());
*recurse = false; *recurse = true;
return true; return true;
} }