(cherry picked from commit fb1dc1d9)

Conflicts:
	sc/source/core/data/drwlayer.cxx
	svx/inc/svx/svdmodel.hxx
	svx/source/svdraw/svdmodel.cxx
	svx/source/svdraw/svdundo.cxx

Change-Id: I10b644aa44ae8c1eb0a027aeeaf27790ec455fa2