[patch] bug 672: Should insets replace selections?

[Jürgen Spitzmüller]

http://bugzilla.lyx.org/show_bug.cgi?id=672

This is another long-term issue I wanted to fix long ago. Since the changes 
are trivial, I'd like to put this in branch and trunk. The patch also fixes 
bug 683 (use selection when inserting URL).

Objections?

Jürgen

Index: src/Text3.cpp
===================================================================
--- src/Text3.cpp	(Revision 19223)
+++ src/Text3.cpp	(Arbeitskopie)
@@ -755,6 +755,8 @@
 				dispatch(cur, fr);
 			}
 			*/
+			if (cur.selection())
+				cutSelection(cur, true, false);
 			insertInset(cur, inset);
 			cur.posRight();
 		}
@@ -1158,15 +1160,39 @@
 
 	case LFUN_URL_INSERT: {
 		InsetCommandParams p("url");
+		docstring content;
+		if (cur.selection()) {
+			content = cur.selectionAsString(false);
+			cutSelection(cur, true, false);
+		}
+		p["target"] = (cmd.argument().empty()) ?
+			content : cmd.argument();
 		string const data = InsetCommandMailer::params2string("url", p);
-		bv->showInsetDialog("url", data, 0);
+		if (p["target"].empty()) {
+			bv->showInsetDialog("url", data, 0);
+		} else {
+			FuncRequest fr(LFUN_INSET_INSERT, data);
+			dispatch(cur, fr);
+		}
 		break;
 	}
 
 	case LFUN_HTML_INSERT: {
 		InsetCommandParams p("htmlurl");
+		docstring content;
+		if (cur.selection()) {
+			content = cur.selectionAsString(false);
+			cutSelection(cur, true, false);
+		}
+		p["target"] = (cmd.argument().empty()) ?
+			content : cmd.argument();
 		string const data = InsetCommandMailer::params2string("url", p);
-		bv->showInsetDialog("url", data, 0);
+		if (p["target"].empty()) {
+			bv->showInsetDialog("url", data, 0);
+		} else {
+			FuncRequest fr(LFUN_INSET_INSERT, data);
+			dispatch(cur, fr);
+		}
 		break;
 	}
 
@@ -1503,9 +1529,9 @@
 	case LFUN_FLOAT_LIST: {
 		TextClass const & tclass = bv->buffer()->params().getTextClass();
 		if (tclass.floats().typeExist(to_utf8(cmd.argument()))) {
-			// not quite sure if we want this...
 			recordUndo(cur);
-			cur.clearSelection();
+			if (cur.selection())
+				cutSelection(cur, true, false);
 			breakParagraph(cur);
 
 			if (cur.lastpos() != 0) {