Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for bugscape bug #2698 (Need to wire up Spellchecker language prefs)

Browse Source 
mozilla/odules/libpref/src/init/all.js
      - Added "spellchecker.dictionary" default pref and removed old 4.x spellchecker prefs.

    mozilla/editor/base/nsEditorShell.cpp
      - Added code to InitSpellChecker() and UninitSpellChecker() to get and
        set the "spellchecker.dictionary" pref.

r=brade@netscape.com sr,a=sfraser@netscape.com


git-svn-id: svn://10.0.0.236/trunk@81131 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kin%netscape.com
2000-10-13 13:36:22 +00:00
parent f23a896b90
commit 712894eb72
3 changed files with 117 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
mozilla/editor/base/nsEditorShell.cpp
View File

@@ -94,6 +94,8 @@
#include "nsILookAndFeel.h"
#include "nsIChromeRegistry.h"
///////////////////////////////////////
// Editor Includes
///////////////////////////////////////
@@ -140,6 +142,7 @@ static NS_DEFINE_CID(kCStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
static NS_DEFINE_CID(kCommonDialogsCID, NS_CommonDialog_CID );
static NS_DEFINE_CID(kDialogParamBlockCID, NS_DialogParamBlock_CID);
static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID);
static NS_DEFINE_CID(kChromeRegistryCID, NS_CHROMEREGISTRY_CID);
/* Define Interface IDs */
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
@@ -4588,6 +4591,45 @@ nsEditorShell::InitSpellChecker()
if (NS_FAILED(result))
return result;
// Tell the spellchecker what dictionary to use:
PRUnichar *dictName = nsnull;
NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &result);
if (NS_SUCCEEDED(result) && prefs)
result = prefs->CopyUnicharPref("spellchecker.dictionary", &dictName);
if (! dictName || ! *dictName)
{
// Prefs didn't give us a dictionary name, so just get the current
// locale and use that as the default dictionary name!
if (dictName)
{
nsMemory::Free(dictName);
dictName = nsnull;
}
nsCOMPtr<nsIChromeRegistry> chromeRegistry = do_GetService(kChromeRegistryCID, &result);
if (NS_SUCCEEDED(result) && chromeRegistry)
result = chromeRegistry->GetSelectedLocale(NS_LITERAL_STRING("navigator"), &dictName);
}
if (NS_SUCCEEDED(result) && dictName && *dictName)
result = SetCurrentDictionary(dictName);
if (dictName)
nsMemory::Free(dictName);
// If an error was thrown while checking the dictionary pref, just
// fail silently so that the spellchecker dialog is allowed to come
// up. The user can manually reset the language to their choice on
// the dialog if it is wrong.
result = NS_OK;
DeleteSuggestedWordList();
}
@@ -4839,6 +4881,22 @@ nsEditorShell::UninitSpellChecker()
// We can spell check with any editor type
if (mEditor)
{
// Save the last used dictionary to the user's preferences.
NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &result);
if (NS_SUCCEEDED(result) && prefs)
{
PRUnichar *dictName = nsnull;
result = GetCurrentDictionary(&dictName);
if (NS_SUCCEEDED(result) && dictName && *dictName)
result = prefs->SetUnicharPref("spellchecker.dictionary", dictName);
if (dictName)
nsMemory::Free(dictName);
}
// Cleanup - kill the spell checker
DeleteSuggestedWordList();
mDictionaryList.Clear();