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 /basctl | |
| 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 'basctl')
| -rw-r--r-- | basctl/source/basicide/moduldlg.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx index 639c3a79f04b..f1381b7ff79c 100644 --- a/basctl/source/basicide/moduldlg.cxx +++ b/basctl/source/basicide/moduldlg.cxx @@ -555,7 +555,9 @@ IMPL_LINK( OrganizeDialog, ActivatePageHdl, TabControl *, pTabCtrl ) ObjectPage::ObjectPage(vcl::Window *pParent, const OString &rName, sal_uInt16 nMode) - : TabPage(pParent, rName, "modules/BasicIDE/ui/" + OUString::fromUtf8(rName).toAsciiLowerCase() + ".ui") + : TabPage(pParent, rName, OUString("modules/BasicIDE/ui/") + + OStringToOUString(rName, RTL_TEXTENCODING_UTF8).toAsciiLowerCase() + + OUString(".ui")) { get(m_pBasicBox, "library"); Size aSize(m_pBasicBox->LogicToPixel(Size(130, 117), MAP_APPFONT)); |