Use more proper integer types and reduce scope
Use more proper integer types and reduce scope

Change-Id: Ib5483f857c4bddd7d0ece6b54e4d57a0347ee13a

JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core