Fixed bad cherry-pick conflict handling in writerfilter
Fixed bad cherry-pick conflict handling in writerfilter

Change-Id: I4771e198872bbc797df6388af395d7bc14cb2d76

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