summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-09-05 16:29:13 +0200
committerNoel Grandin <noel@peralex.com>2013-09-11 09:45:29 +0200
commit19c8de15dfc49b815597d7f2b05e072de2f8dec5 (patch)
treee6a6bece40536f00b8013a070b308c9c75f5634b /editeng
parent987356e22f2d969deca72da99643691e432f0e92 (diff)
convert SvStringsISortDtor class from String to OUString
Change-Id: Iad22ba07dd3dfbd5162fa4e16ebb5f44c5eb7811
Diffstat (limited to 'editeng')
-rw-r--r--editeng/source/misc/SvXMLAutoCorrectImport.cxx2
-rw-r--r--editeng/source/misc/svxacorr.cxx20
2 files changed, 11 insertions, 11 deletions
diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.cxx b/editeng/source/misc/SvXMLAutoCorrectImport.cxx
index b338b95dd310..ba6124e78b77 100644
--- a/editeng/source/misc/SvXMLAutoCorrectImport.cxx
+++ b/editeng/source/misc/SvXMLAutoCorrectImport.cxx
@@ -232,7 +232,7 @@ SvXMLExceptionContext::SvXMLExceptionContext(
if (!sWord.Len() )
return;
- String * pNew = new String( sWord );
+ OUString * pNew = new OUString( sWord );
if( !rLocalRef.rList.insert( pNew ).second )
delete pNew;
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 8e6003072bcc..7a925432c098 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1734,13 +1734,13 @@ sal_Bool SvxAutoCorrect::FindInWrdSttExceptList( LanguageType eLang,
// and last in LANGUAGE_UNDETERMINED
LanguageType nTmpKey1 = eLang & 0x7ff, // the main language in many cases DE
nTmpKey2 = eLang & 0x3ff; // otherwise for example EN
- String sTemp(sWord);
+ OUString sTemp(sWord);
if(pLangTable->find(eLang) != pLangTable->end() || CreateLanguageFile(eLang, sal_False))
{
//the language is available - so bring it on
SvxAutoCorrectLanguageLists* pList = pLangTable->find(eLang)->second;
- String _sTemp(sWord);
+ OUString _sTemp(sWord);
if(pList->GetWrdSttExceptList()->find(&_sTemp) != pList->GetWrdSttExceptList()->end() )
return sal_True;
}
@@ -1774,20 +1774,20 @@ sal_Bool SvxAutoCorrect::FindInWrdSttExceptList( LanguageType eLang,
static sal_Bool lcl_FindAbbreviation( const SvStringsISortDtor* pList, const String& sWord)
{
- String sAbk(OUString('~'));
+ OUString sAbk('~');
SvStringsISortDtor::const_iterator it = pList->find( &sAbk );
sal_uInt16 nPos = it - pList->begin();
if( nPos < pList->size() )
{
String sLowerWord( sWord ); sLowerWord.ToLowerAscii();
- const String* pAbk;
+ const OUString* pAbk;
for( sal_uInt16 n = nPos;
n < pList->size() &&
- '~' == ( pAbk = (*pList)[ n ])->GetChar( 0 );
+ '~' == (*( pAbk = (*pList)[ n ]))[ 0 ];
++n )
{
// ~ and ~. are not allowed!
- if( 2 < pAbk->Len() && pAbk->Len() - 1 <= sWord.Len() )
+ if( 2 < pAbk->getLength() && pAbk->getLength() - 1 <= sWord.Len() )
{
String sLowerAbk( *pAbk ); sLowerAbk.ToLowerAscii();
for( xub_StrLen i = sLowerAbk.Len(), ii = sLowerWord.Len(); i; )
@@ -1801,7 +1801,7 @@ static sal_Bool lcl_FindAbbreviation( const SvStringsISortDtor* pList, const Str
}
}
}
- OSL_ENSURE( !(nPos && '~' == (*pList)[ --nPos ]->GetChar( 0 ) ),
+ OSL_ENSURE( !(nPos && '~' == (*(*pList)[ --nPos ])[ 0 ] ),
"Wrongly sorted exception list?" );
return sal_False;
}
@@ -1813,7 +1813,7 @@ sal_Bool SvxAutoCorrect::FindInCplSttExceptList(LanguageType eLang,
// and last in LANGUAGE_UNDETERMINED
LanguageType nTmpKey1 = eLang & 0x7ff, // the main language in many cases DE
nTmpKey2 = eLang & 0x3ff; // otherwise for example EN
- String sTemp( sWord );
+ OUString sTemp( sWord );
if(pLangTable->find(eLang) != pLangTable->end() || CreateLanguageFile(eLang, sal_False))
{
@@ -2123,7 +2123,7 @@ SvStringsISortDtor* SvxAutoCorrectLanguageLists::GetCplSttExceptList()
sal_Bool SvxAutoCorrectLanguageLists::AddToCplSttExceptList(const String& rNew)
{
- String* pNew = new String( rNew );
+ OUString* pNew = new OUString( rNew );
if( rNew.Len() && GetCplSttExceptList()->insert( pNew ).second )
{
MakeUserStorage_Impl();
@@ -2144,7 +2144,7 @@ sal_Bool SvxAutoCorrectLanguageLists::AddToCplSttExceptList(const String& rNew)
sal_Bool SvxAutoCorrectLanguageLists::AddToWrdSttExceptList(const String& rNew)
{
- String* pNew = new String( rNew );
+ OUString* pNew = new OUString( rNew );
SvStringsISortDtor* pExceptList = LoadWrdSttExceptList();
if( rNew.Len() && pExceptList && pExceptList->insert( pNew ).second )
{