Don't crash on malformed HTML in wxHTML font tag handler.

[wxWidgets.git] / src / common / docview.cpp

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index 2111cfd22f6e8d477e0dabdc789315eaadff9b8f..86d1783490db08f66d384bde644ce2ca7aae9da0 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -1087,7 +1087,7 @@ void wxDocManager::OnMRUFile(wxCommandEvent& event)
     // Check if the id is in the range assigned to MRU list entries.
     const int id = event.GetId();
     if ( id >= wxID_FILE1 &&
     // Check if the id is in the range assigned to MRU list entries.
     const int id = event.GetId();
     if ( id >= wxID_FILE1 &&

-            id < wxID_FILE1 + m_fileHistory->GetBaseId() )
+            id < wxID_FILE1 + static_cast<int>(m_fileHistory->GetCount()) )

     {
         DoOpenMRUFile(id - wxID_FILE1);
     }
     {
         DoOpenMRUFile(id - wxID_FILE1);
     }


@@ -1408,6 +1408,7 @@ wxDocument *wxDocManager::CreateDocument(const wxString& pathOrig, long flags)
             {
                 // file already open, just activate it and return
                 ActivateDocument(doc);
             {
                 // file already open, just activate it and return
                 ActivateDocument(doc);

+                return doc;

             }
         }
     }
             }
         }
     }


@@ -1893,6 +1894,20 @@ void wxDocManager::DisassociateTemplate(wxDocTemplate *temp)
     m_templates.DeleteObject(temp);
 }
 
     m_templates.DeleteObject(temp);
 }
 

+wxDocTemplate* wxDocManager::FindTemplate(const wxClassInfo* classinfo)
+{
+   for ( wxList::compatibility_iterator node = m_templates.GetFirst();
+         node;
+         node = node->GetNext() )
+   {
+      wxDocTemplate* t = wxStaticCast(node->GetData(), wxDocTemplate);
+      if ( t->GetDocClassInfo() == classinfo )
+         return t;
+   }
+
+   return NULL;
+}
+

 // Add and remove a document from the manager's list
 void wxDocManager::AddDocument(wxDocument *doc)
 {
 // Add and remove a document from the manager's list
 void wxDocManager::AddDocument(wxDocument *doc)
 {