Patch by: Jianyuan Li
Review by: alg

(cherry picked from commit 462656d2)

Conflicts:
	svx/inc/svx/EnhancedCustomShape2d.hxx
	svx/inc/svx/EnhancedCustomShapeGeometry.hxx
	svx/source/customshapes/EnhancedCustomShape2d.cxx

Change-Id: Ifd1fdf1b79db8229b52db43b3c30f109a9930988