get rid of half the functions by using a functor ...
get rid of half the functions by using a functor ...

... and removing duplication

Change-Id: I2339f26ed91e0dc019b0f01fd7802dff23ec9e35

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