Conflicts:
	dbaccess/source/ui/dlg/advancedsettings.hxx

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