RTF import: fix priority handling of shpz vs dhgt
RTF import: fix priority handling of shpz vs dhgt

\shpz is the older markup, dhgt shape property is the newer one. When
having both, dhgt should have priority.

Change-Id: I11904315d13fa23999badad26be26852719dbb3b

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