diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
commit | 3749d61e1f7a59f5ec5067e560af1eb610c82015 (patch) | |
tree | 73dc228333948738bbe02976cacca8cd382bc978 /Source/WebKit2/UIProcess/API/gtk/WebKitTextChecker.cpp | |
parent | b32b4dcd9a51ab8de6afc53d9e17f8707e1f7a5e (diff) | |
download | qtwebkit-3749d61e1f7a59f5ec5067e560af1eb610c82015.tar.gz |
Imported WebKit commit a77350243e054f3460d1137301d8b3faee3d2052 (http://svn.webkit.org/repository/webkit/trunk@125365)
New snapshot with build fixes for latest API changes in Qt and all WK1 Win MSVC fixes upstream
Diffstat (limited to 'Source/WebKit2/UIProcess/API/gtk/WebKitTextChecker.cpp')
-rw-r--r-- | Source/WebKit2/UIProcess/API/gtk/WebKitTextChecker.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitTextChecker.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitTextChecker.cpp index 5676bb6d7..5ae62c6fd 100644 --- a/Source/WebKit2/UIProcess/API/gtk/WebKitTextChecker.cpp +++ b/Source/WebKit2/UIProcess/API/gtk/WebKitTextChecker.cpp @@ -140,13 +140,15 @@ void WebKitTextChecker::setSpellCheckingEnabled(bool enabled) WKTextCheckerContinuousSpellCheckingEnabledStateChanged(enabled); } -void WebKitTextChecker::setSpellCheckingLanguages(const String& languages) +const CString& WebKitTextChecker::getSpellCheckingLanguages() { - if (m_spellCheckingLanguages == languages) - return; - m_spellCheckingLanguages = languages; + String spellCheckingLanguages = m_textChecker->getSpellCheckingLanguages(); + m_spellCheckingLanguages = spellCheckingLanguages.isEmpty() ? CString() : spellCheckingLanguages.utf8(); + return m_spellCheckingLanguages; +} - // We need to update the languages in the enchant-based checker too. - m_textChecker->updateSpellCheckingLanguages(languages); +void WebKitTextChecker::setSpellCheckingLanguages(const CString& languages) +{ + m_textChecker->updateSpellCheckingLanguages(String::fromUTF8(languages.data())); } #endif // ENABLE(SPELLCHECK) |