BufferParams.cpp: fix #6714

[lyx.git] / src / Thesaurus.cpp

diff --git a/src/Thesaurus.cpp b/src/Thesaurus.cpp
index f3814baaf7adc4bf246f4ca3c52ea715589063c9..dea7c05e3d5d3a4db3820404a1263b248326852d 100644 (file)
--- a/src/Thesaurus.cpp
+++ b/src/Thesaurus.cpp
@@ -21,7 +21,6 @@
 #include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/os.h"
-#include "support/unicode.h"
 
 #include "support/mythes/mythes.hxx"
 
@@ -38,21 +37,6 @@ namespace lyx {
 
 namespace {
 
-string const to_iconv_encoding(docstring const & s, string const & encoding)
-{
-       std::vector<char> const encoded =
-               ucs4_to_eightbit(s.data(), s.length(), encoding);
-       return string(encoded.begin(), encoded.end());
-}
-
-
-docstring const from_iconv_encoding(string const & s, string const & encoding)
-{
-       std::vector<char_type> const ucs4 =
-               eightbit_to_ucs4(s.data(), s.length(), encoding);
-       return docstring(ucs4.begin(), ucs4.end());
-}
-
 typedef std::map<docstring, MyThes *> Thesauri;
 
 } // namespace anon
@@ -110,7 +94,7 @@ pair<string, string> Thesaurus::Private::getThesaurus(docstring const & lang)
             it != idx_files.end(); ++it) {
                LYXERR(Debug::FILES, "found thesaurus idx file: " << it->onlyFileName());
                if (contains(it->onlyFileName(), to_ascii(lang))) {
-                       idx = it->absFilename();
+                       idx = it->absFileName();
                        LYXERR(Debug::FILES, "selected thesaurus idx file: " << idx);
                        break;
                        }
@@ -120,7 +104,7 @@ pair<string, string> Thesaurus::Private::getThesaurus(docstring const & lang)
             it != data_files.end(); ++it) {
                LYXERR(Debug::FILES, "found thesaurus data file: " << it->onlyFileName());
                if (contains(it->onlyFileName(), to_ascii(lang))) {
-                       data = it->absFilename();
+                       data = it->absFileName();
                        LYXERR(Debug::FILES, "selected thesaurus data file: " << data);
                        break;
                        }
@@ -132,6 +116,9 @@ pair<string, string> Thesaurus::Private::getThesaurus(docstring const & lang)
 
 bool Thesaurus::Private::addThesaurus(docstring const & lang)
 {
+       if (thesaurusAvailable(lang))
+               return true;
+
        ThesFiles files = getThesaurus(lang);
        string const idx = files.first;
        string const data = files.second;