diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2013-09-09 23:35:25 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-09-13 11:30:48 +0000 |
| commit | 3e55e00662b50b02c289ca4a1d94d4306bd8c86b (patch) | |
| tree | 8d8f33abc07e0f78bfcd8e291e81fcc307918912 /linguistic | |
| parent | 06bdd144eaf504b87cc918c4debf76bdeadea735 (diff) | |
String to OUString
This removes nearly all ToLowerAscii() calls.
Conflicts:
linguistic/source/convdic.cxx
linguistic/source/convdiclist.cxx
linguistic/source/dlistimp.cxx
sc/source/filter/html/htmlexp.cxx
Change-Id: Iddcaacfb7383e1df3d2f13751a3c788eba953fdd
Reviewed-on: https://gerrit.libreoffice.org/5895
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'linguistic')
| -rw-r--r-- | linguistic/source/convdic.cxx | 3 | ||||
| -rw-r--r-- | linguistic/source/convdiclist.cxx | 10 | ||||
| -rw-r--r-- | linguistic/source/dlistimp.cxx | 8 |
3 files changed, 8 insertions, 13 deletions
diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx index 28f49e54c409..539f884a65f0 100644 --- a/linguistic/source/convdic.cxx +++ b/linguistic/source/convdic.cxx @@ -134,8 +134,7 @@ sal_Bool IsConvDic( const OUString &rFileURL, sal_Int16 &nLang, sal_Int16 &nConv OUString aExt; sal_Int32 nPos = rFileURL.lastIndexOf( '.' ); if (-1 != nPos) - aExt = rFileURL.copy( nPos + 1 ); - aExt = aExt.toAsciiLowerCase(); + aExt = rFileURL.copy( nPos + 1 ).toAsciiLowerCase(); if (aExt != CONV_DIC_EXT) return bRes; diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index dcd2bbb8a9ca..69e48adde93a 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.cxx @@ -335,13 +335,11 @@ void ConvDicNameContainer::AddConvDics( for (sal_Int32 i = 0; i < nEntries; ++i) { - OUString aURL( pDirCnt[i] ); + OUString aURL( pDirCnt[i] ); - sal_Int32 nPos = aURL.lastIndexOf('.'); - OUString aExt(aURL.copy(nPos + 1)); - aExt = aExt.toAsciiLowerCase(); - OUString aSearchExt( rExtension ); - aSearchExt = aSearchExt.toAsciiLowerCase(); + sal_Int32 nPos = aURL.lastIndexOf('.'); + OUString aExt( aURL.copy(nPos + 1).toAsciiLowerCase() ); + OUString aSearchExt( rExtension.toAsciiLowerCase() ); if(aExt != aSearchExt) continue; // skip other files diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx index ec7853bb477b..45db2012f9ee 100644 --- a/linguistic/source/dlistimp.cxx +++ b/linguistic/source/dlistimp.cxx @@ -324,8 +324,7 @@ void DicList::SearchForDictionaries( { // When not sal_Int32 nPos = aURL.indexOf('.'); - OUString aExt(aURL.copy(nPos + 1)); - aExt = aExt.toAsciiLowerCase(); + OUString aExt( aURL.copy(nPos + 1).toAsciiLowerCase() ); if (aDCN.equals(aExt)) // negativ bNeg = sal_True; @@ -870,10 +869,9 @@ static sal_Bool IsVers2OrNewer( const OUString& rFileURL, sal_uInt16& nLng, sal_ OUString aExt; sal_Int32 nPos = rFileURL.lastIndexOf( '.' ); if (-1 != nPos) - aExt = rFileURL.copy( nPos + 1 ); - aExt = aExt.toAsciiLowerCase(); + aExt = rFileURL.copy( nPos + 1 ).toAsciiLowerCase(); - if (!aDIC.equals(aExt)) + if (aDIC != aExt) return sal_False; // get stream to be used |