replaceSelection(cur);
if (sel.empty()) {
+#ifdef ENABLE_ASSERTIONS
const int old_pos = cur.pos();
+#endif
cur.insert(new InsetMathHull(hullSimple));
BOOST_ASSERT(old_pos == cur.pos());
cur.nextInset()->edit(cur, true);
inset->edit(cur, true);
if (gotsel && pastesel) {
- lyx::dispatch(FuncRequest(LFUN_PASTE));
+ lyx::dispatch(FuncRequest(LFUN_PASTE, "0"));
// reset first par to default
if (cur.lastpit() != 0 || cur.lastpos() != 0) {
LyXLayout_ptr const layout =
case LFUN_PASTE:
cur.message(_("Paste"));
cap::replaceSelection(cur);
- if (isStrUnsignedInt(to_utf8(cmd.argument())))
- pasteSelection(cur, bv->buffer()->errorList("Paste"),
- convert<unsigned int>(to_utf8(cmd.argument())));
- else
+ if (cmd.argument().empty() && !theClipboard().isInternal())
+ pasteString(cur, theClipboard().get(), docstring());
+ else {
+ string const arg(to_utf8(cmd.argument()));
pasteSelection(cur, bv->buffer()->errorList("Paste"),
- 0);
- bv->buffer()->errors("Paste");
+ isStrUnsignedInt(arg) ?
+ convert<unsigned int>(arg) :
+ 0);
+ bv->buffer()->errors("Paste");
+ }
cur.clearSelection(); // bug 393
bv->switchKeyMap();
finishUndo();
break;
}
- case LFUN_CLIPBOARD_PASTE: {
- cur.clearSelection();
- docstring const clip = theClipboard().get();
- if (!clip.empty()) {
- recordUndo(cur);
- if (cmd.argument() == "paragraph")
- insertStringAsParagraphs(cur, clip);
- else
- insertStringAsLines(cur, clip);
- }
+ case LFUN_CLIPBOARD_PASTE:
+ pasteString(cur, theClipboard().get(), cmd.argument());
break;
- }
- case LFUN_PRIMARY_SELECTION_PASTE: {
- cur.clearSelection();
- docstring const clip = theSelection().get();
- if (!clip.empty()) {
- recordUndo(cur);
- if (cmd.argument() == "paragraph")
- insertStringAsParagraphs(cur, clip);
- else
- insertStringAsLines(cur, clip);
- }
+ case LFUN_PRIMARY_SELECTION_PASTE:
+ pasteString(cur, theSelection().get(), cmd.argument());
break;
- }
case LFUN_UNICODE_INSERT: {
if (cmd.argument().empty())
// insert this
if (cmd.button() == mouse_button::button2) {
if (paste_internally)
- lyx::dispatch(FuncRequest(LFUN_PASTE));
+ lyx::dispatch(FuncRequest(LFUN_PASTE, "0"));
else
lyx::dispatch(FuncRequest(LFUN_PRIMARY_SELECTION_PASTE, "paragraph"));
}
break;
case LFUN_PASTE:
- enable = cap::numberOfSelections() > 0;
+ // FIXME: This is not correct, but the correct code below is
+ // expensive
+ enable = cap::numberOfSelections() > 0 ||
+ !theClipboard().isInternal();
+#if 0
+ if (cmd.argument().empty()) {
+ if (theClipboard().isInternal())
+ enable = cap::numberOfSelections() > 0;
+ else
+ enable = !theClipboard().get().empty();
+ } else if (isStrUnsignedInt(to_utf8(cmd.argument()))) {
+ int n = convert<unsigned int>(to_utf8(cmd.argument()));
+ enable = cap::numberOfSelections() > n;
+ } else
+ // unknown argument
+ enable = false;
+#endif
break;
case LFUN_PARAGRAPH_MOVE_UP:
}
+void LyXText::pasteString(LCursor & cur, docstring const & clip,
+ docstring const & argument)
+{
+ cur.clearSelection();
+ if (!clip.empty()) {
+ recordUndo(cur);
+ if (argument == "paragraph")
+ insertStringAsParagraphs(cur, clip);
+ else
+ insertStringAsLines(cur, clip);
+ }
+}
+
} // namespace lyx