Related fdo#46808: Improve previous commit slightly
Related fdo#46808: Improve previous commit slightly

Change-Id: I95da6e3082a3ebd0bebabf233497ae40d6398fdd

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