(cherry picked from commit 479325de)

Conflicts:
	sc/inc/docuno.hxx
	sd/source/ui/inc/unomodel.hxx
	sw/inc/unotxdoc.hxx

Change-Id: I9a6a75457078dc6383673f4c1a2012b69b5cefdd