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 f030b8ec950da49599e8638331d33ce259cbb215..7cb9cc61d4ad7f5c4791eb3416fd9708c5137d96 100644 (file)
--- 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 d888ae07d82d833175fa6f0daafdd9ccc7d179c6..5d1ea4a3ef6aaa62efc09a43219a9e0954f67eda 100644 (file)
--- 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 b6a795ee461fb1b2897d1c09ab01678bffe6b5e4..92250a7b27efd312cc5cd18d5067aaf013b7662a 100644 (file)
--- 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));
 }