Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 338427 followup - fix Get/SetCurrentDictionary signature; r=ehsan

Browse Source
This commit is contained in:
arno renevier 2011-08-15 13:55:02 -04:00
parent c4a382824d
commit abf78cfc8e
3 changed files with 27 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
editor/composer/src/nsEditorSpellCheck.cpp
View File

@ -378,34 +378,22 @@ nsEditorSpellCheck::GetDictionaryList(PRUnichar ***aDictionaryList, PRUint32 *aC
}
NS_IMETHODIMP
nsEditorSpellCheck::GetCurrentDictionary(PRUnichar **aDictionary)
nsEditorSpellCheck::GetCurrentDictionary(nsAString& aDictionary)
{
NS_ENSURE_TRUE(mSpellChecker, NS_ERROR_NOT_INITIALIZED);
NS_ENSURE_TRUE(aDictionary, NS_ERROR_NULL_POINTER);
*aDictionary = 0;
nsAutoString dictStr;
nsresult rv = mSpellChecker->GetCurrentDictionary(dictStr);
NS_ENSURE_SUCCESS(rv, rv);
*aDictionary = ToNewUnicode(dictStr);
return rv;
return mSpellChecker->GetCurrentDictionary(aDictionary);
}
NS_IMETHODIMP
nsEditorSpellCheck::SetCurrentDictionary(const PRUnichar *aDictionary)
nsEditorSpellCheck::SetCurrentDictionary(const nsAString& aDictionary)
{
NS_ENSURE_TRUE(mSpellChecker, NS_ERROR_NOT_INITIALIZED);
NS_ENSURE_TRUE(aDictionary, NS_ERROR_NULL_POINTER);
if (!mUpdateDictionaryRunning) {
mDictWasSetManually = PR_TRUE;
}
return mSpellChecker->SetCurrentDictionary(nsDependentString(aDictionary));
return mSpellChecker->SetCurrentDictionary(aDictionary);
}
NS_IMETHODIMP
@ -428,18 +416,12 @@ nsEditorSpellCheck::SaveDefaultDictionary()
if (!mDictWasSetManually) {
return NS_OK;
}
PRUnichar *dictName = nsnull;
nsresult rv = GetCurrentDictionary(&dictName);
if (NS_SUCCEEDED(rv) && dictName && *dictName) {
rv = Preferences::SetString("spellchecker.dictionary", dictName);
}
nsAutoString dictName;
nsresult rv = GetCurrentDictionary(dictName);
NS_ENSURE_SUCCESS(rv, rv);
if (dictName) {
nsMemory::Free(dictName);
}
return rv;
return Preferences::SetString("spellchecker.dictionary", dictName);
}
@ -522,10 +504,10 @@ nsEditorSpellCheck::UpdateCurrentDictionary(nsIEditor* aEditor)
}
}
SetCurrentDictionary(NS_LITERAL_STRING("").get());
SetCurrentDictionary(EmptyString());
if (NS_SUCCEEDED(rv) && !dictName.IsEmpty()) {
rv = SetCurrentDictionary(dictName.get());
rv = SetCurrentDictionary(dictName);
if (NS_FAILED(rv)) {
// required dictionary was not available. Try to get a dictionary
// matching at least language part of dictName: If required dictionary is
@ -535,7 +517,7 @@ nsEditorSpellCheck::UpdateCurrentDictionary(nsIEditor* aEditor)
if (dashIdx != -1) {
langCode.Assign(Substring(dictName, 0, dashIdx));
// try to use langCode
rv = SetCurrentDictionary(langCode.get());
rv = SetCurrentDictionary(langCode);
} else {
langCode.Assign(dictName);
}
@ -550,7 +532,7 @@ nsEditorSpellCheck::UpdateCurrentDictionary(nsIEditor* aEditor)
for (i = 0; i < count; i++) {
nsAutoString dictStr(dictList.ElementAt(i));
if (nsStyleUtil::DashMatchCompare(dictStr, langCode, comparator) &&
NS_SUCCEEDED(SetCurrentDictionary(dictStr.get()))) {
NS_SUCCEEDED(SetCurrentDictionary(dictStr))) {
break;
}
}
@ -563,14 +545,14 @@ nsEditorSpellCheck::UpdateCurrentDictionary(nsIEditor* aEditor)
// not work, pick the first one.
if (editorLang.IsEmpty()) {
nsAutoString currentDictionary;
rv = mSpellChecker->GetCurrentDictionary(currentDictionary);
rv = GetCurrentDictionary(currentDictionary);
if (NS_FAILED(rv) || currentDictionary.IsEmpty()) {
rv = SetCurrentDictionary(NS_LITERAL_STRING("en-US").get());
rv = SetCurrentDictionary(NS_LITERAL_STRING("en-US"));
if (NS_FAILED(rv)) {
nsTArray<nsString> dictList;
rv = mSpellChecker->GetDictionaryList(&dictList);
if (NS_SUCCEEDED(rv) && dictList.Length() > 0) {
SetCurrentDictionary(dictList[0].get());
SetCurrentDictionary(dictList[0]);
}
}
}

6
editor/idl/nsIEditorSpellCheck.idl
View File

@ -41,7 +41,7 @@
interface nsIEditor;
interface nsITextServicesFilter;
[scriptable, uuid(803ff0dd-07f2-4438-b3a6-ab9c2fe4e1dd)]
[scriptable, uuid(3da0ce96-7d3a-48d0-80b7-2d90dab09747)]
interface nsIEditorSpellCheck : nsISupports
{
@ -143,12 +143,12 @@ interface nsIEditorSpellCheck : nsISupports
/**
* @see nsISpellChecker::GetCurrentDictionary
*/
wstring GetCurrentDictionary();
AString GetCurrentDictionary();
/**
* @see nsISpellChecker::SetCurrentDictionary
*/
void SetCurrentDictionary(in wstring dictionary);
void SetCurrentDictionary(in AString dictionary);
/**
* Call to save the currently selected dictionary as the default. The

27
extensions/spellcheck/src/mozInlineSpellChecker.cpp
View File

@ -1445,8 +1445,8 @@ mozInlineSpellChecker::ResumeCheck(mozInlineSpellStatus* aStatus)
rv = GetSpellCheckSelection(getter_AddRefs(spellCheckSelection));
NS_ENSURE_SUCCESS(rv, rv);
PRUnichar *currentDictionary = nsnull;
rv = mSpellCheck->GetCurrentDictionary(&currentDictionary);
nsAutoString currentDictionary;
rv = mSpellCheck->GetCurrentDictionary(currentDictionary);
if (NS_FAILED(rv)) {
// no active dictionary
PRInt32 count;
@ -1760,31 +1760,22 @@ NS_IMETHODIMP mozInlineSpellChecker::UpdateCurrentDictionary()
return NS_OK;
}
PRUnichar *previousDictionary = nsnull;
nsDependentString previousDictionaryStr;
if (NS_SUCCEEDED(mSpellCheck->GetCurrentDictionary(&previousDictionary))) {
previousDictionaryStr.Assign(previousDictionary);
nsAutoString previousDictionary;
if (NS_FAILED(mSpellCheck->GetCurrentDictionary(previousDictionary))) {
previousDictionary.Truncate();
}
nsCOMPtr<nsIEditor> editor (do_QueryReferent(mEditor));
nsresult rv = mSpellCheck->UpdateCurrentDictionary(editor);
PRUnichar *currentDictionary = nsnull;
nsDependentString currentDictionaryStr;
if (NS_SUCCEEDED(mSpellCheck->GetCurrentDictionary(&currentDictionary))) {
currentDictionaryStr.Assign(currentDictionary);
nsAutoString currentDictionary;
if (NS_FAILED(mSpellCheck->GetCurrentDictionary(currentDictionary))) {
currentDictionary.Truncate();
}
if (!previousDictionary || !currentDictionary || !previousDictionaryStr.Equals(currentDictionaryStr)) {
if (!previousDictionary.Equals(currentDictionary)) {
rv = SpellCheckRange(nsnull);
}
if (previousDictionary) {
nsMemory::Free(previousDictionary);
}
if (currentDictionary) {
nsMemory::Free(currentDictionary);
}
return rv;
}