Conflicts:
	forms/source/component/DatabaseForm.cxx

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