From: Abdelrazak Younes <younes@lyx.org>
Date: Sun, 7 Nov 2010 17:38:39 +0000 (+0000)
Subject: Fix assert in all InsetParamsWidget's for unicode characters (bug #7017)
X-Git-Tag: 2.0.0~1930
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=7ff3e84c5db18df8514dfa54ea6976cc5cbe2c77;p=features.git

Fix assert in all InsetParamsWidget's for unicode characters (bug #7017)

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

diff --git a/src/frontends/qt4/GuiHyperlink.cpp b/src/frontends/qt4/GuiHyperlink.cpp
index f030b8ec95..7cb9cc61d4 100644
--- a/src/frontends/qt4/GuiHyperlink.cpp
+++ b/src/frontends/qt4/GuiHyperlink.cpp
@@ -81,7 +81,7 @@ docstring GuiHyperlink::dialogToParams() const
 	else if (fileRB->isChecked())
 		params["type"] = qstring_to_ucs4("file:");
 	params.setCmdName("href");
-	return from_ascii(InsetHyperlink::params2string(params));
+	return from_utf8(InsetHyperlink::params2string(params));
 }
 
 
diff --git a/src/frontends/qt4/GuiLabel.cpp b/src/frontends/qt4/GuiLabel.cpp
index d888ae07d8..5d1ea4a3ef 100644
--- a/src/frontends/qt4/GuiLabel.cpp
+++ b/src/frontends/qt4/GuiLabel.cpp
@@ -54,7 +54,7 @@ docstring GuiLabel::dialogToParams() const
 {
 	InsetCommandParams params(insetCode());
 	params["name"] = qstring_to_ucs4(keywordED->text());
-	return from_ascii(InsetLabel::params2string(params));
+	return from_utf8(InsetLabel::params2string(params));
 }
 
 
diff --git a/src/frontends/qt4/GuiNomenclature.cpp b/src/frontends/qt4/GuiNomenclature.cpp
index b6a795ee46..92250a7b27 100644
--- a/src/frontends/qt4/GuiNomenclature.cpp
+++ b/src/frontends/qt4/GuiNomenclature.cpp
@@ -56,7 +56,7 @@ docstring GuiNomenclature::dialogToParams() const
 	QString description = descriptionTE->toPlainText();
 	description.replace('\n',"\\\\");
 	params["description"] = qstring_to_ucs4(description);
-	return from_ascii(InsetNomencl::params2string(params));
+	return from_utf8(InsetNomencl::params2string(params));
 }