(cherry picked from commit c0f65b29)

Conflicts:
	xmloff/source/draw/shapeexport2.cxx

Change-Id: Ic8da384d094ce735ecba51b282de7a697558e51f