Author: younes
Date: Sun Nov 7 18:38:39 2010
New Revision: 36194
URL: http://www.lyx.org/trac/changeset/36194
Log:
Fix assert in all InsetParamsWidget's for unicode characters (bug #7017)
Modified:
lyx-devel/trunk/src/frontends/qt4/GuiHyperlink.cpp
lyx-devel/trunk/src/frontends/qt4/GuiLabel.cpp
lyx-devel/trunk/src/frontends/qt4/GuiNomenclature.cpp
Modified: lyx-devel/trunk/src/frontends/qt4/GuiHyperlink.cpp
==============================================================================
--- lyx-devel/trunk/src/frontends/qt4/GuiHyperlink.cpp Sun Nov 7 17:58:56
2010 (r36193)
+++ lyx-devel/trunk/src/frontends/qt4/GuiHyperlink.cpp Sun Nov 7 18:38:39
2010 (r36194)
@@ -81,7 +81,7 @@
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));
}
Modified: lyx-devel/trunk/src/frontends/qt4/GuiLabel.cpp
==============================================================================
--- lyx-devel/trunk/src/frontends/qt4/GuiLabel.cpp Sun Nov 7 17:58:56
2010 (r36193)
+++ lyx-devel/trunk/src/frontends/qt4/GuiLabel.cpp Sun Nov 7 18:38:39
2010 (r36194)
@@ -54,7 +54,7 @@
{
InsetCommandParams params(insetCode());
params["name"] = qstring_to_ucs4(keywordED->text());
- return from_ascii(InsetLabel::params2string(params));
+ return from_utf8(InsetLabel::params2string(params));
}
Modified: lyx-devel/trunk/src/frontends/qt4/GuiNomenclature.cpp
==============================================================================
--- lyx-devel/trunk/src/frontends/qt4/GuiNomenclature.cpp Sun Nov 7
17:58:56 2010 (r36193)
+++ lyx-devel/trunk/src/frontends/qt4/GuiNomenclature.cpp Sun Nov 7
18:38:39 2010 (r36194)
@@ -56,7 +56,7 @@
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));
}
