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 /desktop | |
| parent | 8f266781a6bd6a629bce65c0f613683047c9a794 (diff) | |
use the new OUString::fromUtf8 method
Change-Id: I771004b7ccab3344a67e827e45bc34c22ffa5f77
Diffstat (limited to 'desktop')
4 files changed, 4 insertions, 7 deletions
diff --git a/desktop/source/deployment/manager/dp_activepackages.cxx b/desktop/source/deployment/manager/dp_activepackages.cxx index 42f6b4122bc7..9768a2a5a358 100644 --- a/desktop/source/deployment/manager/dp_activepackages.cxx +++ b/desktop/source/deployment/manager/dp_activepackages.cxx @@ -176,8 +176,7 @@ ActivePackages::Entries ActivePackages::getEntries() const { RTL_TEXTENCODING_UTF8), decodeNewData(i->second))); } else { - OUString fn( - OStringToOUString(i->first, RTL_TEXTENCODING_UTF8)); + OUString fn(OUString::fromUtf8(i->first)); es.push_back( ::std::make_pair( ::dp_misc::generateLegacyIdentifier(fn), diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index 1529fb407ae5..e60f36b8311a 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -253,8 +253,7 @@ void PackageManagerImpl::initActivationLayer( ::rtl::ByteSequence data = dp_misc::readFile(remFileContent); OString osData(reinterpret_cast<const sal_Char*>(data.getConstArray()), data.getLength()); - OUString sData = OStringToOUString( - osData, RTL_TEXTENCODING_UTF8); + OUString sData = OUString::fromUtf8(osData); if (!sData.equals(aUserName)) continue; } diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx index 4af0fe373d02..e5fed36980d0 100644 --- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx +++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx @@ -755,7 +755,7 @@ void BackendImpl::PackageImpl::processPackage_( //we just add all other xcu/xcs files to the configmgr.ini instead of //rebuilding the directory structure. OUString url2( - OStringToOUString(i->first, RTL_TEXTENCODING_UTF8)); + OUString::fromUtf8(i->first)); if (url2 != url) { bool schema = i->second.equalsIgnoreAsciiCase( "vnd.sun.star.configuration-schema"); diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 60c53fb16bf6..d23adc16ae64 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -158,8 +158,7 @@ static OUString getUString(const char* pString) if (pString == NULL) return OUString(); - OString sString(pString, strlen(pString)); - return OStringToOUString(sString, RTL_TEXTENCODING_UTF8); + return OUString::fromUtf8(OString(pString, strlen(pString))); } // Try to convert a relative URL to an absolute one |