Do not let cursor overlap with inserted graphics.

[lyx.git] / src / HunspellChecker.cpp

diff --git a/src/HunspellChecker.cpp b/src/HunspellChecker.cpp
index 06349c65d0a586310fd4f983d8922049e1a27456..01ec19498b70e28075db5e5b8a9c6bb8c4c77e49 100644 (file)
--- a/src/HunspellChecker.cpp
+++ b/src/HunspellChecker.cpp
@@ -41,8 +41,6 @@ namespace {
 typedef map<std::string, Hunspell *> Spellers;
 typedef map<std::string, PersonalWordList *> LangPersonalWordList;
 
-typedef vector<WordLangTuple> IgnoreList;
-
 docstring remap_result(docstring const & s)
 {
        // substitute RIGHT SINGLE QUOTATION MARK
@@ -70,8 +68,7 @@ struct HunspellChecker::Private
        Hunspell * speller(Language const * lang);
        Hunspell * lookup(Language const * lang);
        /// ignored words
-       bool isIgnored(WordLangTuple const & wl,
-                      std::vector<WordLangTuple> const & docdict) const;
+       bool isIgnored(WordLangTuple const & wl) const;
        /// personal word list interface
        void remove(WordLangTuple const & wl);
        void insert(WordLangTuple const & wl);
@@ -79,7 +76,7 @@ struct HunspellChecker::Private
        /// the spellers
        Spellers spellers_;
        ///
-       IgnoreList ignored_;
+       WordLangTable ignored_;
        ///
        LangPersonalWordList personal_;
        ///
@@ -282,23 +279,15 @@ int HunspellChecker::Private::numDictionaries() const
 }
 
 
-bool HunspellChecker::Private::isIgnored(WordLangTuple const & wl,
-                                        vector<WordLangTuple> const & docdict) const
+bool HunspellChecker::Private::isIgnored(WordLangTuple const & wl) const
 {
-       IgnoreList::const_iterator it = ignored_.begin();
+       WordLangTable::const_iterator it = ignored_.begin();
        for (; it != ignored_.end(); ++it) {
                if (it->lang()->code() != wl.lang()->code())
                        continue;
                if (it->word() == wl.word())
                        return true;
        }
-       it = docdict.begin();
-       for (; it != docdict.end(); ++it) {
-               if (it->lang()->code() != wl.lang()->code())
-                       continue;
-               if (it->word() == wl.word())
-                       return true;
-       }
        return false;
 }
 
@@ -356,9 +345,17 @@ HunspellChecker::~HunspellChecker()
 SpellChecker::Result HunspellChecker::check(WordLangTuple const & wl,
                                            vector<WordLangTuple> const & docdict)
 {
-       if (d->isIgnored(wl, docdict))
+       if (d->isIgnored(wl))
                return WORD_OK;
 
+       WordLangTable::const_iterator it = docdict.begin();
+       for (; it != docdict.end(); ++it) {
+               if (it->lang()->code() != wl.lang()->code())
+                       continue;
+               if (it->word() == wl.word())
+                       return DOCUMENT_LEARNED_WORD;
+       }
+
        Hunspell * h = d->speller(wl.lang());
        if (!h)
                return NO_DICTIONARY;