Clean up logic a bit for formula cell ODS import
Clean up logic a bit for formula cell ODS import

Made Markus's recommended changes for logic clean up.

Change-Id: I8d2820558d1d68888414e19aa8d4e9034258c57e

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