(cherry picked from commit c8ed6699)

Conflicts:
	forms/source/xforms/model.hxx

Change-Id: Iec9e999b1568ad422ea2118c04b770000bdbfd75