Fixed listing unsupported languages as known languages for Windows.

desktop-app · Jan 21, 2020 · b1d635f · b1d635f
1 parent 5f8ee69
commit b1d635f
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/spellcheck/platform/win/spellcheck_win.cpp b/spellcheck/platform/win/spellcheck_win.cpp
@@ -63,14 +63,12 @@ class WindowsSpellChecker {
 	bool isLanguageSupported(const LPCWSTR& lang);
 	void createSpellCheckers();
 
-	std::vector<QString> _systemLanguages;
 	ComPtr<ISpellCheckerFactory> _spellcheckerFactory;
 	std::map<QString, ComPtr<ISpellChecker>> _spellcheckerMap;
 
 };
 
 WindowsSpellChecker::WindowsSpellChecker() {
-	_systemLanguages = SystemLanguages();
 	createFactory();
 	createSpellCheckers();
 }
@@ -87,7 +85,7 @@ void WindowsSpellChecker::createSpellCheckers() {
 	if (!_spellcheckerFactory) {
 		return;
 	}
-	for (const auto &lang : _systemLanguages) {
+	for (const auto &lang : SystemLanguages()) {
 		const auto wlang = Q2WString(lang);
 		if (!isLanguageSupported(wlang)) {
 			continue;
@@ -253,7 +251,12 @@ void WindowsSpellChecker::ignoreWord(LPCWSTR word) {
 }
 
 std::vector<QString> WindowsSpellChecker::systemLanguages() {
-	return _systemLanguages;
+	std::vector<QString> langs;
+	ranges::transform(
+		_spellcheckerMap,
+		ranges::back_inserter(langs),
+		[](const auto &pair) { return pair.first; });
+	return langs;
 }
 
 ////// End of WindowsSpellChecker class.