diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-06-20 23:57:47 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-06-21 15:07:52 +0100 |
| commit | c3f2401d49b1374431da54e799a23bc122c5def7 (patch) | |
| tree | 81ea39989af360ca879c7a84e7b1643698255589 /editeng/source/misc | |
| parent | 3d506e814719ecaa5862663bce467994ccf31a4d (diff) | |
reduce scope and replace some String::CreateFromAscii
Change-Id: I8c375e3bfbcd3d7046a8bdb1968934b7d7ca96f8
Diffstat (limited to 'editeng/source/misc')
| -rw-r--r-- | editeng/source/misc/svxacorr.cxx | 11 | ||||
| -rw-r--r-- | editeng/source/misc/swafopt.cxx | 3 |
2 files changed, 6 insertions, 8 deletions
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index 7f8da77cd122..bc23e9086bdc 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -672,7 +672,7 @@ sal_Bool SvxAutoCorrect::FnAddNonBrkSpace( // Check the presence of "://" in the word - xub_StrLen nStrPos = rTxt.Search( String::CreateFromAscii( "://" ), nSttWdPos + 1 ); + xub_StrLen nStrPos = rTxt.Search( rtl::OUString( "://" ), nSttWdPos + 1 ); if ( STRING_NOTFOUND == nStrPos && nEndPos > 0 ) { // Check the previous char @@ -2110,11 +2110,10 @@ void SvxAutoCorrectLanguageLists::SaveExceptList_Imp( { xStrm->SetSize( 0 ); xStrm->SetBufferSize( 8192 ); - String aPropName( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM("MediaType") ) ); OUString aMime( "text/xml" ); uno::Any aAny; aAny <<= aMime; - xStrm->SetProperty( aPropName, aAny ); + xStrm->SetProperty( rtl::OUString("MediaType"), aAny ); uno::Reference< lang::XMultiServiceFactory > xServiceFactory = @@ -2388,7 +2387,7 @@ void SvxAutoCorrectLanguageLists::MakeUserStorage_Impl() aDest = INetURLObject ( sUserAutoCorrFile ); if ( SotStorage::IsOLEStorage ( sShareAutoCorrFile ) ) { - aDest.SetExtension ( String::CreateFromAscii ( "bak" ) ); + aDest.SetExtension ( rtl::OUString("bak") ); bConvert = sal_True; } bCopy = sal_True; @@ -2397,7 +2396,7 @@ void SvxAutoCorrectLanguageLists::MakeUserStorage_Impl() { aSource = INetURLObject ( sUserAutoCorrFile ); aDest = INetURLObject ( sUserAutoCorrFile ); - aDest.SetExtension ( String::CreateFromAscii ( "bak" ) ); + aDest.SetExtension ( rtl::OUString("bak") ); bCopy = bConvert = sal_True; } if (bCopy) @@ -2486,7 +2485,7 @@ sal_Bool SvxAutoCorrectLanguageLists::MakeBlocklist_Imp( SvStorage& rStg ) { refList->SetSize( 0 ); refList->SetBufferSize( 8192 ); - String aPropName( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM("MediaType") ) ); + String aPropName( rtl::OUString( "MediaType" ) ); OUString aMime( "text/xml" ); uno::Any aAny; aAny <<= aMime; diff --git a/editeng/source/misc/swafopt.cxx b/editeng/source/misc/swafopt.cxx index aa6a4e9c4699..3bdf5730b28f 100644 --- a/editeng/source/misc/swafopt.cxx +++ b/editeng/source/misc/swafopt.cxx @@ -32,8 +32,7 @@ #include <editeng/swafopt.hxx> SvxSwAutoFmtFlags::SvxSwAutoFmtFlags() - : aBulletFont( String::CreateFromAscii( - RTL_CONSTASCII_STRINGPARAM( "StarSymbol" )), + : aBulletFont( rtl::OUString("StarSymbol"), Size( 0, 14 ) ) { bAutoCorrect = |