diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2013-09-09 18:50:22 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-09-11 11:31:06 +0000 |
| commit | 4f702470a2c5f5521209203f0d20f768ef274d67 (patch) | |
| tree | 6a957bc241f8c177f332d44c809e9cce61e07246 /editeng | |
| parent | fe2a249257a9fb4a994514bce5f49268f7bfd770 (diff) | |
Related: fdo#38838 Remove String::SearchChar()
Change-Id: Ide40e0ef91aec04c2ae274aaf2a957dd5064854c
Reviewed-on: https://gerrit.libreoffice.org/5894
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/misc/svxacorr.cxx | 36 |
1 files changed, 23 insertions, 13 deletions
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index 014eefcc3797..71f70f40486c 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -1639,18 +1639,28 @@ OUString EncryptBlockName_Imp(const OUString& rName) } /* This code is copied from SwXMLTextBlocks::GeneratePackageName */ -static void GeneratePackageName ( const String& rShort, String& rPackageName ) +static void GeneratePackageName ( const OUString& rShort, OUString& rPackageName ) { - rPackageName = rShort; - xub_StrLen nPos = 0; - sal_Unicode pDelims[] = { '!', '/', ':', '.', '\\', 0 }; - OString sByte(OUStringToOString(rPackageName, RTL_TEXTENCODING_UTF7)); - rPackageName = OStringToOUString(sByte, RTL_TEXTENCODING_ASCII_US); - while( STRING_NOTFOUND != ( nPos = rPackageName.SearchChar( pDelims, nPos ))) + OString sByte(OUStringToOString(rShort, RTL_TEXTENCODING_UTF7)); + OUStringBuffer aBuf(OStringToOUString(sByte, RTL_TEXTENCODING_ASCII_US)); + + for (sal_Int32 nPos = 0; nPos < aBuf.getLength(); ++nPos) { - rPackageName.SetChar( nPos, '_' ); - ++nPos; + switch (aBuf[nPos]) + { + case '!': + case '/': + case ':': + case '.': + case '\\': + aBuf[nPos] = '_'; + break; + default: + break; + } } + + rPackageName = aBuf.makeStringAndClear(); } static const SvxAutocorrWord* lcl_SearchWordsInList( @@ -2436,7 +2446,7 @@ sal_Bool SvxAutoCorrectLanguageLists::MakeCombinedChanges( std::vector<SvxAutoco { if( !pFoundEntry->IsTextOnly() ) { - String aName( aWordToDelete.GetShort() ); + OUString aName( aWordToDelete.GetShort() ); if (xStorage->IsOLEStorage()) aName = EncryptBlockName_Imp(aName); else @@ -2461,7 +2471,7 @@ sal_Bool SvxAutoCorrectLanguageLists::MakeCombinedChanges( std::vector<SvxAutoco if( !pRemoved->IsTextOnly() ) { // Still have to remove the Storage - String sStorageName( pWordToAdd->GetShort() ); + OUString sStorageName( pWordToAdd->GetShort() ); if (xStorage->IsOLEStorage()) sStorageName = EncryptBlockName_Imp(sStorageName); else @@ -2509,7 +2519,7 @@ sal_Bool SvxAutoCorrectLanguageLists::PutText( const OUString& rShort, const OUS if( !pRemove->IsTextOnly() ) { // Still have to remove the Storage - String sStgNm( rShort ); + OUString sStgNm( rShort ); if (xStg->IsOLEStorage()) sStgNm = EncryptBlockName_Imp(sStgNm); else @@ -2589,7 +2599,7 @@ sal_Bool SvxAutoCorrectLanguageLists::DeleteText( const OUString& rShort ) { if( !pFnd->IsTextOnly() ) { - String aName( rShort ); + OUString aName( rShort ); if (xStg->IsOLEStorage()) aName = EncryptBlockName_Imp(aName); else |