(cherry picked from commit 71d322a8)

Conflicts:
	include/xmloff/xmlexp.hxx
	xmloff/source/core/xmlexp.cxx
	xmloff/source/text/txtparae.cxx
	xmloff/source/text/txtparai.cxx

Change-Id: Ie8291c93c86815cab68482b35a5e88a3bd9b731e