diff options
| author | Noel Grandin <noel@peralex.com> | 2014-11-06 07:45:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-11-06 13:51:10 +0200 |
| commit | 05050cdb23de586870bf479a9df5ced06828d498 (patch) | |
| tree | a34c3bba9a921a5e9abf23d5757c15dfaea0ceac /sal/rtl | |
| parent | 8f266781a6bd6a629bce65c0f613683047c9a794 (diff) | |
use the new OUString::fromUtf8 method
Change-Id: I771004b7ccab3344a67e827e45bc34c22ffa5f77
Diffstat (limited to 'sal/rtl')
| -rw-r--r-- | sal/rtl/bootstrap.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx index 5719ae4301ec..b2ca0a97bcd6 100644 --- a/sal/rtl/bootstrap.cxx +++ b/sal/rtl/bootstrap.cxx @@ -377,8 +377,7 @@ Bootstrap_Impl::Bootstrap_Impl( OUString const & rIniName ) struct rtl_bootstrap_NameValue nameValue; nameValue.sName = OStringToOUString( line.copy(0,nIndex).trim(), RTL_TEXTENCODING_ASCII_US ); - nameValue.sValue = OStringToOUString( - line.copy(nIndex+1).trim(), RTL_TEXTENCODING_UTF8 ); + nameValue.sValue = OUString::fromUtf8(line.copy(nIndex+1).trim()); #if OSL_DEBUG_LEVEL > 1 OString name_tmp = OUStringToOString(nameValue.sName, RTL_TEXTENCODING_ASCII_US); @@ -987,14 +986,13 @@ rtl::OUString expandMacros( // replacement text (and if it did, it would fail to // detect cycles that pass through here): buf.append( - rtl::OStringToOUString( + rtl::OUString::fromUtf8( osl::Profile(seg[0]).readString( rtl::OUStringToOString( seg[1], RTL_TEXTENCODING_UTF8), rtl::OUStringToOString( seg[2], RTL_TEXTENCODING_UTF8), - rtl::OString()), - RTL_TEXTENCODING_UTF8)); + rtl::OString()))); } } } else { |