Fix crash noticed by Bennett:

[lyx.git] / src / BufferView.cpp

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 61a40a2eadf53555d2361e7004ed05dd7a8ada9f..46b3e079b451d3fba7010efde633d895f593119d 100644 (file)
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -276,6 +276,9 @@ struct BufferView::Private
 
        /// Cache for Find Next
        FuncRequest search_request_cache_;
+
+       ///
+       map<string, Inset *> edited_insets_;
 };
 
 
@@ -1153,6 +1156,23 @@ bool BufferView::getStatus(FuncRequest const & cmd, FuncStatus & flag)
                flag.setEnabled(lyx::getStatus(fr).enabled());
                break;
        }
+       case LFUN_INSET_APPLY: {
+               string const name = cmd.getArg(0);
+               Inset * inset = editedInset(name);
+               if (inset) {
+                       FuncRequest fr(LFUN_INSET_MODIFY, cmd.argument());
+                       FuncStatus fs;
+                       if (!inset->getStatus(cur, fr, fs)) {
+                               // Every inset is supposed to handle this
+                               LASSERT(false, break);
+                       }
+                       flag |= fs;
+               } else {
+                       FuncRequest fr(LFUN_INSET_INSERT, cmd.argument());
+                       flag |= lyx::getStatus(fr);
+               }
+               break;
+       }
 
        default:
                flag.setEnabled(false);
@@ -1163,6 +1183,19 @@ bool BufferView::getStatus(FuncRequest const & cmd, FuncStatus & flag)
 }
 
 
+Inset * BufferView::editedInset(string const & name) const
+{
+       map<string, Inset *>::const_iterator it = d->edited_insets_.find(name);
+       return it == d->edited_insets_.end() ? 0 : it->second;
+}
+
+
+void BufferView::editInset(string const & name, Inset * inset)
+{
+       d->edited_insets_[name] = inset;
+}
+
+
 bool BufferView::dispatch(FuncRequest const & cmd)
 {
        //lyxerr << [ cmd = " << cmd << "]" << endl;
@@ -1823,6 +1856,29 @@ bool BufferView::dispatch(FuncRequest const & cmd)
                break;
        }
 
+       case LFUN_INSET_APPLY: {
+               string const name = cmd.getArg(0);
+               Inset * inset = editedInset(name);
+               if (!inset) {
+                       FuncRequest fr(LFUN_INSET_INSERT, cmd.argument());
+                       lyx::dispatch(fr);
+                       break;
+               }
+               // put cursor in front of inset.
+               if (!setCursorFromInset(inset)) {
+                       LASSERT(false, break);
+               }
+               // useful if we are called from a dialog.
+               cur.beginUndoGroup();
+               cur.recordUndo();
+               FuncRequest fr(LFUN_INSET_MODIFY, cmd.argument());
+               inset->dispatch(cur, fr);
+               cur.endUndoGroup();
+               processUpdateFlags(Update::SinglePar | Update::FitCursor);
+               break;
+       }
+
+
        default:
                return false;
        }