summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2013-09-09 23:35:25 +0200
committerCaolán McNamara <caolanm@redhat.com>2013-09-13 11:30:48 +0000
commit3e55e00662b50b02c289ca4a1d94d4306bd8c86b (patch)
tree8d8f33abc07e0f78bfcd8e291e81fcc307918912 /framework
parent06bdd144eaf504b87cc918c4debf76bdeadea735 (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 'framework')
-rw-r--r--framework/source/uiconfiguration/imagemanagerimpl.cxx7
1 files changed, 3 insertions, 4 deletions
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index fa3bf1a31a03..ffb97375e3a3 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -223,7 +223,7 @@ void CmdImageList::impl_fillCommandToImageNameMap()
for ( sal_uInt32 i = 0; i < nCount; i++ )
{
OUString aCommandName( m_aImageCommandNameVector[i] );
- String aImageName;
+ OUString aImageName;
if ( aCommandName.indexOf( aUNOString ) != 0 )
{
@@ -240,14 +240,13 @@ void CmdImageList::impl_fillCommandToImageNameMap()
aImageName = aEmptyString;
// Search for query part.
- sal_Int32 nIndex = aImageName.Search( '?' );
- if ( nIndex != STRING_NOTFOUND )
+ if ( aImageName.indexOf('?') != -1 )
aImageName = getCanonicalName( aImageName ); // convert to valid filename
}
// Image names are not case-dependent. Always use lower case characters to
// reflect this.
aImageName += aExt;
- aImageName.ToLowerAscii();
+ aImageName = aImageName.toAsciiLowerCase();
m_aImageNameVector[i] = aImageName;
m_aCommandToImageNameMap.insert( CommandToImageNameMap::value_type( aCommandName, aImageName ));