Allow removing words from the personal dictionary, that weren't previously added.

[features.git] / src / insets / InsetText.cpp

diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index 1767f2c31f2591f1f7dd9d41f62309e799b4a411..4cecec8cd7ec31019ca85795a67b609ffd5363dd 100644 (file)
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -1040,6 +1040,10 @@ bool InsetText::insetAllowed(InsetCode code) const
        case QUOTE_CODE:
        case COUNTER_CODE:
                return true;
+       // These are only allowed in index insets
+       case INDEXMACRO_CODE:
+       case INDEXMACRO_SORTKEY_CODE:
+               return false;
        default:
                return !isPassThru();
        }
@@ -1118,7 +1122,7 @@ void InsetText::updateBuffer(ParIterator const & it, UpdateType utype, bool cons
                tclass.counters().current_float(savecnt.current_float());
                tclass.counters().isSubfloat(savecnt.isSubfloat());
                buffer().updateBuffer(it2, utype, deleted);
-               tclass.counters() = move(savecnt);
+               tclass.counters() = std::move(savecnt);
        }
 }
 
@@ -1322,13 +1326,12 @@ docstring InsetText::completionPrefix(Cursor const & cur) const
 }
 
 
-bool InsetText::insertCompletion(Cursor & cur, docstring const & s,
-       bool finished)
+bool InsetText::insertCompletion(Cursor & cur, docstring const & s, bool /*finished*/)
 {
        if (!completionSupported(cur))
                return false;
 
-       return text_.insertCompletion(cur, s, finished);
+       return text_.insertCompletion(cur, s);
 }