Strip html tags from window title and completion dialog

These are native controls that can't contain html
mrichards42 · May 7, 2024 · 8c315af · 8c315af
1 parent 085eca5
commit 8c315af
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/MyFrame.cpp b/src/MyFrame.cpp
@@ -982,8 +982,7 @@ MyFrame::ShowMetadata()
         SetTitle(XWORD_APP_NAME);
     else {
         // Puzzle titles can contain HTML, so parse out the plain text.
-        PlainTextHtmlParser parser;
-        wxString title = * (wxString*) (parser.Parse(puz2wx(m_puz.GetTitle())));
+        wxString title = PlainTextHtmlParser::StripTags(puz2wx(m_puz.GetTitle()));
         SetTitle(title + _T(" - ") XWORD_APP_NAME);
     }
 
@@ -1095,8 +1094,10 @@ MyFrame::CheckPuzzle()
             m_status->SetAlert(_T("The puzzle is filled correctly!"),
                 wxGetApp().GetConfigManager().Status.completeColor());
             // Show completion message for acrostics since it is often the formatted quote.
-            if (m_puz.GetGrid().IsAcrostic() && m_puz.HasMeta(puzT("completion")))
-                XWordMessage(this, m_puz.GetMeta(puzT("completion")));
+            if (m_puz.GetGrid().IsAcrostic() && m_puz.HasMeta(puzT("completion"))) {
+                wxString message = PlainTextHtmlParser::StripTags(puz2wx(m_puz.GetMeta(puzT("completion"))));
+                XWordMessage(this, message);
+            }
             break;
         case UNCHECKABLE_PUZZLE:
             StopTimer();

diff --git a/src/html/parse.hpp b/src/html/parse.hpp
@@ -50,6 +50,12 @@ class PlainTextHtmlParser : public wxHtmlParser
         return (wxObject*) &text;
     }
 
+    static wxString StripTags (const wxString & input) {
+        PlainTextHtmlParser parser;
+        wxString text = * (wxString*) parser.Parse(input);
+        return text;
+    }
+
 private:
     wxString text;
 };