fix crash loading ooo100546-1.xls

regressions around inserted extra enum values
into ShapePropertyId

(cherry picked from commit aacfd5038d05a02f8b1eade3a5896d3d7e959f3d)

Conflicts:
	include/oox/drawingml/shapepropertymap.hxx
	oox/source/drawingml/chart/objectformatter.cxx

Change-Id: I06696c8cfe4acc3836723c31d5e714bd7d8439b3
Reviewed-on: https://gerrit.libreoffice.org/10136
Reviewed-by: Matúš Kukan <matus.kukan@collabora.com>
Tested-by: Matúš Kukan <matus.kukan@collabora.com>