(cherry picked from commit b26e298d)

Conflicts:
	svx/source/svdraw/svdoedge.cxx

Change-Id: Id4bed1c85bccdae878872557fd3e625d772228ff