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 /extensions | |
parent | Bin unused include files, thanks to Andrea Gelmini (diff) | |
download | core-05050cdb23de586870bf479a9df5ced06828d498.tar.gz core-05050cdb23de586870bf479a9df5ced06828d498.zip |
use the new OUString::fromUtf8 method
Change-Id: I771004b7ccab3344a67e827e45bc34c22ffa5f77
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/source/bibliography/general.cxx | 4 | ||||
-rw-r--r-- | extensions/source/config/ldap/ldapaccess.cxx | 4 | ||||
-rw-r--r-- | extensions/source/plugin/aqua/macmgr.mm | 2 | ||||
-rw-r--r-- | extensions/source/propctrlr/eventhandler.cxx | 2 | ||||
-rw-r--r-- | extensions/source/propctrlr/pcrcommon.cxx | 2 | ||||
-rw-r--r-- | extensions/source/update/check/download.cxx | 4 |
6 files changed, 9 insertions, 9 deletions
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx index 26a2512774e2..cbb952a78e9e 100644 --- a/extensions/source/bibliography/general.cxx +++ b/extensions/source/bibliography/general.cxx @@ -448,8 +448,8 @@ uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl( if(xPropInfo->hasPropertyByName(uProp)) { OUString sId = OUString::createFromAscii( INET_HID_SCHEME ); - DBG_ASSERT( INetURLObject( OStringToOUString( sHelpId, RTL_TEXTENCODING_UTF8 ) ).GetProtocol() == INET_PROT_NOT_VALID, "Wrong HelpId!" ); - sId += OStringToOUString( sHelpId, RTL_TEXTENCODING_UTF8 ); + DBG_ASSERT( INetURLObject( OUString::fromUtf8( sHelpId ) ).GetProtocol() == INET_PROT_NOT_VALID, "Wrong HelpId!" ); + sId += OUString::fromUtf8( sHelpId ); xPropSet->setPropertyValue( uProp, makeAny( sId ) ); } diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx index 2acd02731973..333a8bcd4c62 100644 --- a/extensions/source/config/ldap/ldapaccess.cxx +++ b/extensions/source/config/ldap/ldapaccess.cxx @@ -228,7 +228,7 @@ void LdapConnection::initConnection() data->insert( LdapData::value_type( OStringToOUString(attr, RTL_TEXTENCODING_ASCII_US), - OStringToOUString(*values, RTL_TEXTENCODING_UTF8))); + OUString::fromUtf8(*values))); ldap_value_free(values); } attr = ldap_next_attribute(mConnection, result.msg, ptr); @@ -284,7 +284,7 @@ void LdapConnection::initConnection() #else sal_Char *charsDn = ldap_get_dn(mConnection, entry) ; - userDn = OStringToOUString( charsDn, RTL_TEXTENCODING_UTF8 ); + userDn = OUString::fromUtf8( charsDn ); ldap_memfree(charsDn) ; #endif } diff --git a/extensions/source/plugin/aqua/macmgr.mm b/extensions/source/plugin/aqua/macmgr.mm index 878571a9377e..c92f4fef92b4 100644 --- a/extensions/source/plugin/aqua/macmgr.mm +++ b/extensions/source/plugin/aqua/macmgr.mm @@ -283,7 +283,7 @@ static rtl::OUString GetNextPluginStringFromHandle(Handle h, short *index) rtl::OStringBuffer aBuf( nLen ); aBuf.append( pPascalBytes+1, nLen ); *index += nLen + 1; - return rtl::OStringToOUString( aBuf.makeStringAndClear(), RTL_TEXTENCODING_UTF8 ); + return rtl::OUString::fromUtf8( aBuf.makeStringAndClear() ); } static int parseMimeResource( CFBundleRef i_xBundle, diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx index 34a2dd02f286..fa6f4b0f2ace 100644 --- a/extensions/source/propctrlr/eventhandler.cxx +++ b/extensions/source/propctrlr/eventhandler.cxx @@ -809,7 +809,7 @@ namespace pcr const EventDescription& rEvent = impl_getEventForName_throw( _rPropertyName ); aDescriptor.DisplayName = rEvent.sDisplayName; aDescriptor.HelpURL = HelpIdUrl::getHelpURL( rEvent.sHelpId ); - aDescriptor.PrimaryButtonId = OStringToOUString(rEvent.sUniqueBrowseId, RTL_TEXTENCODING_UTF8); + aDescriptor.PrimaryButtonId = OUString::fromUtf8(rEvent.sUniqueBrowseId); aDescriptor.HasPrimaryButton = sal_True; aDescriptor.Category = "Events"; return aDescriptor; diff --git a/extensions/source/propctrlr/pcrcommon.cxx b/extensions/source/propctrlr/pcrcommon.cxx index 9292a029a4e8..0cd148e722ca 100644 --- a/extensions/source/propctrlr/pcrcommon.cxx +++ b/extensions/source/propctrlr/pcrcommon.cxx @@ -49,7 +49,7 @@ namespace pcr OUString HelpIdUrl::getHelpURL( const OString& sHelpId ) { OUStringBuffer aBuffer; - OUString aTmp( OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8) ); + OUString aTmp( OUString::fromUtf8(sHelpId) ); INetURLObject aHID( aTmp ); if ( aHID.GetProtocol() == INET_PROT_NOT_VALID ) aBuffer.appendAscii( INET_HID_SCHEME ); diff --git a/extensions/source/update/check/download.cxx b/extensions/source/update/check/download.cxx index ac0c4b7688e1..647709e84ce0 100644 --- a/extensions/source/update/check/download.cxx +++ b/extensions/source/update/check/download.cxx @@ -77,7 +77,7 @@ static void openFile( OutData& out ) sal_Int32 nIndex = aURL.lastIndexOf('/'); if( nIndex > 0 ) { - out.File = out.DestinationDir + OStringToOUString(aURL.copy(nIndex), RTL_TEXTENCODING_UTF8); + out.File = out.DestinationDir + OUString::fromUtf8(aURL.copy(nIndex)); oslFileError rc; @@ -329,7 +329,7 @@ bool curl_run(const OUString& rURL, OutData& out, const OString& aProxyHost, sal } } if ( !ret ) - out.Handler->downloadStalled( OStringToOUString(aMessage, RTL_TEXTENCODING_UTF8) ); + out.Handler->downloadStalled( OUString::fromUtf8(aMessage) ); } curl_easy_cleanup(pCURL); |