(cherry picked from commit 81664c03)

Conflicts:
	sc/inc/document.hxx
	sc/source/core/data/documen2.cxx
	sc/source/core/data/documen3.cxx
	sc/source/core/data/documen9.cxx
	svx/inc/svx/svdmodel.hxx
	svx/source/svdraw/svdmodel.cxx
	sw/inc/doc.hxx
	sw/source/core/doc/docdraw.cxx
	sw/source/core/doc/docnew.cxx
	sw/source/ui/app/docshini.cxx

Change-Id: Id0f62f0cd5b83794e2dbaee4e8b6afa704a0c23a