diff options
| author | Noel Grandin <noel@peralex.com> | 2014-10-31 07:59:33 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-10-31 07:59:33 +0200 |
| commit | 41538e2ab79dd0ff04c1ac389962ce9df147463c (patch) | |
| tree | a7e06a0bbf383097d98477a2a03e76cd3fb29ce7 /vcl | |
| parent | 72ce1368b504804529bbcdc14484e9abb2ffa398 (diff) | |
drop KeyCode::IsDefinedKeyCodeEqual
because it's implementation is the same as operator==
Change-Id: If9b63abcd13f899735d59d85be3da54406a6e324
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/app/svapp.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/keycod.cxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 0355ec08fac9..743a0ee223b1 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -1453,7 +1453,7 @@ bool ImplCallHotKey( const vcl::KeyCode& rKeyCode ) ImplHotKey* pHotKeyData = pSVData->maAppData.mpFirstHotKey; while ( pHotKeyData ) { - if ( pHotKeyData->maKeyCode.IsDefinedKeyCodeEqual( rKeyCode ) ) + if ( pHotKeyData->maKeyCode == rKeyCode ) { pHotKeyData->maLink.Call( pHotKeyData->mpUserData ); return true; diff --git a/vcl/source/window/keycod.cxx b/vcl/source/window/keycod.cxx index 0c13f8118db9..be3e282c2193 100644 --- a/vcl/source/window/keycod.cxx +++ b/vcl/source/window/keycod.cxx @@ -71,12 +71,12 @@ bool ImplGetKeyCode( KeyFuncType eFunc, sal_uInt16& rCode1, sal_uInt16& rCode2, vcl::KeyCode::KeyCode( KeyFuncType eFunction ) { sal_uInt16 nDummy; - ImplGetKeyCode( eFunction, nCode, nDummy, nDummy, nDummy ); + ImplGetKeyCode( eFunction, nKeyCodeAndModifiers, nDummy, nDummy, nDummy ); eFunc = eFunction; } vcl::KeyCode::KeyCode( const ResId& rResId ) - : nCode(0) + : nKeyCodeAndModifiers(0) , eFunc(KeyFuncType::DONTKNOW) { rResId.SetRT( RSC_KEYCODE ); @@ -94,10 +94,10 @@ vcl::KeyCode::KeyCode( const ResId& rResId ) if ( eFunc != KeyFuncType::DONTKNOW ) { sal_uInt16 nDummy; - ImplGetKeyCode( eFunc, nCode, nDummy, nDummy, nDummy ); + ImplGetKeyCode( eFunc, nKeyCodeAndModifiers, nDummy, nDummy, nDummy ); } else - nCode = sal::static_int_cast<sal_uInt16>(nKeyCode | nModifier); + nKeyCodeAndModifiers = sal::static_int_cast<sal_uInt16>(nKeyCode | nModifier); } } |