Conflicts:
	sc/source/core/data/document10.cxx
	sw/source/core/doc/docfmt.cxx

Change-Id: I1312f476607ea3a78b162a7e59323b0a142f6629