more type correctness in new code
more type correctness in new code

Change-Id: If6ba00dd10ef0c565c63d559e63ea4135ab4eea4

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