Restore correct version check for AA_UseHighDpiPixmaps - amend change ae56fb6171

[features.git] / src / Text3.cpp

diff --git a/src/Text3.cpp b/src/Text3.cpp
index fcccdd3d4878235180c849115c31a59092d19bfe..1623996ec665aa052bc49ec173e349a3bb079438 100644 (file)
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -252,7 +252,7 @@ static bool doInsertInset(Cursor & cur, Text * text,
        cur.recordUndo();
        if (cmd.action() == LFUN_ARGUMENT_INSERT) {
                bool cotextinsert = false;
-               InsetArgument const * const ia = static_cast<InsetArgument const *>(inset);
+               InsetArgument * const ia = static_cast<InsetArgument *>(inset);
                Layout const & lay = cur.paragraph().layout();
                Layout::LaTeXArgMap args = lay.args();
                Layout::LaTeXArgMap::const_iterator const lait = args.find(ia->name());
@@ -275,6 +275,7 @@ static bool doInsertInset(Cursor & cur, Text * text,
                        else
                                ds = cur.paragraph().asString();
                        text->insertInset(cur, inset);
+                       ia->init(cur.paragraph());
                        if (edit)
                                inset->edit(cur, true);
                        // Now put co-text into inset
@@ -321,6 +322,11 @@ static bool doInsertInset(Cursor & cur, Text * text,
                inset_text->setOuterFont(cur.bv(), font.fontInfo());
        }
 
+       if (cmd.action() == LFUN_ARGUMENT_INSERT) {
+               InsetArgument * const ia = static_cast<InsetArgument *>(inset);
+               ia->init(cur.paragraph());
+       }
+
        if (edit)
                inset->edit(cur, true);
 
@@ -2755,13 +2761,8 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                        cur.recordUndoBufferParams();
                        bv->buffer().params().spellignore().push_back(wl);
                        cur.recordUndo();
-                       // trigger re-check
-                       WordLangTuple wl;
-                       docstring_list suggestions;
-                       Paragraph const & par = cur.paragraph();
-                       pos_type from = cur.pos();
-                       pos_type to = from;
-                       par.spellCheck(from, to, wl, suggestions, true, true);
+                       // trigger re-check of whole buffer
+                       bv->buffer().requestSpellcheck();
                }
                break;
        }
@@ -2794,13 +2795,8 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                        cur.recordUndoBufferParams();
                        bv->buffer().params().spellignore().erase(it);
                        cur.recordUndo();
-                       // trigger re-check
-                       WordLangTuple wl;
-                       docstring_list suggestions;
-                       Paragraph const & par = cur.paragraph();
-                       pos_type from = cur.pos();
-                       pos_type to = from;
-                       par.spellCheck(from, to, wl, suggestions, true, true);
+                       // trigger re-check of whole buffer
+                       bv->buffer().requestSpellcheck();
                }
                break;
        }
@@ -3433,6 +3429,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
                break;
 
        case LFUN_PRIMARY_SELECTION_PASTE:
+               status.setUnknown(!theSelection().supported());
                enable = cur.selection() || !theSelection().empty();
                break;