BufferParams.cpp: fix #6714

[lyx.git] / src / HunspellChecker.cpp

diff --git a/src/HunspellChecker.cpp b/src/HunspellChecker.cpp
index 8c47fdb070cc17ebfe15eb425058b7ab13e66d1f..9678a71c04c56d3e21d1da05c8e5d7d2d8266988 100644 (file)
--- a/src/HunspellChecker.cpp
+++ b/src/HunspellChecker.cpp
@@ -138,7 +138,7 @@ Hunspell * HunspellChecker::Private::addSpeller(string const & lang)
 
        FileName const affix(hunspell_path + ".aff");
        FileName const dict(hunspell_path + ".dic");
-       Hunspell * h = new Hunspell(affix.absFilename().c_str(), dict.absFilename().c_str());
+       Hunspell * h = new Hunspell(affix.absFileName().c_str(), dict.absFileName().c_str());
        spellers_[lang] = h;
        return h;
 }
@@ -183,11 +183,14 @@ SpellChecker::Result HunspellChecker::check(WordLangTuple const & wl)
        if (d->isIgnored(wl))
                return OK;
 
-       string const word_to_check = to_utf8(wl.word());
        Hunspell * h = d->speller(wl.lang()->code());
        if (!h)
                return OK;
        int info;
+
+       string const encoding = h->get_dic_encoding();
+       string const word_to_check = to_iconv_encoding(wl.word(), encoding);
+       
        if (h->spell(word_to_check.c_str(), &info))
                return OK;
 
@@ -224,16 +227,17 @@ void HunspellChecker::suggest(WordLangTuple const & wl,
        docstring_list & suggestions)
 {
        suggestions.clear();
-       string const word_to_check = to_utf8(wl.word());
        Hunspell * h = d->speller(wl.lang()->code());
        if (!h)
                return;
+       string const encoding = h->get_dic_encoding();
+       string const word_to_check = to_iconv_encoding(wl.word(), encoding);
        char ** suggestion_list;
        int const suggestion_number = h->suggest(&suggestion_list, word_to_check.c_str());
        if (suggestion_number <= 0)
                return;
        for (int i = 0; i != suggestion_number; ++i)
-               suggestions.push_back(from_utf8(suggestion_list[i]));
+               suggestions.push_back(from_iconv_encoding(suggestion_list[i], encoding));
        h->free_list(&suggestion_list, suggestion_number);
 }