diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-04-04 21:30:30 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-04-05 13:59:05 +0100 |
| commit | 5688b51bcb23b12b335dadf4430b7b7c4407cbfb (patch) | |
| tree | b2c358d422775d0d9d312cca653c9e4e7b989ed2 /unotools/source | |
| parent | dd20a8c6e2ebeceff90567597d712e4c03c2ac7d (diff) | |
UniString::CreateFromInt32 -> rtl::OUString::valueOf
Diffstat (limited to 'unotools/source')
| -rw-r--r-- | unotools/source/config/securityoptions.cxx | 4 | ||||
| -rw-r--r-- | unotools/source/i18n/localedatawrapper.cxx | 19 |
2 files changed, 11 insertions, 12 deletions
diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx index 2b762f0adae2..c8d65e2c2b1f 100644 --- a/unotools/source/config/securityoptions.cxx +++ b/unotools/source/config/securityoptions.cxx @@ -720,9 +720,7 @@ void SvtSecurityOptions_Impl::Commit() Sequence< Sequence< com::sun::star::beans::PropertyValue > > lPropertyValuesSeq( nCnt ); for( sal_Int32 i = 0 ; i < nCnt ; ++i ) { - String aPrefix( s ); - aPrefix += String::CreateFromInt32( i ); - aPrefix.AppendAscii( "/" ); + rtl::OUString aPrefix = rtl::OUStringBuffer(s).append(i).append('/').makeStringAndClear(); Sequence< com::sun::star::beans::PropertyValue > lPropertyValues( 3 ); lPropertyValues[ 0 ].Name = aPrefix + PROPERTYNAME_TRUSTEDAUTHOR_SUBJECTNAME; lPropertyValues[ 0 ].Value <<= m_seqTrustedAuthors[ i ][0]; diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx index 977b7b94e1e6..1e2ee1562465 100644 --- a/unotools/source/i18n/localedatawrapper.cxx +++ b/unotools/source/i18n/localedatawrapper.cxx @@ -342,19 +342,20 @@ void LocaleDataWrapper::invalidateData() // && !aDebugLocale.EqualsAscii( "es_BR" ) // ?!? Brazil/es ) { - String aMsg( RTL_CONSTASCII_USTRINGPARAM( + rtl::OUStringBuffer aMsg; + aMsg.appendAscii(RTL_CONSTASCII_STRINGPARAM( "ConvertIsoNamesToLanguage/ConvertLanguageToIsoNames: ambiguous locale (MS-LCID?)\n")); - aMsg += aDebugLocale; - aMsg.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " -> 0x" ) ); - aMsg += String::CreateFromInt32( eLang, 16 ); - aMsg.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " -> " ) ); - aMsg += String( aLanguage); + aMsg.append(aDebugLocale); + aMsg.appendAscii(RTL_CONSTASCII_STRINGPARAM( " -> 0x")); + aMsg.append(static_cast<sal_Int32>(eLang), 16); + aMsg.appendAscii(RTL_CONSTASCII_STRINGPARAM( " -> ")); + aMsg.append(aLanguage); if ( !aCountry.isEmpty() ) { - aMsg += '_'; - aMsg += String( aCountry); + aMsg.append('_'); + aMsg.append(aCountry); } - outputCheckMessage( aMsg ); + outputCheckMessage( aMsg.makeStringAndClear() ); } eLang = LANGUAGE_DONTKNOW; } |