From: Martin Vermeer <martin.vermeer@hut.fi>
Date: Tue, 11 Nov 2003 13:59:39 +0000 (+0000)
Subject: Small step to solving 'impossible to insert some insets' problem
X-Git-Tag: 1.6.10~15802
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=b171a9b6fbb43e245b4e2850fc9163b91191e6e8;p=features.git

Small step to solving 'impossible to insert some insets' problem


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

diff --git a/src/ChangeLog b/src/ChangeLog
index faad588306..198b685158 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2003-11-11  Martin Vermeer  <martin.vermeer@hut.fi>
+
+	* text3.C:
+	* factory.C: Small step to solving 'unable to insert some insets'
+	problem
+
 2003-11-11  Alfredo Braunstein  <abraunst@lyx.org>
 
 	* cursor.[Ch] (updatePos): new function for updating the y
diff --git a/src/factory.C b/src/factory.C
index fcfb662f8b..1fbfd642c2 100644
--- a/src/factory.C
+++ b/src/factory.C
@@ -278,6 +278,19 @@ InsetOld * createInset(FuncRequest const & cmd)
 		}
 	}
 
+	case LFUN_INSERT_LABEL: {
+		InsetCommandParams icp;
+		InsetCommandMailer::string2params(cmd.argument, icp);
+		return new InsetLabel(icp);
+	}
+
+	case LFUN_URL:
+	case LFUN_HTMLURL: {
+		InsetCommandParams icp;
+		InsetCommandMailer::string2params(cmd.argument, icp);
+		return new InsetUrl(icp);
+	}
+
 	case LFUN_SPACE_INSERT: {
 		string const name = cmd.argument;
 		if (name == "normal")
diff --git a/src/text3.C b/src/text3.C
index 14c6b21091..6c3b2baf95 100644
--- a/src/text3.C
+++ b/src/text3.C
@@ -1488,15 +1488,17 @@ DispatchResult LyXText::dispatch(FuncRequest const & cmd)
 		break;
 	}
 
-	case LFUN_HTMLURL: {
-		InsetCommandParams p("htmlurl");
+	case LFUN_URL: {
+		doInsertInset(this, cmd, true, false);
+		InsetCommandParams p("url");
 		string const data = InsetCommandMailer::params2string("url", p);
 		bv->owner()->getDialogs().show("url", data, 0);
 		break;
 	}
 
-	case LFUN_URL: {
-		InsetCommandParams p("url");
+	case LFUN_HTMLURL: {
+		doInsertInset(this, cmd, true, false);
+		InsetCommandParams p("htmlurl");
 		string const data = InsetCommandMailer::params2string("url", p);
 		bv->owner()->getDialogs().show("url", data, 0);
 		break;