Add new variables lyx_build_date/time

[lyx.git] / src / AspellChecker.cpp

diff --git a/src/AspellChecker.cpp b/src/AspellChecker.cpp
index 5829612270191f5479265193209d28ce538087d5..06da1f81495af0d276704b2c4f15247c1a45b179 100644 (file)
--- a/src/AspellChecker.cpp
+++ b/src/AspellChecker.cpp
@@ -25,7 +25,7 @@
 #include "support/filetools.h"
 #include "support/Package.h"
 #include "support/FileName.h"
-#include "support/Path.h"
+#include "support/PathChanger.h"
 
 #include <aspell.h>
 
@@ -357,11 +357,13 @@ SpellChecker::Result AspellChecker::Private::check(
 {
        SpellChecker::Result result = WORD_OK;
        docstring w1;
+       LYXERR(Debug::GUI, "spellCheck: \"" <<
+                  word.word() << "\", lang = " << word.lang()->lang()) ;
        docstring rest = split(word.word(), w1, '-');
        for (; result == WORD_OK;) {
                string const word_str = toAspellWord(w1);
                int const word_ok = aspell_speller_check(m, word_str.c_str(), -1);
-               LASSERT(word_ok != -1, /**/);
+               LASSERT(word_ok != -1, return UNKNOWN_WORD);
                result = (word_ok) ? WORD_OK : UNKNOWN_WORD;
                if (rest.empty())
                        break;
@@ -371,7 +373,7 @@ SpellChecker::Result AspellChecker::Private::check(
                return result;
        string const word_str = toAspellWord(word.word());
        int const word_ok = aspell_speller_check(m, word_str.c_str(), -1);
-       LASSERT(word_ok != -1, /**/);
+       LASSERT(word_ok != -1, return UNKNOWN_WORD);
        return (word_ok) ? WORD_OK : UNKNOWN_WORD;
 }
 
@@ -480,7 +482,7 @@ void AspellChecker::suggest(WordLangTuple const & wl,
        string const word = d->toAspellWord(wl.word());
        AspellWordList const * sugs =
                aspell_speller_suggest(m, word.c_str(), -1);
-       LASSERT(sugs != 0, /**/);
+       LASSERT(sugs != 0, return);
        AspellStringEnumeration * els = aspell_word_list_elements(sugs);
        if (!els || aspell_word_list_empty(sugs))
                return;