* src/Text3.cpp (doDispatch):

	- always replace selected text when inserting an inset (bug 672)
	- inset selected text in inserted URL inset (bug 683)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19231 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/Text3.cpp b/src/Text3.cpp
index 18e915f6af19f66aa87d8cc943d76fd58d17ab69..c879412f8ee4e272810b02638a1c8dbeaca9c0b4 100644 (file)
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -755,6 +755,8 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                                dispatch(cur, fr);
                        }
                        */
+                       if (cur.selection())
+                               cutSelection(cur, true, false);
                        insertInset(cur, inset);
                        cur.posRight();
                }
@@ -1158,15 +1160,39 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 
        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 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
        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) {