From: Julian Smart <julian@anthemion.co.uk>
Date: Sat, 15 Jan 2011 13:20:00 +0000 (+0000)
Subject: XML import corrections
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/2865d42dd600e0260cb8b9c4310b587c3558798c?ds=inline

XML import corrections


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

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