(cherry picked from commit 9b504ad3)

Conflicts:
	sw/inc/docufld.hxx

Change-Id: If15ca89f2b7c54441f076eb233c4e1414dac25c0