summaryrefslogtreecommitdiff
path: root/vcl/win/source/window/salframe.cxx
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 /vcl/win/source/window/salframe.cxx
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 'vcl/win/source/window/salframe.cxx')
-rw-r--r--vcl/win/source/window/salframe.cxx12
1 files changed, 5 insertions, 7 deletions
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 9b4e12ca05cc..95f88aa72757 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -4613,10 +4613,8 @@ static int ImplMenuChar( HWND, WPARAM wParam, LPARAM lParam )
{
int nRet = MNC_IGNORE;
HMENU hMenu = (HMENU) lParam;
- String aMnemonic;
- aMnemonic.AssignAscii("&");
- aMnemonic.Append( (sal_Unicode) LOWORD(wParam) );
- aMnemonic.ToLowerAscii(); // we only have ascii mnemonics
+ OUString aMnemonic( "&" + (sal_Unicode) LOWORD(wParam) );
+ aMnemonic = aMnemonic.toAsciiLowerCase(); // we only have ascii mnemonics
// search the mnemonic in the current menu
int nItemCount = GetMenuItemCount( hMenu );
@@ -4629,9 +4627,9 @@ static int ImplMenuChar( HWND, WPARAM wParam, LPARAM lParam )
WinSalMenuItem* pSalMenuItem = ImplGetSalMenuItem( hMenu, idx % nItemCount );
if( !pSalMenuItem )
continue;
- String aStr = pSalMenuItem->mText;
- aStr.ToLowerAscii();
- if( aStr.Search( aMnemonic ) != STRING_NOTFOUND)
+ OUString aStr = pSalMenuItem->mText;
+ aStr = aStr.toAsciiLowerCase();
+ if( aStr.indexOf( aMnemonic ) != -1 )
{
if( idxFound == -1 )
idxFound = idx % nItemCount;