Numbers shouldn't be in NUMBERFORMAT_TEXT, but it can happen.  When it does, IsNumberFormat call fails even when a number is entered.
Also reordered other check logic and removed unused code.
1st2be@gmail.com -- Joseph Brown

Change-Id: Icabd8b33b634c324302a970e137f8d74a2c20caf