168999: don't uninit the spellchecker twice, and eliminate the non-thread-safe asserts

editor/composer/src/nsEditorSpellCheck.cpp

@@ -61,6 +61,7 @@ nsEditorSpellCheck::nsEditorSpellCheck()
   : mSuggestedWordIndex(0)
   , mDictionaryIndex(0)
 {
+  NS_INIT_ISUPPORTS();
 }
 
 nsEditorSpellCheck::~nsEditorSpellCheck()

editor/ui/dialogs/content/EdSpellCheck.js

@@ -491,7 +491,11 @@ function doDefault()
 function CancelSpellCheck()
 {
   if (gSpellChecker)
-    gSpellChecker.UninitSpellChecker();
+  {
+    try {
+      gSpellChecker.UninitSpellChecker();
+    } finally { gSpellChecker = null; }
+  }
 
   // Signal to calling window that we canceled
   window.opener.cancelSendMessage = true;
@@ -501,7 +505,12 @@ function CancelSpellCheck()
 function onClose()
 {
   if (gSpellChecker)
-    gSpellChecker.UninitSpellChecker();
+  {
+    try {
+      gSpellChecker.UninitSpellChecker();
+    } finally { gSpellChecker = null; }
+  }
+
   window.opener.cancelSendMessage = false;
   window.close();
 }