--- a/phoneapp/phoneuicontrol/src/cphonenumberentrymanager.cpp Mon Jun 21 15:39:45 2010 +0300
+++ b/phoneapp/phoneuicontrol/src/cphonenumberentrymanager.cpp Thu Jul 15 18:38:16 2010 +0300
@@ -67,7 +67,7 @@
iStateMachine ( aStateMachine ),
iCustomization ( aCustomization ),
iCbaManager ( aCbaManager ),
- iEnv( *CEikonEnv::Static() )
+ iEnv( *CEikonEnv::Static() ) // codescanner::eikonenvstatic
{
__LOGMETHODSTARTEND( EPhoneControl, "CPhoneNumberEntryManager::CPhoneNumberEntryManager() ");
}
@@ -478,9 +478,12 @@
const TKeyEvent& aKeyEvent ) const
{
__LOGMETHODSTARTEND(EPhoneControl, "CPhoneNumberEntryManager::IsAlphanumericSupportedAndCharInput( ) ");
- TBool ret = ( iViewCommandHandle.HandleCommandL( EPhoneViewIsNumberEntryNumericMode )
- != EPhoneViewResponseSuccess )
- &&
+
+ TBool numericMode = EFalse;
+ TRAP_IGNORE( numericMode = ( iViewCommandHandle.HandleCommandL( EPhoneViewIsNumberEntryNumericMode )
+ == EPhoneViewResponseSuccess ) );
+
+ TBool ret = !numericMode &&
( ( aKeyEvent.iScanCode >= KPhoneKeyStart &&
aKeyEvent.iScanCode <= KPhoneKeyEnd ) ||
aKeyEvent.iModifiers & EModifierSpecial );