... for TextShapes and CustomShapes

Conflicts:
	include/svx/svdotext.hxx
	svx/source/sdr/properties/customshapeproperties.cxx
	svx/source/svdraw/svdoashp.cxx
	svx/source/svdraw/svdotext.cxx
	svx/source/svdraw/svdotxdr.cxx
	svx/source/svdraw/svdotxtr.cxx

Change-Id: Ie6f490801b6887568135ed5f83c8bbe7ab6daa08