(cherry picked from commit 255beb8f)

Conflicts:
	sfx2/inc/sfx2/objsh.hxx
	sw/source/core/layout/paintfrm.cxx

Change-Id: I23157f7a6983ba81b1c8ddcc409a4989915be2ed