Conflicts:
	cui/source/options/optgdlg.cxx
	cui/source/options/webconninfo.cxx
	dbaccess/source/ui/app/AppController.cxx

Change-Id: I2abfad91318e8be8c0f77909cbd76825cdca9b85
Reviewed-on: https://gerrit.libreoffice.org/2350Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>