diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-07-02 16:02:38 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-07-03 21:24:35 +0100 |
commit | bccf34c19ae022b67565e212fa4ec0d5213947de (patch) | |
tree | 73c2d2e29ad8d15999cbfb2ff554efa1e502a35e /unotools | |
parent | 285289275d1cf1769080a208b55be984cd269e1e (diff) |
ditch String::CreateFromAscii
Change-Id: I2b482bd323ac510629c5ee31868010b7cd6ce691
Diffstat (limited to 'unotools')
-rw-r--r-- | unotools/source/config/accelcfg.cxx | 2 | ||||
-rw-r--r-- | unotools/source/config/lingucfg.cxx | 2 | ||||
-rw-r--r-- | unotools/source/i18n/transliterationwrapper.cxx | 6 | ||||
-rw-r--r-- | unotools/source/misc/fontcvt.cxx | 2 | ||||
-rw-r--r-- | unotools/source/ucbhelper/tempfile.cxx | 6 |
5 files changed, 9 insertions, 9 deletions
diff --git a/unotools/source/config/accelcfg.cxx b/unotools/source/config/accelcfg.cxx index f2c1efe21a30..81b953751067 100644 --- a/unotools/source/config/accelcfg.cxx +++ b/unotools/source/config/accelcfg.cxx @@ -184,7 +184,7 @@ SvtAcceleratorConfiguration::~SvtAcceleratorConfiguration() { String aUserConfig = SvtPathOptions().GetUserConfigPath(); INetURLObject aObj( aUserConfig ); - aObj.insertName( String::CreateFromAscii("GlobalKeyBindings.xml") ); + aObj.insertName( rtl::OUString("GlobalKeyBindings.xml") ); SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( aObj.GetMainURL( INetURLObject::NO_DECODE ), STREAM_STD_READWRITE|STREAM_TRUNC ); com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > xOut( new utl::OOutputStreamWrapper( *pStream ) ); pImp->Commit( xOut ); diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx index 286932e68aae..b4098b99ead9 100644 --- a/unotools/source/config/lingucfg.cxx +++ b/unotools/source/config/lingucfg.cxx @@ -191,7 +191,7 @@ public: SvtLinguConfigItem::SvtLinguConfigItem() : - utl::ConfigItem( String::CreateFromAscii( "Office.Linguistic" ) ) + utl::ConfigItem( rtl::OUString("Office.Linguistic") ) { const uno::Sequence< OUString > &rPropertyNames = GetPropertyNames(); LoadOptions( rPropertyNames ); diff --git a/unotools/source/i18n/transliterationwrapper.cxx b/unotools/source/i18n/transliterationwrapper.cxx index ea7aaa856de5..195a98ff406c 100644 --- a/unotools/source/i18n/transliterationwrapper.cxx +++ b/unotools/source/i18n/transliterationwrapper.cxx @@ -133,17 +133,17 @@ void TransliterationWrapper::loadModuleIfNeeded( sal_uInt16 nLang ) if( static_cast< sal_Int32 >(nType) == TransliterationModulesExtra::SENTENCE_CASE ) { if( bLoad ) - loadModuleByImplName(String::CreateFromAscii("SENTENCE_CASE"), nLang); + loadModuleByImplName(rtl::OUString("SENTENCE_CASE"), nLang); } else if( static_cast< sal_Int32 >(nType) == TransliterationModulesExtra::TITLE_CASE ) { if( bLoad ) - loadModuleByImplName(String::CreateFromAscii("TITLE_CASE"), nLang); + loadModuleByImplName(rtl::OUString("TITLE_CASE"), nLang); } else if( static_cast< sal_Int32 >(nType) == TransliterationModulesExtra::TOGGLE_CASE ) { if( bLoad ) - loadModuleByImplName(String::CreateFromAscii("TOGGLE_CASE"), nLang); + loadModuleByImplName(rtl::OUString("TOGGLE_CASE"), nLang); } else { diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx index 388f71bf02b6..2ae7fb9b1177 100644 --- a/unotools/source/misc/fontcvt.cxx +++ b/unotools/source/misc/fontcvt.cxx @@ -1439,7 +1439,7 @@ String GetFontToSubsFontName( FontToSubsFontConverter hConverter ) return String(); const char* pName = ((ConvertChar*)hConverter)->mpSubsFontName; - return String::CreateFromAscii( pName ); + return rtl::OUString::createFromAscii( pName ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx index 6b634cb76529..2ec12a18e028 100644 --- a/unotools/source/ucbhelper/tempfile.cxx +++ b/unotools/source/ucbhelper/tempfile.cxx @@ -200,7 +200,7 @@ void CreateTempName_Impl( String& rName, sal_Bool bKeep, sal_Bool bDir = sal_Tru unsigned const nRadix = 36; unsigned long const nMax = (nRadix*nRadix*nRadix*nRadix*nRadix*nRadix); String aName( rName ); - aName += String::CreateFromAscii( "lu" ); + aName += rtl::OUString( "lu" ); rName.Erase(); static unsigned long u = Time::GetSystemTicks() % nMax; @@ -209,7 +209,7 @@ void CreateTempName_Impl( String& rName, sal_Bool bKeep, sal_Bool bDir = sal_Tru u %= nMax; String aTmp( aName ); aTmp += rtl::OUString::valueOf(static_cast<sal_Int64>(u), nRadix); - aTmp += String::CreateFromAscii( ".tmp" ); + aTmp += rtl::OUString( ".tmp" ); if ( bDir ) { @@ -285,7 +285,7 @@ void lcl_createName(TempFile_Impl& _rImpl,const String& rLeadingChars,sal_Bool _ if ( pExtension ) aTmp += *pExtension; else - aTmp += String::CreateFromAscii( ".tmp" ); + aTmp += rtl::OUString( ".tmp" ); if ( bDirectory ) { FileBase::RC err = Directory::create( aTmp ); |