Resolves: #i123542# corrected ODF XML export of 3D cube and sphere

(cherry picked from commit a8cc15c001ac76c0d320837cc4cdf65ecb7fc923)

Conflicts:
	xmloff/source/draw/shapeexport2.cxx
	xmloff/source/draw/shapeexport3.cxx

Change-Id: I35f7817f3ea95177dd3aa633b9cbb1b5703f08a0