diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-11-06 17:24:13 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-11-06 17:24:13 +0100 |
| commit | fc0d57b7aff84f4bdca0a1f201527c265d5f0cf5 (patch) | |
| tree | 49a72b76d2d2a92af6371748c19277778159b86d /vcl/source/window/window2.cxx | |
| parent | e36dae401fc8963c9a92cb2c11d9b650b943c6d3 (diff) | |
Revert "use the new OUString::fromUtf8 method"
This reverts commit 05050cdb23de586870bf479a9df5ced06828d498,
not all places that use e.g. OStringToOUString to convert potential UTF-8
are guaranteed to fulfil the prerequisites necessary to use fromUtf8 (and
some places like e.g. in codemaker are happy with the best-effort effect
of OStringToOUString's OSTRING_TO_OUSTRING_CVTFLAGS).
Diffstat (limited to 'vcl/source/window/window2.cxx')
| -rw-r--r-- | vcl/source/window/window2.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index 8db9d7f81b98..5f6c8a66e32b 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -1539,7 +1539,7 @@ bool Window::set_property(const OString &rKey, const OString &rValue) { if ((rKey == "label") || (rKey == "title") || (rKey == "text") ) { - SetText(OUString::fromUtf8(VclBuilder::convertMnemonicMarkup(rValue))); + SetText(OStringToOUString(VclBuilder::convertMnemonicMarkup(rValue), RTL_TEXTENCODING_UTF8)); } else if (rKey == "visible") Show(toBool(rValue)); @@ -1618,9 +1618,9 @@ bool Window::set_property(const OString &rKey, const OString &rValue) else if (rKey == "valign") set_valign(toAlign(rValue)); else if (rKey == "tooltip-markup") - SetQuickHelpText(OUString::fromUtf8(rValue)); + SetQuickHelpText(OStringToOUString(rValue, RTL_TEXTENCODING_UTF8)); else if (rKey == "tooltip-text") - SetQuickHelpText(OUString::fromUtf8(rValue)); + SetQuickHelpText(OStringToOUString(rValue, RTL_TEXTENCODING_UTF8)); else if (rKey == "border-width") set_border_width(rValue.toInt32()); else if (rKey == "margin-left") @@ -1653,11 +1653,11 @@ bool Window::set_property(const OString &rKey, const OString &rValue) } else if (rKey == "accessible-name") { - SetAccessibleName(OUString::fromUtf8(rValue)); + SetAccessibleName(OStringToOUString(rValue, RTL_TEXTENCODING_UTF8)); } else if (rKey == "accessible-description") { - SetAccessibleDescription(OUString::fromUtf8(rValue)); + SetAccessibleDescription(OStringToOUString(rValue, RTL_TEXTENCODING_UTF8)); } else if (rKey == "use-markup") { |