Conflicts:
	vcl/inc/sft.hxx

Change-Id: I1b744f14b6524e4d5913775427280e68c4ee07fc
Reviewed-on: https://gerrit.libreoffice.org/6491Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>